Compare commits

..

No commits in common. "7fb832028e8c00f6b42c0e67d15a26697e1dfcb3" and "5ad5708e150776ba2b643c271352a0f8e136283f" have entirely different histories.

3 changed files with 8 additions and 24 deletions

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.226.4", "version": "1.226.3",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "traxxx", "name": "traxxx",
"version": "1.226.4", "version": "1.226.3",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@casl/ability": "^5.2.2", "@casl/ability": "^5.2.2",

View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.226.4", "version": "1.226.3",
"description": "All the latest porn releases in one place", "description": "All the latest porn releases in one place",
"main": "src/app.js", "main": "src/app.js",
"scripts": { "scripts": {

View File

@ -222,7 +222,7 @@ const movieFields = `
async function save() { async function save() {
const limit = args.limit || 1000; const limit = args.limit || 1000;
const offset = args.start || 0; const offset = args.offset || 0;
const { releases } = await graphql(` const { releases } = await graphql(`
query SearchScenes( query SearchScenes(
@ -271,7 +271,6 @@ async function save() {
const entry = JSON.stringify({ const entry = JSON.stringify({
...release, ...release,
type: 'release', type: 'release',
description: release.description.replace(/\n/g, ' '),
actors: release.actors.filter(Boolean).map(({ actor }) => actor), actors: release.actors.filter(Boolean).map(({ actor }) => actor),
directors: release.directors.filter(Boolean).map(({ director }) => director), directors: release.directors.filter(Boolean).map(({ director }) => director),
studio: release.studio?.slug, studio: release.studio?.slug,
@ -449,9 +448,7 @@ async function transferMedia(media, target) {
} }
async function addReleaseMedia(medias, release, target) { async function addReleaseMedia(medias, release, target) {
await medias.filter(Boolean).reduce(async (chain, media) => { return Promise.all(medias.filter(Boolean).map(async (media) => {
await chain;
const existingMedia = await knex('media') const existingMedia = await knex('media')
.where('hash', media.hash) .where('hash', media.hash)
.first(); .first();
@ -483,7 +480,7 @@ async function addReleaseMedia(medias, release, target) {
[`${release.type}_id`]: release.id, [`${release.type}_id`]: release.id,
media_id: id, media_id: id,
}); });
}, Promise.resolve()); }));
} }
async function linkMovieScenes(release, context) { async function linkMovieScenes(release, context) {
@ -520,7 +517,7 @@ async function addRelease(release, context) {
} }
const [entity] = await Promise.all([ const [entity] = await Promise.all([
knex('entities').select(['id', 'name']).where(release.entity).first(), knex('entities').select('id').where(release.entity).first(),
]); ]);
if (!entity) { if (!entity) {
@ -552,7 +549,6 @@ async function addRelease(release, context) {
...release, ...release,
id: releaseEntry.id, id: releaseEntry.id,
entityId: entity.id, entityId: entity.id,
entityName: entity.name,
}; };
await Promise.all([ await Promise.all([
@ -575,19 +571,11 @@ async function addRelease(release, context) {
async function load() { async function load() {
const file = await fs.promises.readFile(args.file, 'utf8'); const file = await fs.promises.readFile(args.file, 'utf8');
const start = args.start || 0;
const end = args.limit ? start + args.limit : Infinity;
const releases = file.split('\n') const releases = file.split('\n')
.filter(Boolean) .filter(Boolean)
.map((data) => JSON.parse(data)) .map((data) => JSON.parse(data))
.filter((release) => (args.entity ? release.entity.slug === args.entity : true)) .filter((release) => (args.entity ? release.entity.slug === args.entity : true))
.slice(start, end); .slice(0, args.limit || Infinity);
if (releases.length === 0) {
console.log('Nothing to load');
return;
}
const [batchId] = await knex('batches').insert({ comment: `import ${args.file}` }).returning('id'); const [batchId] = await knex('batches').insert({ comment: `import ${args.file}` }).returning('id');
@ -610,8 +598,6 @@ async function load() {
const acc = await chain; const acc = await chain;
const movie = await addRelease(release, { batchId, tagIdsBySlug, studioIdsBySlug }); const movie = await addRelease(release, { batchId, tagIdsBySlug, studioIdsBySlug });
console.log(`Loaded '${movie.entityName}' movie "${movie.title}"`);
return acc.concat(movie); return acc.concat(movie);
}, Promise.resolve([])); }, Promise.resolve([]));
@ -619,8 +605,6 @@ async function load() {
const acc = await chain; const acc = await chain;
const scene = await addRelease(release, { batchId, movies: addedMovies, tagIdsBySlug, studioIdsBySlug }); const scene = await addRelease(release, { batchId, movies: addedMovies, tagIdsBySlug, studioIdsBySlug });
console.log(`Loaded '${scene.entityName}' scene "${scene.title}"`);
return acc.concat(!!scene); return acc.concat(!!scene);
}, Promise.resolve([])); }, Promise.resolve([]));