diff --git a/assets/components/header/header.vue b/assets/components/header/header.vue index f054b606..4780c0eb 100644 --- a/assets/components/header/header.vue +++ b/assets/components/header/header.vue @@ -18,9 +18,7 @@ :href="href" :class="{ active: isActive }" @click="navigate" - > - Actors - + >Actors @@ -34,9 +32,7 @@ :href="href" :class="{ active: isActive }" @click="navigate" - > - Networks - + >Networks @@ -50,9 +46,7 @@ :href="href" :class="{ active: isActive }" @click="navigate" - > - Tags - + >Tags @@ -120,9 +114,8 @@ export default { .logo { display: inline-block; - padding: .5rem 1rem; - margin: 0 1rem 0 0; - font-size: 2rem; + padding: 0 0 0 1rem; + margin: 0 .5rem 0 0; .icon { width: 6rem; diff --git a/assets/js/router.js b/assets/js/router.js index 503458a3..08391020 100644 --- a/assets/js/router.js +++ b/assets/js/router.js @@ -31,7 +31,7 @@ const routes = [ name: 'scene', }, { - path: '/movie/:releaseId', + path: '/movie/:releaseId/:releaseSlug?', component: Release, name: 'movie', }, diff --git a/src/scrapers/gamma.js b/src/scrapers/gamma.js index d91987b9..3c891f3e 100644 --- a/src/scrapers/gamma.js +++ b/src/scrapers/gamma.js @@ -187,7 +187,7 @@ function scrapeAll(html, site, networkUrl, hasTeaser = true) { }); } -async function scrapeScene(html, url, site, scrapedRelease, mobileHtml) { +async function scrapeScene(html, url, site, baseRelease, mobileHtml) { const $ = cheerio.load(html, { normalizeWhitespace: true }); const m$ = mobileHtml && cheerio.load(mobileHtml, { normalizeWhitespace: true }); const release = { $, url }; @@ -198,7 +198,7 @@ async function scrapeScene(html, url, site, scrapedRelease, mobileHtml) { const [data, data2] = json ? JSON.parse(json) : []; const videoData = videoJson && JSON.parse(videoJson.slice(videoJson.indexOf('{'), videoJson.indexOf('};') + 1)); - [release.entryId] = (scrapedRelease?.path || new URL(url).pathname).split('/').slice(-1); + release.entryId = (baseRelease?.path || new URL(url).pathname).match(/\/(\d{2,})\//)[1]; release.title = videoData?.playerOptions?.sceneInfos.sceneTitle || data?.name; // date in data object is not the release date of the scene, but the date the entry was added; only use as fallback