diff --git a/public/img/logos/julesjordan/julesjordan.png b/public/img/logos/julesjordan/julesjordan.png index 19bcd828..0478c57c 100644 Binary files a/public/img/logos/julesjordan/julesjordan.png and b/public/img/logos/julesjordan/julesjordan.png differ diff --git a/public/img/logos/julesjordan/misc/julesjordan_original.png b/public/img/logos/julesjordan/misc/julesjordan_original.png new file mode 100644 index 00000000..0f96f5de Binary files /dev/null and b/public/img/logos/julesjordan/misc/julesjordan_original.png differ diff --git a/public/img/logos/julesjordan/network.png b/public/img/logos/julesjordan/network.png index 19bcd828..3bbddcc9 100644 Binary files a/public/img/logos/julesjordan/network.png and b/public/img/logos/julesjordan/network.png differ diff --git a/src/media.js b/src/media.js index a06470e9..6bff670f 100644 --- a/src/media.js +++ b/src/media.js @@ -181,6 +181,8 @@ async function storePhotos(photos, { concurrency: 10, }).filter(photo => photo); + return metaFiles; + const [hashDuplicates, hashOriginals] = await findDuplicates(metaFiles, 'hash', 'hash', label); const savedPhotos = await savePhotos(hashOriginals, { diff --git a/src/releases.js b/src/releases.js index 96fcac0d..193709d9 100644 --- a/src/releases.js +++ b/src/releases.js @@ -347,7 +347,12 @@ async function storeReleaseAssets(release, releaseId) { } async function storeRelease(release) { - const existingRelease = await knex('releases').where('entry_id', release.entryId).first(); + const existingRelease = await knex('releases') + .where({ + entry_id: release.entryId, + site_id: release.site.id, + }) + .first(); const curatedRelease = await curateReleaseEntry(release); if (existingRelease && !argv.redownload) { @@ -356,7 +361,7 @@ async function storeRelease(release) { if (existingRelease && argv.redownload) { const [updatedRelease] = await knex('releases') - .where('entry_id', existingRelease.id) + .where('id', existingRelease.id) .update({ ...existingRelease, ...curatedRelease, @@ -407,8 +412,6 @@ async function storeReleases(releases) { const actors = accumulateActors(storedReleases); const movies = accumulateMovies(storedReleases); - console.log(actors); - await Promise.all([ associateActors(actors, storedReleases), Promise.map(storedReleases, async release => storeReleaseAssets(release, release.id), {