assets/components/releases/release.vue

@@ -193,7 +193,7 @@
 					:to="`/added/${formatDate(release.createdAt, 'YYYY/MM/DD')}`"
 					:title="`Added on ${formatDate(release.createdAt, 'MMMM D, YYYY HH:mm')}`"
 					class="link added"
-				>{{ release.createdBatchId }}: {{ formatDate(release.createdAt, 'MMMM D, YYYY HH:mm') }}</router-link>
+				>{{ formatDate(release.createdAt, 'MMMM D, YYYY HH:mm') }}</router-link>
 			</div>
 		</div>
 	</div>

assets/js/fragments.js

@@ -185,7 +185,6 @@ const releaseFields = `
 	comment
     createdAt
     url
-	createdBatchId
     ${releaseActorsFragment}
     ${releaseTagsFragment}
     ${releasePosterFragment}
@@ -239,7 +238,6 @@ const releaseFragment = `
     createdAt
     shootId
 	productionDate
-	createdBatchId
 	productionLocation
 	productionCity
 	productionState

migrations/20190325001339_releases.js

@@ -296,8 +296,7 @@ exports.up = knex => Promise.resolve()
 
 		table.integer('batch_id', 12)
 			.references('id')
-			.inTable('batches')
+			.inTable('batches');
-			.onDelete('cascade');
 
 		table.datetime('updated_at')
 			.defaultTo(knex.fn.now());
@@ -311,8 +310,7 @@ exports.up = knex => Promise.resolve()
 		table.integer('actor_id', 12)
 			.notNullable()
 			.references('id')
-			.inTable('actors')
+			.inTable('actors');
-			.onDelete('cascade');
 
 		table.integer('entity_id', 12)
 			.references('id')
@@ -511,8 +509,7 @@ exports.up = knex => Promise.resolve()
 		table.integer('actor_id', 12)
 			.notNullable()
 			.references('id')
-			.inTable('actors')
+			.inTable('actors');
-			.onDelete('cascade');
 
 		table.text('body_slug', 20)
 			.references('slug')
@@ -531,8 +528,7 @@ exports.up = knex => Promise.resolve()
 		table.integer('actor_id', 12)
 			.notNullable()
 			.references('id')
-			.inTable('actors')
+			.inTable('actors');
-			.onDelete('cascade');
 
 		table.text('body_slug', 20)
 			.references('slug')
@@ -549,8 +545,7 @@ exports.up = knex => Promise.resolve()
 		table.integer('profile_id', 12)
 			.notNullable()
 			.references('id')
-			.inTable('actors_profiles')
+			.inTable('actors_profiles');
-			.onDelete('cascade');
 
 		table.text('media_id', 21)
 			.notNullable()
@@ -563,8 +558,7 @@ exports.up = knex => Promise.resolve()
 		table.integer('actor_id', 12)
 			.notNullable()
 			.references('id')
-			.inTable('actors')
+			.inTable('actors');
-			.onDelete('cascade');
 
 		table.text('media_id', 21)
 			.notNullable()
@@ -651,13 +645,11 @@ exports.up = knex => Promise.resolve()
 
 		table.integer('created_batch_id', 12)
 			.references('id')
-			.inTable('batches')
+			.inTable('batches');
-			.onDelete('cascade');
 
 		table.integer('updated_batch_id', 12)
 			.references('id')
-			.inTable('batches')
+			.inTable('batches');
-			.onDelete('cascade');
 
 		table.datetime('created_at')
 			.defaultTo(knex.fn.now());
@@ -672,8 +664,7 @@ exports.up = knex => Promise.resolve()
 		table.integer('actor_id', 12)
 			.notNullable()
 			.references('id')
-			.inTable('actors')
+			.inTable('actors');
-			.onDelete('cascade');
 
 		table.unique(['release_id', 'actor_id']);
 
@@ -818,13 +809,11 @@ exports.up = knex => Promise.resolve()
 
 		table.integer('created_batch_id', 12)
 			.references('id')
