diff --git a/public/img/logos/cumlouder/pov.png b/public/img/logos/cumlouder/cumlouderpov.png similarity index 100% rename from public/img/logos/cumlouder/pov.png rename to public/img/logos/cumlouder/cumlouderpov.png diff --git a/public/img/logos/cumlouder/lazy/bitchconfessions.png b/public/img/logos/cumlouder/lazy/bitchconfessions.png old mode 100755 new mode 100644 index d1232f35..28db9ed1 Binary files a/public/img/logos/cumlouder/lazy/bitchconfessions.png and b/public/img/logos/cumlouder/lazy/bitchconfessions.png differ diff --git a/public/img/logos/cumlouder/lazy/boldlygirls.png b/public/img/logos/cumlouder/lazy/boldlygirls.png old mode 100755 new mode 100644 index d251fe3e..48b43f56 Binary files a/public/img/logos/cumlouder/lazy/boldlygirls.png and b/public/img/logos/cumlouder/lazy/boldlygirls.png differ diff --git a/public/img/logos/cumlouder/lazy/boobday.png b/public/img/logos/cumlouder/lazy/boobday.png old mode 100755 new mode 100644 index 112ad9e7..721a981b Binary files a/public/img/logos/cumlouder/lazy/boobday.png and b/public/img/logos/cumlouder/lazy/boobday.png differ diff --git a/public/img/logos/cumlouder/lazy/breakingasses.png b/public/img/logos/cumlouder/lazy/breakingasses.png old mode 100755 new mode 100644 index 2b5bfc0a..a1e1573c Binary files a/public/img/logos/cumlouder/lazy/breakingasses.png and b/public/img/logos/cumlouder/lazy/breakingasses.png differ diff --git a/public/img/logos/cumlouder/lazy/cocksxl.png b/public/img/logos/cumlouder/lazy/cocksxl.png old mode 100755 new mode 100644 index a53223a1..9f0d5f62 Binary files a/public/img/logos/cumlouder/lazy/cocksxl.png and b/public/img/logos/cumlouder/lazy/cocksxl.png differ diff --git a/public/img/logos/cumlouder/lazy/cumextreme.png b/public/img/logos/cumlouder/lazy/cumextreme.png old mode 100755 new mode 100644 index 569ee4c0..b714d487 Binary files a/public/img/logos/cumlouder/lazy/cumextreme.png and b/public/img/logos/cumlouder/lazy/cumextreme.png differ diff --git a/public/img/logos/cumlouder/lazy/cumlouder.png b/public/img/logos/cumlouder/lazy/cumlouder.png old mode 100755 new mode 100644 index e62efe4a..5b5932ae Binary files a/public/img/logos/cumlouder/lazy/cumlouder.png and b/public/img/logos/cumlouder/lazy/cumlouder.png differ diff --git a/public/img/logos/cumlouder/lazy/cumlouderpov.png b/public/img/logos/cumlouder/lazy/cumlouderpov.png new file mode 100644 index 00000000..b27c7fe2 Binary files /dev/null and b/public/img/logos/cumlouder/lazy/cumlouderpov.png differ diff --git a/public/img/logos/cumlouder/lazy/cumtrick.png b/public/img/logos/cumlouder/lazy/cumtrick.png old mode 100755 new mode 100644 index 137dbe24..c082910c Binary files a/public/img/logos/cumlouder/lazy/cumtrick.png and b/public/img/logos/cumlouder/lazy/cumtrick.png differ diff --git a/public/img/logos/cumlouder/lazy/exgirlfriends.png b/public/img/logos/cumlouder/lazy/exgirlfriends.png old mode 100755 new mode 100644 index 422e2c0d..16155033 Binary files a/public/img/logos/cumlouder/lazy/exgirlfriends.png and b/public/img/logos/cumlouder/lazy/exgirlfriends.png differ diff --git a/public/img/logos/cumlouder/lazy/favicon.png b/public/img/logos/cumlouder/lazy/favicon.png old mode 100755 new mode 100644 index be0d556a..04371120 Binary files a/public/img/logos/cumlouder/lazy/favicon.png and b/public/img/logos/cumlouder/lazy/favicon.png differ diff --git a/public/img/logos/cumlouder/lazy/favicon_dark.png b/public/img/logos/cumlouder/lazy/favicon_dark.png old mode 100755 new mode 100644 index be0d556a..04371120 Binary files a/public/img/logos/cumlouder/lazy/favicon_dark.png and b/public/img/logos/cumlouder/lazy/favicon_dark.png differ diff --git a/public/img/logos/cumlouder/lazy/favicon_light.png b/public/img/logos/cumlouder/lazy/favicon_light.png old mode 100755 new mode 100644 index be0d556a..04371120 Binary files a/public/img/logos/cumlouder/lazy/favicon_light.png and b/public/img/logos/cumlouder/lazy/favicon_light.png differ diff --git a/public/img/logos/cumlouder/lazy/fuckinvan.png b/public/img/logos/cumlouder/lazy/fuckinvan.png old mode 100755 new mode 100644 index d5c60afc..17a6016c Binary files a/public/img/logos/cumlouder/lazy/fuckinvan.png and b/public/img/logos/cumlouder/lazy/fuckinvan.png differ diff --git a/public/img/logos/cumlouder/lazy/givemespunk.png b/public/img/logos/cumlouder/lazy/givemespunk.png old mode 100755 new mode 100644 index b2dbcb2a..8bc9a608 Binary files a/public/img/logos/cumlouder/lazy/givemespunk.png and b/public/img/logos/cumlouder/lazy/givemespunk.png differ diff --git a/public/img/logos/cumlouder/lazy/handjobgoddess.png b/public/img/logos/cumlouder/lazy/handjobgoddess.png old mode 100755 new mode 100644 index c29aaa9a..63b0298a Binary files a/public/img/logos/cumlouder/lazy/handjobgoddess.png and b/public/img/logos/cumlouder/lazy/handjobgoddess.png differ diff --git a/public/img/logos/cumlouder/lazy/hungrycumeaters.png b/public/img/logos/cumlouder/lazy/hungrycumeaters.png old mode 100755 new mode 100644 index ad1c0ae9..b42a31e4 Binary files a/public/img/logos/cumlouder/lazy/hungrycumeaters.png and b/public/img/logos/cumlouder/lazy/hungrycumeaters.png differ diff --git a/public/img/logos/cumlouder/lazy/livingwithapornstar.png b/public/img/logos/cumlouder/lazy/livingwithapornstar.png old mode 100755 new mode 100644 index 38ddf7b0..04077cda Binary files a/public/img/logos/cumlouder/lazy/livingwithapornstar.png and b/public/img/logos/cumlouder/lazy/livingwithapornstar.png differ diff --git a/public/img/logos/cumlouder/lazy/livingwithleyla.png b/public/img/logos/cumlouder/lazy/livingwithleyla.png old mode 100755 new mode 100644 index da9ff832..071fda0d Binary files a/public/img/logos/cumlouder/lazy/livingwithleyla.png and b/public/img/logos/cumlouder/lazy/livingwithleyla.png differ diff --git a/public/img/logos/cumlouder/lazy/network.png b/public/img/logos/cumlouder/lazy/network.png old mode 100755 new mode 100644 index 77173c24..35782638 Binary files a/public/img/logos/cumlouder/lazy/network.png and b/public/img/logos/cumlouder/lazy/network.png differ diff --git a/public/img/logos/cumlouder/lazy/pornstarfisher.png b/public/img/logos/cumlouder/lazy/pornstarfisher.png old mode 100755 new mode 100644 index bbb1c991..56c41099 Binary files a/public/img/logos/cumlouder/lazy/pornstarfisher.png and b/public/img/logos/cumlouder/lazy/pornstarfisher.png differ diff --git a/public/img/logos/cumlouder/lazy/readyornothereicum.png b/public/img/logos/cumlouder/lazy/readyornothereicum.png old mode 100755 new mode 100644 index b3c0e2d7..55ce92b1 Binary files a/public/img/logos/cumlouder/lazy/readyornothereicum.png and b/public/img/logos/cumlouder/lazy/readyornothereicum.png differ diff --git a/public/img/logos/cumlouder/lazy/spoofporn.png b/public/img/logos/cumlouder/lazy/spoofporn.png old mode 100755 new mode 100644 index b4776ce5..69aede05 Binary files a/public/img/logos/cumlouder/lazy/spoofporn.png and b/public/img/logos/cumlouder/lazy/spoofporn.png differ diff --git a/public/img/logos/cumlouder/lazy/streetsuckers.png b/public/img/logos/cumlouder/lazy/streetsuckers.png old mode 100755 new mode 100644 index 72e0f385..9f83e2d0 Binary files a/public/img/logos/cumlouder/lazy/streetsuckers.png and b/public/img/logos/cumlouder/lazy/streetsuckers.png differ diff --git a/public/img/logos/cumlouder/lazy/stunningbutts.png b/public/img/logos/cumlouder/lazy/stunningbutts.png old mode 100755 new mode 100644 index c7f87b08..4253d5ba Binary files a/public/img/logos/cumlouder/lazy/stunningbutts.png and b/public/img/logos/cumlouder/lazy/stunningbutts.png differ diff --git a/public/img/logos/cumlouder/thumbs/bitchconfessions.png b/public/img/logos/cumlouder/thumbs/bitchconfessions.png old mode 100755 new mode 100644 index cfb1723d..d6ea4a18 Binary files a/public/img/logos/cumlouder/thumbs/bitchconfessions.png and b/public/img/logos/cumlouder/thumbs/bitchconfessions.png differ diff --git a/public/img/logos/cumlouder/thumbs/boldlygirls.png b/public/img/logos/cumlouder/thumbs/boldlygirls.png old mode 100755 new mode 100644 index 13de17a4..62285408 Binary files a/public/img/logos/cumlouder/thumbs/boldlygirls.png and b/public/img/logos/cumlouder/thumbs/boldlygirls.png differ diff --git a/public/img/logos/cumlouder/thumbs/boobday.png b/public/img/logos/cumlouder/thumbs/boobday.png old mode 100755 new mode 100644 index 98fa8a52..f4c54e85 Binary files a/public/img/logos/cumlouder/thumbs/boobday.png and b/public/img/logos/cumlouder/thumbs/boobday.png differ diff --git a/public/img/logos/cumlouder/thumbs/breakingasses.png b/public/img/logos/cumlouder/thumbs/breakingasses.png old mode 100755 new mode 100644 index 205b1f54..0515b1a8 Binary files a/public/img/logos/cumlouder/thumbs/breakingasses.png and b/public/img/logos/cumlouder/thumbs/breakingasses.png differ diff --git a/public/img/logos/cumlouder/thumbs/cocksxl.png b/public/img/logos/cumlouder/thumbs/cocksxl.png old mode 100755 new mode 100644 index e35f41f4..e8200899 Binary files a/public/img/logos/cumlouder/thumbs/cocksxl.png and b/public/img/logos/cumlouder/thumbs/cocksxl.png differ diff --git a/public/img/logos/cumlouder/thumbs/cumextreme.png b/public/img/logos/cumlouder/thumbs/cumextreme.png old mode 100755 new mode 100644 index 2e582478..1d94ac8e Binary files a/public/img/logos/cumlouder/thumbs/cumextreme.png and b/public/img/logos/cumlouder/thumbs/cumextreme.png differ diff --git a/public/img/logos/cumlouder/thumbs/cumlouder.png b/public/img/logos/cumlouder/thumbs/cumlouder.png old mode 100755 new mode 100644 index 157ad33c..c51c105a Binary files a/public/img/logos/cumlouder/thumbs/cumlouder.png and b/public/img/logos/cumlouder/thumbs/cumlouder.png differ diff --git a/public/img/logos/cumlouder/thumbs/cumlouderpov.png b/public/img/logos/cumlouder/thumbs/cumlouderpov.png new file mode 100644 index 00000000..17c961bf Binary files /dev/null and b/public/img/logos/cumlouder/thumbs/cumlouderpov.png differ diff --git a/public/img/logos/cumlouder/thumbs/cumtrick.png b/public/img/logos/cumlouder/thumbs/cumtrick.png old mode 100755 new mode 100644 index 302bb5dc..a1a52155 Binary files a/public/img/logos/cumlouder/thumbs/cumtrick.png and b/public/img/logos/cumlouder/thumbs/cumtrick.png differ diff --git a/public/img/logos/cumlouder/thumbs/exgirlfriends.png b/public/img/logos/cumlouder/thumbs/exgirlfriends.png old mode 100755 new mode 100644 index e139b654..0ec32cd6 Binary files a/public/img/logos/cumlouder/thumbs/exgirlfriends.png and b/public/img/logos/cumlouder/thumbs/exgirlfriends.png differ diff --git a/public/img/logos/cumlouder/thumbs/favicon.png b/public/img/logos/cumlouder/thumbs/favicon.png old mode 100755 new mode 100644 index be0d556a..04371120 Binary files a/public/img/logos/cumlouder/thumbs/favicon.png and b/public/img/logos/cumlouder/thumbs/favicon.png differ diff --git a/public/img/logos/cumlouder/thumbs/favicon_dark.png b/public/img/logos/cumlouder/thumbs/favicon_dark.png old mode 100755 new mode 100644 index be0d556a..04371120 Binary files a/public/img/logos/cumlouder/thumbs/favicon_dark.png and b/public/img/logos/cumlouder/thumbs/favicon_dark.png differ diff --git a/public/img/logos/cumlouder/thumbs/favicon_light.png b/public/img/logos/cumlouder/thumbs/favicon_light.png old mode 100755 new mode 100644 index be0d556a..04371120 Binary files a/public/img/logos/cumlouder/thumbs/favicon_light.png and b/public/img/logos/cumlouder/thumbs/favicon_light.png differ diff --git a/public/img/logos/cumlouder/thumbs/fuckinvan.png b/public/img/logos/cumlouder/thumbs/fuckinvan.png old mode 100755 new mode 100644 index 058f455f..be21ada5 Binary files a/public/img/logos/cumlouder/thumbs/fuckinvan.png and b/public/img/logos/cumlouder/thumbs/fuckinvan.png differ diff --git a/public/img/logos/cumlouder/thumbs/givemespunk.png b/public/img/logos/cumlouder/thumbs/givemespunk.png old mode 100755 new mode 100644 index 55198dd8..740f7be8 Binary files a/public/img/logos/cumlouder/thumbs/givemespunk.png and b/public/img/logos/cumlouder/thumbs/givemespunk.png differ diff --git a/public/img/logos/cumlouder/thumbs/handjobgoddess.png b/public/img/logos/cumlouder/thumbs/handjobgoddess.png old mode 100755 new mode 100644 index 70b275dc..fffe6771 Binary files a/public/img/logos/cumlouder/thumbs/handjobgoddess.png and b/public/img/logos/cumlouder/thumbs/handjobgoddess.png differ diff --git a/public/img/logos/cumlouder/thumbs/hungrycumeaters.png b/public/img/logos/cumlouder/thumbs/hungrycumeaters.png old mode 100755 new mode 100644 index 02d1adb0..2b4f120f Binary files a/public/img/logos/cumlouder/thumbs/hungrycumeaters.png and b/public/img/logos/cumlouder/thumbs/hungrycumeaters.png differ diff --git a/public/img/logos/cumlouder/thumbs/livingwithapornstar.png b/public/img/logos/cumlouder/thumbs/livingwithapornstar.png old mode 100755 new mode 100644 index 712567b3..1c4199f9 Binary files a/public/img/logos/cumlouder/thumbs/livingwithapornstar.png and b/public/img/logos/cumlouder/thumbs/livingwithapornstar.png differ diff --git a/public/img/logos/cumlouder/thumbs/livingwithleyla.png b/public/img/logos/cumlouder/thumbs/livingwithleyla.png old mode 100755 new mode 100644 index 01494c46..e433b28b Binary files a/public/img/logos/cumlouder/thumbs/livingwithleyla.png and b/public/img/logos/cumlouder/thumbs/livingwithleyla.png differ diff --git a/public/img/logos/cumlouder/thumbs/network.png b/public/img/logos/cumlouder/thumbs/network.png old mode 100755 new mode 100644 index 921ed0b8..991b2fb5 Binary files a/public/img/logos/cumlouder/thumbs/network.png and b/public/img/logos/cumlouder/thumbs/network.png differ diff --git a/public/img/logos/cumlouder/thumbs/pornstarfisher.png b/public/img/logos/cumlouder/thumbs/pornstarfisher.png old mode 100755 new mode 100644 index 5eadfd98..f63aa084 Binary files a/public/img/logos/cumlouder/thumbs/pornstarfisher.png and b/public/img/logos/cumlouder/thumbs/pornstarfisher.png differ diff --git a/public/img/logos/cumlouder/thumbs/readyornothereicum.png b/public/img/logos/cumlouder/thumbs/readyornothereicum.png old mode 100755 new mode 100644 index 91aff3b6..add5f243 Binary files a/public/img/logos/cumlouder/thumbs/readyornothereicum.png and b/public/img/logos/cumlouder/thumbs/readyornothereicum.png differ diff --git a/public/img/logos/cumlouder/thumbs/spoofporn.png b/public/img/logos/cumlouder/thumbs/spoofporn.png old mode 100755 new mode 100644 index 274f8618..3e88cafa Binary files a/public/img/logos/cumlouder/thumbs/spoofporn.png and b/public/img/logos/cumlouder/thumbs/spoofporn.png differ diff --git a/public/img/logos/cumlouder/thumbs/streetsuckers.png b/public/img/logos/cumlouder/thumbs/streetsuckers.png old mode 100755 new mode 100644 index 5ff7f586..46efbefa Binary files a/public/img/logos/cumlouder/thumbs/streetsuckers.png and b/public/img/logos/cumlouder/thumbs/streetsuckers.png differ diff --git a/public/img/logos/cumlouder/thumbs/stunningbutts.png b/public/img/logos/cumlouder/thumbs/stunningbutts.png old mode 100755 new mode 100644 index 84687df0..18b9b050 Binary files a/public/img/logos/cumlouder/thumbs/stunningbutts.png and b/public/img/logos/cumlouder/thumbs/stunningbutts.png differ diff --git a/src/deep.js b/src/deep.js index bd624bb7..bbef8dd5 100755 --- a/src/deep.js +++ b/src/deep.js @@ -7,7 +7,7 @@ const { mergeAdvanced: merge } = require('object-merge-advanced'); const argv = require('./argv'); const include = require('./utils/argv-include')(argv); -const { fetchReleaseEntities, urlToSiteSlug } = require('./entities'); +const { fetchReleaseEntities, urlToHostname } = require('./entities'); const logger = require('./logger')(__filename); const qu = require('./utils/qu'); const getRecursiveParameters = require('./utils/get-recursive-parameters'); @@ -110,8 +110,11 @@ function fetchMovie(scraper, url, entity, baseRelease, options) { return fetchScene(scraper, url, entity, baseRelease, options, 'movie'); } -async function scrapeRelease(baseRelease, entitiesBySlug, type = 'scene') { - const entity = baseRelease.entity || entitiesBySlug[urlToSiteSlug(baseRelease.url)]; +async function scrapeRelease(baseRelease, entitiesByHostname, type = 'scene') { + const entity = baseRelease.entity || entitiesByHostname[urlToHostname(baseRelease.url)]; + + console.log(entitiesByHostname); + console.log(entity); if (!entity) { logger.warn(`No entity available for ${baseRelease.url}`); @@ -222,10 +225,8 @@ async function scrapeRelease(baseRelease, entitiesBySlug, type = 'scene') { } } -async function scrapeReleases(baseReleases, entitiesBySlug, type) { - const entitiesWithBeforeDataEntries = await Promise.all(Object.entries(entitiesBySlug).map(async ([slug, entity]) => { - console.log('scraper', entity.scraper?.beforeFetchScenes); - +async function scrapeReleases(baseReleases, entitiesByHostname, type) { + const entitiesWithBeforeDataEntries = await Promise.all(Object.entries(entitiesByHostname).map(async ([slug, entity]) => { if (entity.scraper?.beforeFetchScenes) { const parameters = getRecursiveParameters(entity); const preData = await entity.scraper.beforeFetchScenes(entity, parameters); @@ -249,9 +250,9 @@ async function scrapeReleases(baseReleases, entitiesBySlug, type) { async function fetchReleases(baseReleasesOrUrls, type = 'scene') { const baseReleases = toBaseReleases(baseReleasesOrUrls); - const entitiesBySlug = await fetchReleaseEntities(baseReleases); + const entitiesByHostname = await fetchReleaseEntities(baseReleases); - const deepReleases = await scrapeReleases(baseReleases, entitiesBySlug, type); + const deepReleases = await scrapeReleases(baseReleases, entitiesByHostname, type); return deepReleases.filter(Boolean); } diff --git a/src/entities.js b/src/entities.js index 7ea37c11..86700767 100755 --- a/src/entities.js +++ b/src/entities.js @@ -82,6 +82,7 @@ async function curateEntities(entities, includeParameters) { return Promise.all(entities.map(async (entity) => curateEntity(entity, includeParameters))); } +/* obsolete in favor of urlToHostname function urlToSiteSlug(url) { try { const slug = new URL(url) @@ -96,6 +97,21 @@ function urlToSiteSlug(url) { return null; } } +*/ + +function urlToHostname(url) { + try { + const hostname = new URL(url) + .hostname + .match(/(www\.)(.*)/)?.at(-1); + + return hostname; + } catch (error) { + logger.warn(`Failed to derive entity hostname from '${url}': ${error.message}`); + + return null; + } +} async function fetchIncludedEntities() { const include = { @@ -191,6 +207,7 @@ async function fetchEntitiesBySlug(entitySlugs, sort = 'asc') { array['parent'] as parent_path FROM entities WHERE slug = ANY(:entitySlugs) + OR url ILIKE ANY(:entityHosts) UNION ALL @@ -215,14 +232,23 @@ async function fetchEntitiesBySlug(entitySlugs, sort = 'asc') { WHERE entity_tree.parent_id IS NULL GROUP BY entity_tree.entity ORDER BY entity->'type' :sort; - `, { entitySlugs, sort: knex.raw(sort) }); + `, { + entitySlugs: entitySlugs.filter((slug) => !slug.includes('.')), + entityHosts: entitySlugs.filter((slug) => slug.includes('.')).map((hostname) => `%${hostname}%`), + sort: knex.raw(sort), + }); // channel entity will overwrite network entity - const entitiesBySlug = entities.rows.reduce((accEntities, { entity }) => ({ - ...accEntities, - [entity.slug]: accEntities[entity.slug] || curateEntity(entity, true), - [urlToSiteSlug(entity.url)]: accEntities[urlToSiteSlug(entity.url)] || curateEntity(entity, true), - }), {}); + const entitiesBySlug = entities.rows.reduce((accEntities, { entity }) => { + const host = urlToHostname(entity.url); + const curatedEntity = accEntities[entity.slug] || accEntities[host] || curateEntity(entity, true); + + return { + ...accEntities, + [entity.slug]: curatedEntity, + [host]: curatedEntity, + }; + }, {}); return entitiesBySlug; } @@ -232,7 +258,7 @@ async function fetchReleaseEntities(baseReleases) { const entitySlugs = Array.from(new Set( baseReleasesWithoutEntity - .map((baseRelease) => urlToSiteSlug(baseRelease.url)) + .map((baseRelease) => urlToHostname(baseRelease.url)) .filter(Boolean), )); @@ -409,5 +435,6 @@ module.exports = { getRecursiveParent, searchEntities, flushEntities, - urlToSiteSlug, + urlToHostname, + // urlToSiteSlug, }; diff --git a/src/scrapers/newsensations.js b/src/scrapers/newsensations.js index 05ad3a72..7bdc1f5e 100755 --- a/src/scrapers/newsensations.js +++ b/src/scrapers/newsensations.js @@ -22,6 +22,8 @@ function scrapeBlockLatest(scenes) { release.teaser = qu.video(); + console.log(release); + return release; }); } @@ -57,6 +59,15 @@ function scrapeClassicLatest(scenes) { }); } +function scrapeScene({ query }) { + const release = {}; + + release.title = query.content('.indScene h2'); + + console.log(release); + return release; +} + async function fetchLatest(site, page = 1) { if (!site.parameters) { return null; @@ -74,4 +85,6 @@ async function fetchLatest(site, page = 1) { module.exports = { fetchLatest, + scrapeScene, + useUnprint: true, }; diff --git a/src/tools/transfer.js b/src/tools/transfer.js index 1f0241dd..10a19450 100644 --- a/src/tools/transfer.js +++ b/src/tools/transfer.js @@ -481,10 +481,14 @@ async function addReleaseMedia(medias, release, target) { await transferMedia(media, target); } - await knex(`${release.type}s_${target}`).insert({ - [`${release.type}_id`]: release.id, - media_id: id, - }); + try { + await knex(`${release.type}s_${target}`).insert({ + [`${release.type}_id`]: release.id, + media_id: id, + }); + } catch (error) { + console.warn(`Ignored duplicate ${release.type} ${target} association ${media.hash} with ${release.id} "${release.title}"`); + } }, Promise.resolve()); } @@ -496,8 +500,6 @@ async function linkMovieScenes(release, context) { && storedMovie.entity.slug === linkedMovie.entity.slug && storedMovie.entity.type === linkedMovie.entity.type); - console.log('movie', linkedMovie, movie); - if (!movie) { throw new Error(`Missing ${linkedMovie.entity.slug} movie '${linkedMovie.title}' in '${release.title}'`); } @@ -534,7 +536,7 @@ async function addRelease(release, context) { ]); if (!entity) { - throw new Error(`Release contains non-existent ${release.entity.type} '${release.entity.slug}'`); + throw new Error(`Release "${release.title}" contains non-existent ${release.entity.type} '${release.entity.slug}'`); } const [releaseEntry] = await knex(`${release.type}s`)