Added 'clear all' button to tag filter. Tag name never removes tag. Added actor scene scraping to LegalPorno.

This commit is contained in:
DebaucheryLibrarian 2020-07-19 19:40:21 +02:00
parent 70bf00e844
commit 5291a87587
24 changed files with 111 additions and 71 deletions

View File

@ -1,17 +1,17 @@
<template> <template>
<v-popover class="filters-container"> <v-popover class="filters-container">
<div class="filters"> <div class="filters">
<Icon icon="price-tag4" />
<div <div
v-if="selectedTags.length > 0" v-if="selectedTags.length > 0"
class="applied" class="applied"
>{{ selectedTags.length }} selected</div> >{{ selectedTags.length }} tag filters</div>
<div <div
v-else v-else
class="applied empty" class="applied empty"
>Filter by tags</div> >Filter by tags</div>
<Icon icon="filter" />
</div> </div>
<div slot="popover"> <div slot="popover">
@ -30,6 +30,12 @@
>match any selected</option> >match any selected</option>
</select> </select>
<router-link
v-if="selectedTags.length > 1"
class="reset"
:to="{}"
><Icon icon="cross2" />clear all</router-link>
<ul class="tags nolist"> <ul class="tags nolist">
<li <li
v-for="tag in availableTags" v-for="tag in availableTags"
@ -37,15 +43,24 @@
class="tag" class="tag"
:class="{ selected: selectedTags.includes(tag.slug) }" :class="{ selected: selectedTags.includes(tag.slug) }"
> >
<router-link :to="{ query: { ...getNewRange(tag.slug), mode }, params: { pageNumber: 1 } }"> <router-link
:to="{ query: { ...getNewRange(tag.slug), mode }, params: { pageNumber: 1 } }"
class="include"
:class="{ selected: selectedTags.includes(tag.slug) }"
>
<Icon <Icon
icon="checkmark" icon="checkmark"
class="include" class="add"
/>
<Icon
icon="cross2"
class="remove"
/> />
</router-link> </router-link>
<router-link <router-link
:to="{ query: { ...(selectedTags.length === 1 && selectedTags.includes(tag.slug) ? null : { tags: tag.slug }), mode }, params: { pageNumber: 1 } }" :to="{ query: { tags: tag.slug, mode }, params: { pageNumber: 1 } }"
class="name" class="name"
>{{ tag.name }}</router-link> >{{ tag.name }}</router-link>
</li> </li>
@ -104,12 +119,13 @@ export default {
@import 'theme'; @import 'theme';
.filters { .filters {
color: var(--shadow);
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
.icon { .icon {
fill: var(--shadow); fill: var(--shadow);
margin: 0 .5rem 0 0; margin: -.1rem 0 0 0;
} }
&:hover { &:hover {
@ -143,27 +159,39 @@ export default {
width: 100%; width: 100%;
background: none; background: none;
padding: .75rem; padding: .75rem;
margin: 0 0 .5rem 0;
font-size: 1rem; font-size: 1rem;
border: none; border: none;
border-bottom: solid 1px var(--shadow-hint); border-bottom: solid 1px var(--shadow-hint);
} }
.tags {
padding: .5rem 0;
}
.tag { .tag {
display: flex; display: flex;
align-items: center; align-items: center;
.include { .include {
.icon {
width: 1rem; width: 1rem;
height: 1rem; height: 1rem;
padding: .5rem .75rem .5rem 1rem; padding: .5rem .75rem .5rem 1rem;
fill: var(--darken-hint); fill: var(--darken-hint);
}
.remove {
display: none;
fill: var(--alert);
}
&:hover { &:hover {
cursor: pointer; cursor: pointer;
&.selected .add {
display: none;
}
&.selected .remove {
display: inline-block;
}
} }
} }
@ -187,11 +215,32 @@ export default {
background: var(--darken-hint); background: var(--darken-hint);
} }
&.selected .include { &.selected .include .add {
fill: var(--success); fill: var(--success);
} }
} }
.reset {
display: flex;
align-items: center;
padding: .25rem 0;
color: var(--text);
text-decoration: none;
.icon {
fill: var(--darken-weak);
padding: .5rem 1.5rem .5rem 1rem;
}
&:hover {
background: var(--darken-hint);
.icon {
fill: var(--alert);
}
}
}
@media(max-width: $breakpoint0) { @media(max-width: $breakpoint0) {
.applied { .applied {
display: none; display: none;

View File

@ -9,12 +9,12 @@
> >
<router-link <router-link
class="pagination-button cursor" class="pagination-button cursor"
:to="{ params: { pageNumber: 1 } }" :to="{ params: { pageNumber: 1 }, query: $route.query }"
><Icon icon="first2" /></router-link> ><Icon icon="first2" /></router-link>
<router-link <router-link
class="pagination-button cursor" class="pagination-button cursor"
:to="{ params: { pageNumber: pageNumber - 1 } }" :to="{ params: { pageNumber: pageNumber - 1 }, query: $route.query }"
><Icon icon="arrow-left" /></router-link> ><Icon icon="arrow-left" /></router-link>
</span> </span>
@ -30,14 +30,14 @@
<router-link <router-link
v-for="pageX in pageNumber - 1" v-for="pageX in pageNumber - 1"
:key="`page-${pageX}`" :key="`page-${pageX}`"
:to="{ params: { pageNumber: pageNumber - pageX } }" :to="{ params: { pageNumber: pageNumber - pageX }, query: $route.query }"
class="pagination-button page" class="pagination-button page"
> {{ pageNumber - pageX }} </router-link> > {{ pageNumber - pageX }} </router-link>
</span> </span>
<router-link <router-link
:key="`page-${pageNumber}`" :key="`page-${pageNumber}`"
:to="{ params: { pageNumber } }" :to="{ params: { pageNumber }, query: $route.query }"
class="pagination-button page active" class="pagination-button page active"
> {{ pageNumber }} </router-link> > {{ pageNumber }} </router-link>
@ -45,7 +45,7 @@
<router-link <router-link
v-for="pageX in (pageCount - pageNumber)" v-for="pageX in (pageCount - pageNumber)"
:key="`page-${pageX + pageNumber}`" :key="`page-${pageX + pageNumber}`"
:to="{ params: { pageNumber: pageX + pageNumber } }" :to="{ params: { pageNumber: pageX + pageNumber }, query: $route.query }"
class="pagination-button page" class="pagination-button page"
> {{ pageX + pageNumber }} </router-link> > {{ pageX + pageNumber }} </router-link>
</span> </span>
@ -56,12 +56,12 @@
> >
<router-link <router-link
class="pagination-button cursor" class="pagination-button cursor"
:to="{ params: { pageNumber: pageNumber + 1 } }" :to="{ params: { pageNumber: pageNumber + 1 }, query: $route.query }"
><Icon icon="arrow-right" /></router-link> ><Icon icon="arrow-right" /></router-link>
<router-link <router-link
class="pagination-button cursor" class="pagination-button cursor"
:to="{ params: { pageNumber: pageCount } }" :to="{ params: { pageNumber: pageCount }, query: $route.query }"
><Icon icon="last2" /></router-link> ><Icon icon="last2" /></router-link>
</span> </span>

View File

@ -145,7 +145,6 @@ export default {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
padding: 0 0 .5rem 0;
overflow: hidden; overflow: hidden;
box-shadow: 0 0 3px var(--darken-weak); box-shadow: 0 0 3px var(--darken-weak);
height: 100%; height: 100%;
@ -212,7 +211,7 @@ export default {
} }
.title { .title {
margin: 0 .25rem .25rem 0; margin: 0;
color: var(--text); color: var(--text);
font-size: 1rem; font-size: 1rem;
line-height: 1.5; line-height: 1.5;
@ -226,12 +225,6 @@ export default {
color: var(--shadow); color: var(--shadow);
} }
.network {
color: #555;
margin: 0 .25rem 0 0;
font-size: .8rem;
}
.actors { .actors {
word-wrap: break-word; word-wrap: break-word;
overflow: hidden; overflow: hidden;
@ -255,18 +248,21 @@ export default {
} }
.labels { .labels {
padding: 0 .5rem 1rem .25rem; padding: .1rem .5rem 1.5rem .5rem;
max-height: .5rem; max-height: .5rem;
overflow-y: hidden; overflow-y: hidden;
font-size: 0;
line-height: 2;
} }
.shoot { .shoot {
display: inline; display: inline;
padding: .25rem .5rem .25rem .25rem; padding: .25rem .5rem;
border-right: solid 1px var(--shadow-hint); background: var(--primary);
color: var(--shadow-strong); color: var(--text-light);
font-size: 0.8rem; font-size: 0.75rem;
font-weight: bold; font-weight: bold;
box-shadow: inset 0 0 3px var(--shadow-weak);
} }
.tags { .tags {
@ -275,17 +271,19 @@ export default {
} }
.tag { .tag {
margin: 0 0 .25rem 0; margin: 0 0 1rem 0;
} }
.tag-link { .tag-link {
background: var(--background);
color: var(--shadow); color: var(--shadow);
display: inline-block; display: inline-block;
padding: .25rem; padding: .25rem .5rem;
font-size: .75rem; font-size: .75rem;
font-weight: bold; font-weight: bold;
text-decoration: none; text-decoration: none;
line-height: 1; line-height: 1;
box-shadow: 0 0 3px var(--shadow-weak);
&:hover { &:hover {
color: var(--primary); color: var(--primary);

View File

@ -158,9 +158,9 @@ export default {
.heading { .heading {
display: inline-block; display: inline-block;
background: var(--primary); color: var(--primary);
color: var(--text-light); padding: 0 .5rem;
padding: .5rem; margin: .5rem 0 1rem 0;
font-size: 1rem; font-size: 1rem;
text-transform: capitalize; text-transform: capitalize;
} }

View File

@ -3,6 +3,12 @@
v-if="tag.poster" v-if="tag.poster"
class="tile" class="tile"
> >
<router-link
class="title"
:to="{ name: 'tag', params: { tagSlug: tag.slug, range: 'latest' } }"
:title="tag.name"
>{{ tag.name }}</router-link>
<router-link <router-link
:to="{ name: 'tag', params: { tagSlug: tag.slug, range: 'latest' } }" :to="{ name: 'tag', params: { tagSlug: tag.slug, range: 'latest' } }"
:title="tag.name" :title="tag.name"
@ -42,12 +48,6 @@
class="poster" class="poster"
> >
</router-link> </router-link>
<router-link
class="title"
:to="{ name: 'tag', params: { tagSlug: tag.slug, range: 'latest' } }"
:title="tag.name"
>{{ tag.name }}</router-link>
</div> </div>
<span <span
@ -85,6 +85,16 @@ export default {
box-sizing: border-box; box-sizing: border-box;
position: relative; position: relative;
text-decoration: none; text-decoration: none;
&:hover {
.title {
color: var(--primary);
}
.poster {
box-shadow: 0 0 3px var(--darken);
}
}
} }
.poster { .poster {
@ -95,7 +105,7 @@ export default {
.title { .title {
display: inline-block; display: inline-block;
box-sizing: border-box; box-sizing: border-box;
padding: .25rem .5rem .25rem 1rem; padding: .25rem 1rem .25rem .5rem;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
color: var(--shadow-strong); color: var(--shadow-strong);
@ -104,13 +114,4 @@ export default {
text-transform: capitalize; text-transform: capitalize;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.poster-link:hover + .title,
.title:hover {
color: var(--primary)
}
.poster-link:hover .poster {
box-shadow: 0 0 3px var(--darken);
}
</style> </style>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 57 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 90 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 591 KiB

After

Width:  |  Height:  |  Size: 606 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 6.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -678,11 +678,9 @@ const tagPhotos = [
['blowbang', 'poster', 'Marsha May in "Feeding Frenzy 12" for Jules Jordan'], ['blowbang', 'poster', 'Marsha May in "Feeding Frenzy 12" for Jules Jordan'],
// ['bukkake', 'poster', 'Mia Malkova in "Facialized 2" for HardX'], // ['bukkake', 'poster', 'Mia Malkova in "Facialized 2" for HardX'],
['caucasian', 1, 'Sheena Shaw for Brazzers'], ['caucasian', 1, 'Sheena Shaw for Brazzers'],
['da-tp', 6, 'Adriana Chechik in "Gangbang Me" for HardX'],
['da-tp', 0, 'Natasha Teen in LegalPorno SZ2164'], ['da-tp', 0, 'Natasha Teen in LegalPorno SZ2164'],
['da-tp', 1, 'Francys Belle in SZ1702 for LegalPorno'], ['da-tp', 1, 'Francys Belle in SZ1702 for LegalPorno'],
['da-tp', 2, 'Angel Smalls in GIO408 for LegalPorno'],
['da-tp', 3, 'Evelina Darling in GIO294'],
['da-tp', 4, 'Ninel Mojado aka Mira Cuckold in GIO063 for LegalPorno'],
['dap', 2, 'Lana Rhoades in "Lana Rhoades Unleashed" for HardX'], ['dap', 2, 'Lana Rhoades in "Lana Rhoades Unleashed" for HardX'],
['dap', 6, 'Sheena Shaw in "Ass Worship 14" for Jules Jordan'], ['dap', 6, 'Sheena Shaw in "Ass Worship 14" for Jules Jordan'],
['dap', 5, 'Riley Reid in "The Gangbang of Riley Reid" for Jules Jordan'], ['dap', 5, 'Riley Reid in "The Gangbang of Riley Reid" for Jules Jordan'],
@ -704,8 +702,8 @@ const tagPhotos = [
['facial', 'poster', 'Jynx Maze'], ['facial', 'poster', 'Jynx Maze'],
['facefucking', 3, 'Adriana Chechik in "Performing Magic Butt Tricks With Jules Jordan. What Will Disappear In Her Ass?" for Jules Jordan'], ['facefucking', 3, 'Adriana Chechik in "Performing Magic Butt Tricks With Jules Jordan. What Will Disappear In Her Ass?" for Jules Jordan'],
['facefucking', 1, 'Carrie for Young Throats'], ['facefucking', 1, 'Carrie for Young Throats'],
['fake-boobs', 4, 'Capri Cavanni for Big Tits in Sports'],
['fake-boobs', 1, 'Lela Star in "Thick" for Jules Jordan'], ['fake-boobs', 1, 'Lela Star in "Thick" for Jules Jordan'],
['fake-boobs', 4, 'Capri Cavanni for Big Tits in Sports'],
['fake-boobs', 3, 'Ashly Anderson for Passion HD'], ['fake-boobs', 3, 'Ashly Anderson for Passion HD'],
['gangbang', 'poster', 'Kristen Scott in "Interracial Gangbang!" for Jules Jordan'], ['gangbang', 'poster', 'Kristen Scott in "Interracial Gangbang!" for Jules Jordan'],
['gangbang', 0, '"4 On 1 Gangbangs" for Doghouse Digital'], ['gangbang', 0, '"4 On 1 Gangbangs" for Doghouse Digital'],

View File

@ -42,7 +42,7 @@ function getPoster(posterElement, sceneId) {
return `https://legalporno.com/casting/${sceneId}/${posterTime}`; return `https://legalporno.com/casting/${sceneId}/${posterTime}`;
} }
function scrapeLatest(html, site) { function scrapeAll(html) {
const $ = cheerio.load(html, { normalizeWhitespace: true }); const $ = cheerio.load(html, { normalizeWhitespace: true });
const scenesElements = $('.thumbnails > div').toArray(); const scenesElements = $('.thumbnails > div').toArray();
@ -68,7 +68,6 @@ function scrapeLatest(html, site) {
title, title,
date, date,
poster, poster,
site,
}; };
}); });
} }
@ -111,13 +110,6 @@ async function scrapeScene(html, url, site, useGallery) {
const { origin, pathname } = new URL(source); const { origin, pathname } = new URL(source);
return `${origin}${pathname}`; return `${origin}${pathname}`;
/* disable thumbnail as fallback, usually enough high res photos available
return [
`${origin}${pathname}`,
source,
];
*/
}); });
const posterStyle = $('#player').attr('style'); const posterStyle = $('#player').attr('style');
@ -165,13 +157,15 @@ async function scrapeProfile(html, _url, actorName) {
if (bio.Age) profile.age = bio.Age; if (bio.Age) profile.age = bio.Age;
if (avatarEl) profile.avatar = avatarEl.src; if (avatarEl) profile.avatar = avatarEl.src;
profile.releases = scrapeAll(html);
return profile; return profile;
} }
async function fetchLatest(site, page = 1) { async function fetchLatest(site, page = 1) {
const res = await bhttp.get(`${site.url}/new-videos/${page}`); const res = await bhttp.get(`${site.url}/new-videos/${page}`);
return scrapeLatest(res.body.toString(), site); return scrapeAll(res.body.toString(), site);
} }
async function fetchScene(url, site) { async function fetchScene(url, site) {