-			.inTable('batches')
+			.inTable('batches');
-			.onDelete('cascade');
 
 		table.integer('updated_batch_id', 12)
 			.references('id')
-			.inTable('batches')
+			.inTable('batches');
-			.onDelete('cascade');
 
 		table.datetime('created_at')
 			.defaultTo(knex.fn.now());
@@ -849,8 +838,7 @@ exports.up = knex => Promise.resolve()
 		table.integer('movie_id', 16)
 			.notNullable()
 			.references('id')
-			.inTable('movies')
+			.inTable('movies');
-			.onDelete('cascade');
 
 		table.text('media_id', 21)
 			.notNullable()
@@ -864,8 +852,7 @@ exports.up = knex => Promise.resolve()
 			.unique()
 			.notNullable()
 			.references('id')
-			.inTable('movies')
+			.inTable('movies');
-			.onDelete('cascade');
 
 		table.text('media_id', 21)
 			.notNullable()
@@ -878,8 +865,7 @@ exports.up = knex => Promise.resolve()
 		table.integer('release_id', 12)
 			.references('id')
 			.inTable('releases')
-			.notNullable()
+			.notNullable();
-			.onDelete('cascade');
 
 		table.integer('clip', 6);
 
@@ -893,13 +879,11 @@ exports.up = knex => Promise.resolve()
 
 		table.integer('created_batch_id', 12)
 			.references('id')
-			.inTable('batches')
+			.inTable('batches');
-			.onDelete('cascade');
 
 		table.integer('updated_batch_id', 12)
 			.references('id')
-			.inTable('batches')
+			.inTable('batches');
-			.onDelete('cascade');
 
 		table.datetime('created_at')
 			.defaultTo(knex.fn.now());
@@ -908,8 +892,7 @@ exports.up = knex => Promise.resolve()
 		table.integer('clip_id', 16)
 			.notNullable()
 			.references('id')
-			.inTable('clips')
+			.inTable('clips');
-			.onDelete('cascade');
 
 		table.text('media_id', 21)
 			.notNullable()
@@ -922,8 +905,7 @@ exports.up = knex => Promise.resolve()
 		table.integer('clip_id', 16)
 			.notNullable()
 			.references('id')
-			.inTable('clips')
+			.inTable('clips');
-			.onDelete('cascade');
 
 		table.text('media_id', 21)
 			.notNullable()
@@ -936,8 +918,7 @@ exports.up = knex => Promise.resolve()
 		table.integer('tag_id', 12)
 			.notNullable()
 			.references('id')
-			.inTable('tags')
+			.inTable('tags');
-			.onDelete('cascade');
 
 		table.integer('clip_id', 16)
 			.notNullable()

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.137.6",
+    "version": "1.137.5",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {

package.json

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

src/app.js

@@ -11,8 +11,7 @@ const { fetchScenes, fetchMovies } = require('./deep');
 const { storeScenes, storeMovies, updateReleasesSearch } = require('./store-releases');
 const { scrapeActors } = require('./actors');
 const { flushEntities } = require('./entities');
-const { deleteScenes, deleteMovies, flushBatches } = require('./releases');
+const { deleteScenes } = require('./releases');
-const { flushOrphanedMedia } = require('./media');
 const getFileEntries = require('./utils/file-entries');
 
 async function init() {
@@ -29,26 +28,10 @@ async function init() {
 		await flushEntities(argv.flushNetworks, argv.flushChannels);
 	}
 
-	if (argv.flushBatches) {
-		await flushBatches(argv.flushBatches);
-	}
-
-	if (argv.deleteScenes) {
-		await deleteScenes(argv.deleteScenes);
-	}
-
-	if (argv.deleteMovies) {
-		await deleteMovies(argv.deleteMovies);
-	}
-
 	if (argv.delete) {
 		await deleteScenes(argv.delete);
 	}
 
-	if (argv.flushOrphanedMedia) {
-		await flushOrphanedMedia();
-	}
-
 	const actorsFromFile = argv.actorsFile && await getFileEntries(argv.actorsFile);
 	const actorNames = (argv.actors || []).concat(actorsFromFile || []);
 

src/argv.js

@@ -238,11 +238,6 @@ const { argv } = yargs
 		type: 'boolean',
 		default: false,
 	})
