DebaucheryLibrarian
/
traxxx
2
1
Fork 1
Code Issues 36 Pull Requests 1 Releases Wiki Activity

Improved movie tile actor overflow. Improved deep movie error feedback.

This commit is contained in:
DebaucheryLibrarian 2021-02-10 03:00:17 +01:00
parent acc496be47
commit a6c7c60290
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
assets/components/releases/movie-tile.vue
View File

@ -90,6 +90,7 @@ export default {
} }
.movie { .movie {
height: 16rem;
display: flex; display: flex;
} }
@ -99,7 +100,7 @@ export default {
} }
.cover { .cover {
height: 16rem; height: 100%;
box-shadow: 0 0 3px var(--darken-weak); box-shadow: 0 0 3px var(--darken-weak);
img { img {
@ -113,6 +114,8 @@ export default {
} }
.info { .info {
display: flex;
flex-direction: column;
flex-grow: 1; flex-grow: 1;
overflow: hidden; overflow: hidden;
} }
@ -128,9 +131,11 @@ export default {
} }
.actors { .actors {
height: 0;
flex-grow: 1;
padding: 0 1rem; padding: 0 1rem;
margin: 0 0 1rem 0;
line-height: 1.5; line-height: 1.5;
overflow: hidden;
} }
.actor:not(:last-child)::after { .actor:not(:last-child)::after {
@ -150,7 +155,7 @@ export default {
} }
.tags { .tags {
padding: .2rem 1rem 0 1rem; padding: .25rem 1rem;
height: 1.75rem; height: 1.75rem;
line-height: 2; line-height: 2;
overflow: hidden; overflow: hidden;
@ -175,8 +180,13 @@ export default {
} }
@media(max-width: $breakpoint) { @media(max-width: $breakpoint) {
.cover { .movie {
height: 12rem; height: 12rem;
} }
/* ensure no half actor names show */
.actors {
margin: 0 0 1rem 0;
}
} }
</style> </style>

5
src/deep.js
View File

@ -110,6 +110,11 @@ async function scrapeRelease(baseRelease, entitiesBySlug, type = 'scene') {
? await fetchScene(layoutScraper, baseRelease.url, entity, baseRelease, include, null) ? await fetchScene(layoutScraper, baseRelease.url, entity, baseRelease, include, null)
: await layoutScraper.fetchMovie(baseRelease.url, entity, baseRelease, include, null); : await layoutScraper.fetchMovie(baseRelease.url, entity, baseRelease, include, null);
if (typeof scrapedRelease !== 'object' || Array.isArray(scrapedRelease)) {
// scraper is unable to fetch the releases and returned a HTTP code or null
throw new Error(`Scraper returned ${scrapedRelease} when fetching latest from '${entity.name}' (${entity.parent?.name})`);
}
// object-merge-advance will use null as explicit false on hard merged keys, even when null as explicit falls is disabled // object-merge-advance will use null as explicit false on hard merged keys, even when null as explicit falls is disabled
// filter out keys with null values to ensure original base value is used instead // filter out keys with null values to ensure original base value is used instead
const curatedScrapedRelease = Object.entries(scrapedRelease).reduce((acc, [key, value]) => ({ const curatedScrapedRelease = Object.entries(scrapedRelease).reduce((acc, [key, value]) => ({