diff --git a/config/default.js b/config/default.js index 83e76c85..266fddea 100644 --- a/config/default.js +++ b/config/default.js @@ -171,6 +171,10 @@ module.exports = { 'gloryholesecrets', 'aziani', 'legalporno', + [ + 'firstanalquest', + 'doubleviewcasting', + ], [ 'silverstonedvd', 'silviasaint', diff --git a/public/img/logos/brazzers/originals/pornstars-punishment.png b/public/img/logos/brazzers/originals/pornstars-punishment.png new file mode 100644 index 00000000..01f89b16 Binary files /dev/null and b/public/img/logos/brazzers/originals/pornstars-punishment.png differ diff --git a/public/img/logos/brazzers/originals/pornstars-punishment_lessnoise.png b/public/img/logos/brazzers/originals/pornstars-punishment_lessnoise.png new file mode 100644 index 00000000..610ef0f1 Binary files /dev/null and b/public/img/logos/brazzers/originals/pornstars-punishment_lessnoise.png differ diff --git a/public/img/logos/brazzers/originals/pornstars-punishment_notld.png b/public/img/logos/brazzers/originals/pornstars-punishment_notld.png new file mode 100644 index 00000000..69e12a02 Binary files /dev/null and b/public/img/logos/brazzers/originals/pornstars-punishment_notld.png differ diff --git a/public/img/logos/brazzers/pornstarspunishment.png b/public/img/logos/brazzers/pornstarspunishment.png new file mode 100644 index 00000000..d505ef99 Binary files /dev/null and b/public/img/logos/brazzers/pornstarspunishment.png differ diff --git a/public/img/logos/famedigital/misc/give-me-teens.png b/public/img/logos/famedigital/misc/give-me-teens.png new file mode 100644 index 00000000..df29454d Binary files /dev/null and b/public/img/logos/famedigital/misc/give-me-teens.png differ diff --git a/public/img/logos/famedigital/misc/give-me-teens_banner.jpg b/public/img/logos/famedigital/misc/give-me-teens_banner.jpg new file mode 100644 index 00000000..6c4a00d8 Binary files /dev/null and b/public/img/logos/famedigital/misc/give-me-teens_banner.jpg differ diff --git a/public/img/logos/famedigital/misc/give-me-teens_nourl.png b/public/img/logos/famedigital/misc/give-me-teens_nourl.png new file mode 100644 index 00000000..6a3bef17 Binary files /dev/null and b/public/img/logos/famedigital/misc/give-me-teens_nourl.png differ diff --git a/src/actors.js b/src/actors.js index 881d80e6..69e51dc0 100644 --- a/src/actors.js +++ b/src/actors.js @@ -564,9 +564,11 @@ async function scrapeProfiles(actor, sources, entitiesBySlug, existingProfilesBy // config may group sources to try until success return await [].concat(source).reduce(async (outcome, scraperSlug) => outcome.catch(async () => { try { - const scraper = scrapers[scraperSlug]; const entity = entitiesBySlug[scraperSlug] || null; + const scraper = scrapers[scraperSlug]; + const layoutScraper = scraper?.[entity.parameters?.layout] || scraper; + const context = { ...entity, // legacy @@ -578,7 +580,7 @@ async function scrapeProfiles(actor, sources, entitiesBySlug, existingProfilesBy const label = context.entity?.name; - if (!scraper?.fetchProfile) { + if (!layoutScraper?.fetchProfile) { logger.warn(`No profile profile scraper available for ${scraperSlug}`); throw new Error(`No profile profile scraper available for ${scraperSlug}`); } @@ -598,7 +600,7 @@ async function scrapeProfiles(actor, sources, entitiesBySlug, existingProfilesBy logger.verbose(`Searching profile for '${actor.name}' on '${label}'`); - const profile = await scraper.fetchProfile(curateActor({ + const profile = await layoutScraper.fetchProfile(curateActor({ ...existingProfile, ...actor, }), context, include); @@ -688,7 +690,7 @@ async function scrapeActors(argNames) { .whereNull('alias_for'), ]); - const entitiesBySlug = entities.reduce((acc, entity) => ({ ...acc, [entity.slug]: entity }), {}); + const entitiesBySlug = entities.reduce((acc, entity) => ({ ...acc, [entity.slug]: acc[entity.slug] || entity }), {}); const existingActorEntriesBySlugAndEntryId = existingActorEntries.reduce((acc, actorEntry) => ({ ...acc, diff --git a/src/scrapers/firstanalquest.js b/src/scrapers/firstanalquest.js index 67aabf6b..c5570706 100644 --- a/src/scrapers/firstanalquest.js +++ b/src/scrapers/firstanalquest.js @@ -1,6 +1,7 @@ 'use strict'; const qu = require('../utils/qu'); +const slugify = require('../utils/slugify'); function scrapeAllA(scenes, channel) { return scenes.map(({ query }) => { @@ -65,6 +66,53 @@ function scrapeSceneA({ query }, url, channel) { return release; } +function scrapeProfileA({ query, el }, entity) { + const profile = {}; + + const bio = query.all('.list-model-info li, .profile-info li').reduce((acc, bioEl) => ({ + ...acc, + [slugify(query.cnt(bioEl, '.title, span'), '_')]: query.cnt(bioEl, ':nth-child(2)') || query.q(bioEl, ':nth-child(2)', 'title') || query.text(bioEl), + }), {}); + + profile.dateOfBirth = qu.parseDate(bio.birth_date || bio.date_of_birth, 'DD MMMM, YYYY'); + profile.birthPlace = bio.nationality || bio.place_of_birth || null; + + profile.weight = Number(bio.weight?.match(/\d+/)?.[0]); + profile.height = Number(bio.height?.match(/\d+/)?.[0]); + + profile.eyes = bio.eye_color; + profile.hairColor = bio.hair || bio.hair_color; + + profile.aliases = query.text('.sub-title')?.replace(/:\s*/, '').split(/,\s*/); + + if (bio.measurements || bio.body_shape_dimensions) { + const [, bust, cup, waist, hip] = (bio.measurements || bio.body_shape_dimensions).match(/(\d+)(\w+)-(\d+)-(\d+)/); + + profile.bust = Number(bust); + profile.cup = cup; + profile.waist = Number(waist); + profile.hip = Number(hip); + } + + const description = query.cnt('.model-biography p'); + const avatar = query.img('.model-box img, .profile-model-photo', 'src', { origin: entity.url }); + + if (!/there is no description/.test(description)) { + profile.description = description; + } + + if (avatar) { + profile.avatar = [ + avatar, + avatar.replace('s2_', 's1_'), + ]; + } + + profile.scenes = scrapeAllA(qu.initAll(el, '.list-thumbs .thumb, .main-thumbs > li'), entity); + + return profile; +} + async function fetchLatestA(channel, page) { const url = channel.parameters?.latest ? `${channel.parameters.latest}/${page}` @@ -89,9 +137,33 @@ async function fetchSceneA(url, channel) { return res.status; } +async function fetchProfileA({ name, slug }, { entity }) { + const searchRes = await qu.getAll(`${entity.url}/models/search/?q=${name}`, '.thumb-modal, .big-thumb'); + + if (!searchRes.ok) { + return searchRes.status; + } + + const actor = searchRes.items.find(({ query }) => slugify(query.cnt('.thumb-title a, .title')) === slug); + + if (!actor) { + return null; + } + + const actorUrl = actor.query.url('a', 'href', { origin: entity.url }); + const actorRes = await qu.get(actorUrl); + + if (actorRes.ok) { + return scrapeProfileA(actorRes.item, entity); + } + + return null; +} + module.exports = { a: { fetchLatest: fetchLatestA, fetchScene: fetchSceneA, + fetchProfile: fetchProfileA, }, }; diff --git a/src/scrapers/scrapers.js b/src/scrapers/scrapers.js index b6ef5d83..84372431 100644 --- a/src/scrapers/scrapers.js +++ b/src/scrapers/scrapers.js @@ -198,11 +198,13 @@ const scrapers = { digitalplayground, dtfsluts: fullpornnetwork, dorcelclub: dorcel, + doubleviewcasting: firstanalquest, elegantangel, evilangel, eyeontheguy: hush, fakehub, exploitedcollegegirls: fcuk, + firstanalquest, forbondage: porndoe, freeones, gangbangcreampie: aziani,