package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "traxxx",
-    "version": "1.237.21",
+    "version": "1.237.20",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "traxxx",
-            "version": "1.237.21",
+            "version": "1.237.20",
             "license": "ISC",
             "dependencies": {
                 "@aws-sdk/client-s3": "^3.458.0",

package.json

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

src/argv.js

@@ -4,7 +4,7 @@ const config = require('config');
 const yargs = require('yargs');
 const moment = require('moment');
 
-function interpretDate(after, ignoreIfEmpty = false) {
+function interpretAfter(after, ignoreIfEmpty = false) {
 	if (!after && ignoreIfEmpty) {
 		return null;
 	}
@@ -341,14 +341,6 @@ const { argv } = yargs
 		describe: 'Remove all movies.',
 		type: 'boolean',
 	})
-	.option('flush-after', {
-		describe: 'Only delete scenes release after including',
-		type: 'string',
-	})
-	.option('flush-before', {
-		describe: 'Only delete scenes released before including',
-		type: 'string',
-	})
 	.option('delete-actors', {
 		describe: 'Remove actors by ID.',
 		type: 'array',
@@ -386,9 +378,7 @@ const { argv } = yargs
 		alias: ['showcase', 'batch-showcased'],
 		default: true,
 	})
-	.coerce('after', interpretDate)
-	.coerce('flush-after', interpretDate)
-	.coerce('flush-before', interpretDate)
-	.coerce('actors-update', (after) => interpretDate(after, true));
+	.coerce('after', interpretAfter)
+	.coerce('actors-update', (after) => interpretAfter(after, true));
 
 module.exports = argv;

src/entities.js

@@ -372,54 +372,27 @@ async function flushEntities(networkSlugs = [], channelSlugs = []) {
 		.clone()
 		.select('releases.id')
 		.distinct('releases.id')
+		.whereNotNull('releases.id')
 		.from('selected_entities')
 		.leftJoin('releases', 'releases.entity_id', 'selected_entities.id')
-		.whereNotNull('releases.id')
-		.modify((builder) => {
-			if (argv.flushAfter) {
-				builder.where('effective_date', '>=', argv.flushAfter);
-			}
-
-			if (argv.flushBefore) {
-				builder.where('effective_date', '<=', argv.flushBefore);
-			}
-		})
 		.pluck('releases.id');
 
 	const movieIds = await entityQuery
 		.clone()
 		.select('movies.id')
 		.distinct('movies.id')
+		.whereNotNull('movies.id')
 		.from('selected_entities')
 		.leftJoin('movies', 'movies.entity_id', 'selected_entities.id')
-		.whereNotNull('movies.id')
-		.modify((builder) => {
-			if (argv.flushAfter) {
-				builder.where('effective_date', '>=', argv.flushAfter);
-			}
-
-			if (argv.flushBefore) {
-				builder.where('effective_date', '<=', argv.flushBefore);
-			}
-		})
 		.pluck('movies.id');
 
 	const serieIds = await entityQuery
 		.clone()
 		.select('series.id')
 		.distinct('series.id')
+		.whereNotNull('series.id')
 		.from('selected_entities')
 		.leftJoin('series', 'series.entity_id', 'selected_entities.id')
-		.whereNotNull('series.id')
-		.modify((builder) => {
-			if (argv.flushAfter) {
-				builder.where('date', '>=', argv.flushAfter);
-			}
-
-			if (argv.flushBefore) {
-				builder.where('date', '<=', argv.flushBefore);
-			}
-		})
 		.pluck('series.id');
 
 	if (sceneIds.length === 0 && movieIds.length === 0 && serieIds.length === 0) {

src/releases.js

@@ -348,18 +348,7 @@ async function deleteSeries(serieIds) {
 }
 
 async function flushScenes() {
-	const sceneIds = await knex('releases')
-		.select('id')
-		.modify((builder) => {
-			if (argv.flushAfter) {
-				builder.where('effective_date', '>=', argv.flushAfter);
-			}
-
-			if (argv.flushBefore) {
-				builder.where('effective_date', '<=', argv.flushBefore);
-			}
-		})
-		.pluck('id');
+	const sceneIds = await knex('releases').select('id').pluck('id');
 
 	const confirmed = await inquirer.prompt([{
 		type: 'confirm',
@@ -432,28 +421,10 @@ async function flushBatches(batchIds) {
 		knex('releases')
 			.select('releases.id')
 			.whereIn('created_batch_id', batchIds)
-			.modify((builder) => {
-				if (argv.flushAfter) {
-					builder.where('effective_date', '>=', argv.flushAfter);
-				}
-
-				if (argv.flushBefore) {
-					builder.where('effective_date', '<=', argv.flushBefore);
-				}
-			})
 			.pluck('releases.id'),
 		knex('movies').whereIn('created_batch_id', batchIds)
 			.select('movies.id')
 			.whereIn('created_batch_id', batchIds)
-			.modify((builder) => {
-				if (argv.flushAfter) {
-					builder.where('effective_date', '>=', argv.flushAfter);
-				}
-
-				if (argv.flushBefore) {
-					builder.where('effective_date', '<=', argv.flushBefore);
-				}
-			})
 			.pluck('movies.id'),
 	]);