-	.option('flush-orphaned-media', {
-		describe: 'Remove all orphaned media items from database and disk.',
-		type: 'array',
-		alias: 'flush-media',
-	})
 	.option('flush-channels', {
 		describe: 'Delete all scenes and movies from channels.',
 		type: 'array',
@@ -253,20 +248,10 @@ const { argv } = yargs
 		type: 'array',
 		alias: 'flush-network',
 	})
-	.option('flush-batches', {
+	.option('delete', {
-		describe: 'Delete all scenes and movies from batch by ID.',
-		type: 'array',
-		alias: 'flush-batch',
-	})
-	.option('delete-scenes', {
 		describe: 'Remove scenes by ID.',
 		type: 'array',
-		alias: ['delete-scene', 'delete', 'remove', 'remove-scenes', 'remove-scene'],
+		alias: 'remove',
-	})
-	.option('delete-movies', {
-		describe: 'Remove movies by ID.',
-		type: 'array',
-		alias: ['delete-movie', 'remove-movies', 'remove-movies'],
 	})
 	.coerce('after', interpretAfter)
 	.coerce('actors-update', interpretAfter);

src/entities.js

@@ -6,8 +6,7 @@ const inquirer = require('inquirer');
 const logger = require('./logger')(__filename);
 const argv = require('./argv');
 const knex = require('./knex');
-const { deleteScenes, deleteMovies } = require('./releases');
+const { deleteScenes } = require('./releases');
-const { flushOrphanedMedia } = require('./media');
 
 function curateEntity(entity, includeParameters = false) {
 	if (!entity) {
@@ -142,11 +141,8 @@ async function fetchEntity(entityId, type) {
 			if (type) {
 				queryBuilder
 					.where('entities.type', type)
-					.where((whereBuilder) => {
-						whereBuilder
 					.where('entities.slug', entityId)
 					.orWhere(knex.raw(':entityId = ANY(entities.alias)', { entityId }));
-					});
 
 				return;
 			}
@@ -236,16 +232,7 @@ async function flushEntities(networkSlugs = [], channelSlugs = []) {
 		.leftJoin('releases', 'releases.entity_id', 'selected_entities.id')
 		.pluck('releases.id');
 
-	const movieIds = await entityQuery
+	if (sceneIds.length === 0) {
-		.clone()
-		.select('movies.id')
-		.distinct('movies.id')
-		.whereNotNull('movies.id')
-		.from('selected_entities')
-		.leftJoin('movies', 'movies.entity_id', 'selected_entities.id')
-		.pluck('movies.id');
-
-	if (sceneIds.length === 0 && movieIds.length === 0) {
 		logger.info(`No scenes or movies found to remove for ${entitySlugs}`);
 		return;
 	}
@@ -253,21 +240,16 @@ async function flushEntities(networkSlugs = [], channelSlugs = []) {
 	const confirmed = await inquirer.prompt([{
 		type: 'confirm',
 		name: 'flushEntities',
-		message: `You are about to remove ${sceneIds.length} scenes and ${movieIds.length} movies for ${entitySlugs}. Are you sure?`,
+		message: `You are about to remove ${sceneIds.length} scenes for ${entitySlugs}. Are you sure?`,
 		default: false,
 	}]);
 
 	if (!confirmed.flushEntities) {
-		logger.warn(`Confirmation rejected, not flushing scenes or movies for: ${entitySlugs}`);
+		logger.warn(`Confirmation rejected, not flushing scenes for: ${entitySlugs}`);
 		return;
 	}
 
-	await Promise.all([
+	await deleteScenes(sceneIds);
-		deleteScenes(sceneIds),
-		deleteMovies(movieIds),
-	]);
-
-	await flushOrphanedMedia();
 }
 
 module.exports = {

src/media.js

@@ -747,49 +747,7 @@ async function associateAvatars(profiles) {
 	return profilesWithAvatarIds;
 }
 
-async function flushOrphanedMedia() {
-	const orphanedMedia = await knex('media')
-		.where('is_sfw', false)
-		.whereNotExists(
-			knex
-				.from(
-					knex('tags_posters')
-						.select('media_id')
-						.unionAll(
-							knex('tags_photos').select('media_id'),
-							knex('releases_posters').select('media_id'),
-							knex('releases_photos').select('media_id'),
-							knex('releases_trailers').select('media_id'),
-							knex('releases_teasers').select('media_id'),
-							knex('movies_covers').select('media_id'),
-							knex('movies_trailers').select('media_id'),
-							knex('actors_avatars').select('media_id'),
-							knex('actors_photos').select('media_id'),
-							knex('clips_photos').select('media_id'),
-							knex('clips_posters').select('media_id'),
-						)
-						.as('associations'),
-				)
-				.whereRaw('associations.media_id = media.id'),
-		)
-		.returning(['media.path', 'media.thumbnail', 'media.lazy'])
-		.delete();
-
-	await Promise.all(orphanedMedia.map(media => Promise.all([
-		fsPromises.unlink(path.join(config.media.path, media.path)).catch(() => { /* probably file not found */ }),
-		fsPromises.unlink(path.join(config.media.path, media.thumbnail)).catch(() => { /* probably file not found */ }),
-		fsPromises.unlink(path.join(config.media.path, media.lazy)).catch(() => { /* probably file not found */ }),
-	])));
-
-	logger.info(`Removed ${orphanedMedia.length} media files from database and disk`);
-
-	await fsPromises.rmdir(path.join(config.media.path, 'temp'), { recursive: true });
-
-	logger.info('Removed temporary media directory');
-}
-
 module.exports = {
 	associateAvatars,
 	associateReleaseMedia,
-	flushOrphanedMedia,
 };

src/releases.js

@@ -1,10 +1,6 @@
 'use strict';
 
-const inquirer = require('inquirer');
-
-const logger = require('./logger')(__filename);
 const knex = require('./knex');
-const { flushOrphanedMedia } = require('./media');
 
 function curateRelease(release, withMedia = false) {
 	if (!release) {
@@ -129,52 +125,14 @@ async function deleteScenes(sceneIds) {
 	await knex('releases')
 		.whereIn('id', sceneIds)
 		.delete();
-}
 
-async function deleteMovies(movieIds) {
+	// TODO: wipe media without associations, clean disk
-	await knex('movies')
-		.whereIn('id', movieIds)
-		.delete();
-}
-
-async function flushBatches(batchIds) {
-	const [sceneIds, movieIds] = await Promise.all([
-		knex('releases')
-			.select('releases.id')
-			.whereIn('created_batch_id', batchIds)
-			.pluck('releases.id'),
-		knex('movies').whereIn('created_batch_id', batchIds)
-			.select('movies.id')
-			.whereIn('created_batch_id', batchIds)
-			.pluck('movies.id'),
-	]);
-
-	const confirmed = await inquirer.prompt([{
-		type: 'confirm',
-		name: 'flushBatches',
-		message: `You are about to remove ${sceneIds.length} scenes and ${movieIds.length} movies from batches ${batchIds}. Are you sure?`,
-		default: false,
-	}]);
-
-	if (!confirmed.flushBatches) {
-		logger.warn(`Confirmation rejected, not flushing scenes or movies for batches ${batchIds}`);
-		return;
-	}
-
-	await Promise.all([
-		deleteScenes(sceneIds),
-		deleteMovies(movieIds),
-	]);
-
-	await flushOrphanedMedia();
 }
 
 module.exports = {
 	curateRelease,
 	fetchRelease,
 	fetchReleases,
-	flushBatches,
 	searchReleases,
 	deleteScenes,
-	deleteMovies,
 };

src/scrapers/traxxx.js

@@ -1,15 +0,0 @@
-'use strict';
-
-async function fetchLatest() {
-	return [
-		{
-			title: 'Hot chicks arse fucked',
-			date: new Date(),
-		},
-	];
-}
-
-
-module.exports = {
-	fetchLatest,
-};