From 4b36de2f55b67db61673c1a464af7edd2a1d056e Mon Sep 17 00:00:00 2001 From: Niels Simenon Date: Fri, 10 Jan 2020 02:43:04 +0100 Subject: [PATCH] Fixed Evil Angel upcoming and actor association issues. Moving from console.log to logger. --- docs/julesjordan.md | 36 +++++++++++++++++++++++++++++ public/img/logos/kink/kink-dvd.png | Bin 0 -> 10139 bytes src/actors.js | 13 ++++++----- src/releases.js | 9 ++++---- src/scrape-sites.js | 13 ++++++----- src/scrapers/evilangel.js | 2 +- src/utils/upsert.js | 5 ++-- 7 files changed, 58 insertions(+), 20 deletions(-) create mode 100644 docs/julesjordan.md create mode 100644 public/img/logos/kink/kink-dvd.png diff --git a/docs/julesjordan.md b/docs/julesjordan.md new file mode 100644 index 00000000..9839761d --- /dev/null +++ b/docs/julesjordan.md @@ -0,0 +1,36 @@ +## Distributed by Jules Jordan Video +* The Ass Factory +* Kink.com +* Amateur Allure +* Vince Voyeur Unleashed +* Morally Corrupt +* Trench Coat X +* Live Gonzo +* Sins + +## Manuel Ferrara exclusives +These DVDs supposedly do not appear on the Jules Jordan main website + +Anal Nymphos Anal Legends http://manuelferrara.com/members/dvds/anal-nymphos-anal-legends.html +Anal Nymphos Anal Legends #2 http://manuelferrara.com/members/dvds/anal-nymphos-anal-legends-2.html +Anal Nymphos Anal Legends #3 http://manuelferrara.com/members/dvds/anal-nymphos-anal-legends-3.html +Anal Nymphos Anal Legends #4 http://manuelferrara.com/members/dvds/anal-nymphos-anal-legends-4.html +Big Ass Tits http://manuelferrara.com/members/dvds/big-ass-tits.html +Bounce #1 http://manuelferrara.com/members/dvds/bounce.html +Bounce #2 http://manuelferrara.com/members/dvds/bounce-2.html +Bounce #3 http://manuelferrara.com/members/dvds/bounce-3.html +Bounce #4 http://manuelferrara.com/members/dvds/bounce-4.html +Dirty Talk #6 http://manuelferrara.com/members/dvds/dirty-talk-6.html +Dirty Talk #7 http://manuelferrara.com/members/dvds/dirty-talk-7.html +Pretty Little Sluts http://manuelferrara.com/members/dvds/pretty-little-sluts.html +Pretty Little Sluts #2 http://manuelferrara.com/members/dvds/pretty-little-sluts-2.html +Raw #30 http://manuelferrara.com/members/dvds/raw-30.html +Raw #31 http://manuelferrara.com/members/dvds/raw31.html +Raw #32 http://manuelferrara.com/members/dvds/raw-32.html +Raw #33 http://manuelferrara.com/members/dvds/raw-33.html +Raw #34 http://manuelferrara.com/members/dvds/raw-34.html +Raw #35 http://manuelferrara.com/members/dvds/raw-35.html +Raw #36 http://manuelferrara.com/members/dvds/raw-36.html +Raw #37 http://manuelferrara.com/members/dvds/raw-37.html +Raw #38 http://manuelferrara.com/members/dvds/raw-38.html +Sex Machines http://manuelferrara.com/members/dvds/sex-machines.html diff --git a/public/img/logos/kink/kink-dvd.png b/public/img/logos/kink/kink-dvd.png new file mode 100644 index 0000000000000000000000000000000000000000..bfec65022440e93e44b5f5393d629ee7e8432255 GIT binary patch literal 10139 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 release.id)), ]); - console.log(actorNames, actorSlugs, existingActorEntries.map(actor => actor.name)); + console.log(mappedActors); const associations = await Promise.map(Object.entries(mappedActors), async ([actorName, releaseIds]) => { try { @@ -421,7 +422,7 @@ async function associateActors(mappedActors, releases) { .some(associationEntry => associationEntry.actor_id === association.actor_id && associationEntry.release_id === association.release_id)); } catch (error) { - console.error(actorName, error); + logger.error(actorName, error); return null; } }); diff --git a/src/releases.js b/src/releases.js index 0ca6dcaa..adbf2a79 100644 --- a/src/releases.js +++ b/src/releases.js @@ -3,6 +3,7 @@ const Promise = require('bluebird'); const moment = require('moment'); +const logger = require('./logger'); const knex = require('./knex'); const argv = require('./argv'); const whereOr = require('./utils/where-or'); @@ -319,8 +320,6 @@ async function storeReleaseAssets(releases) { await createMediaDirectory('releases', subpath); - console.log(release.id); - try { // don't use Promise.all to prevent concurrency issues with duplicate detection if (release.poster) { @@ -379,7 +378,7 @@ async function storeRelease(release) { if (updatedRelease) { await associateTags(release, updatedRelease.id); - console.log(`Updated release "${release.title}" (${existingRelease.id}, ${release.site.name})`); + logger.info(`Updated release "${release.title}" (${existingRelease.id}, ${release.site.name})`); } await associateTags(release, existingRelease.id); @@ -393,7 +392,7 @@ async function storeRelease(release) { await associateTags(release, releaseEntry.id); - console.log(`Stored release "${release.title}" (${releaseEntry.id}, ${release.site.name})`); + logger.info(`Stored release "${release.title}" (${releaseEntry.id}, ${release.site.name})`); return releaseEntry.id; } @@ -410,7 +409,7 @@ async function storeReleases(releases) { ...releaseWithChannelSite, }; } catch (error) { - console.error(error); + logger.error(error); return null; } diff --git a/src/scrape-sites.js b/src/scrape-sites.js index f7cdf66d..9070346b 100644 --- a/src/scrape-sites.js +++ b/src/scrape-sites.js @@ -4,6 +4,7 @@ const Promise = require('bluebird'); const moment = require('moment'); const argv = require('./argv'); +const logger = require('./logger'); const knex = require('./knex'); const { fetchIncludedSites } = require('./sites'); const scrapers = require('./scrapers/scrapers'); @@ -42,7 +43,7 @@ async function scrapeUniqueReleases(scraper, site, afterDate = getAfterDate(), a .filter(release => !duplicateReleaseIds.has(String(release.entryId)) // release is already in database && moment(release.date).isAfter(afterDate)); // release is older than specified date limit - console.log(`\x1b[90m${site.name}: Scraped page ${page}, ${uniqueReleases.length} unique recent releases\x1b[0m`); + logger.info(`\x1b[90m${site.name}: Scraped page ${page}, ${uniqueReleases.length} unique recent releases\x1b[0m`); if ( uniqueReleases.length > 0 @@ -78,7 +79,7 @@ async function deepFetchReleases(baseReleases) { deep: true, }; } catch (error) { - console.error(error); + logger.error(error); return { ...release, @@ -99,7 +100,7 @@ async function scrapeSiteReleases(scraper, site) { scrapeUpcomingReleases(scraper, site), // fetch basic release info from upcoming overview ]); - console.log(`${site.name}: Found ${newReleases.length} recent releases, ${upcomingReleases.length} upcoming releases`); + logger.info(`${site.name}: Found ${newReleases.length} recent releases, ${upcomingReleases.length} upcoming releases`); const baseReleases = [...newReleases, ...upcomingReleases]; @@ -118,7 +119,7 @@ async function scrapeSites() { const scraper = scrapers.releases[site.slug] || scrapers.releases[site.network.slug]; if (!scraper) { - console.warn(`No scraper found for '${site.name}' (${site.slug})`); + logger.warn(`No scraper found for '${site.name}' (${site.slug})`); return []; } @@ -126,10 +127,10 @@ async function scrapeSites() { return await scrapeSiteReleases(scraper, site); } catch (error) { if (argv.debug) { - console.error(`${site.name}: Failed to scrape releases`, error); + logger.error(`${site.name}: Failed to scrape releases`, error); } - console.warn(`${site.id}: Failed to scrape releases`); + logger.warn(`${site.id}: Failed to scrape releases`); return []; } diff --git a/src/scrapers/evilangel.js b/src/scrapers/evilangel.js index e9a1461c..27374c48 100644 --- a/src/scrapers/evilangel.js +++ b/src/scrapers/evilangel.js @@ -112,7 +112,7 @@ async function fetchLatest(site, page = 1, upcoming = false) { requests: [ { indexName: 'all_scenes', - params: `query=&hitsPerPage=36&maxValuesPerFacet=100&page=${page - 1}&facetFilters=[["lesbian:"],["bisex:"],["shemale:"],["upcoming:${upcoming ? '' : 0}"]]`, + params: `query=&hitsPerPage=36&maxValuesPerFacet=100&page=${page - 1}&facetFilters=[["lesbian:"],["bisex:"],["shemale:"],["upcoming:${upcoming ? 1 : 0}"]]`, }, ], }, { diff --git a/src/utils/upsert.js b/src/utils/upsert.js index e8230697..eca86605 100644 --- a/src/utils/upsert.js +++ b/src/utils/upsert.js @@ -1,6 +1,7 @@ 'use strict'; const knex = require('../knex'); +const logger = require('../logger'); async function upsert(table, items, identifier = ['id'], _knex) { const identifiers = Array.isArray(identifier) ? identifier : [identifier]; @@ -28,8 +29,8 @@ async function upsert(table, items, identifier = ['id'], _knex) { }); if (knex) { - console.log(`${table}: Inserting ${insert.length}`); - console.log(`${table}: Updating ${update.length}`); + logger.debug(`${table}: Inserting ${insert.length}`); + logger.debug(`${table}: Updating ${update.length}`); const [inserted, updated] = await Promise.all([ knex(table).returning('*').insert(insert),