Compare commits

..

No commits in common. "368aa8a89f66d930b6fbf9c3061a923a64bd484a" and "a95a159978d2b016bb6e80534f514723fa567bb2" have entirely different histories.

4 changed files with 10 additions and 40 deletions

2
package-lock.json generated
View File

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

View File

@ -1,6 +1,6 @@
{ {
"name": "traxxx", "name": "traxxx",
"version": "1.168.2", "version": "1.168.1",
"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

@ -287,10 +287,6 @@ const { argv } = yargs
describe: 'Remove all scenes.', describe: 'Remove all scenes.',
type: 'boolean', type: 'boolean',
}) })
.option('flush-movies', {
describe: 'Remove all movies.',
type: 'boolean',
})
.option('delete-scenes', { .option('delete-scenes', {
describe: 'Remove scenes by ID.', describe: 'Remove scenes by ID.',
type: 'array', type: 'array',

View File

@ -159,24 +159,6 @@ async function deleteScenes(sceneIds) {
return deleteCount; return deleteCount;
} }
async function deleteMovies(movieIds) {
if (movieIds.length === 0) {
return 0;
}
await knex('movies_scenes')
.whereIn('movie_id', movieIds)
.delete();
const deleteCount = await knex('movies')
.whereIn('id', movieIds)
.delete();
logger.info(`Removed ${deleteCount}/${movieIds.length} movies`);
return deleteCount;
}
async function flushScenes() { async function flushScenes() {
const sceneIds = await knex('releases').select('id').pluck('id'); const sceneIds = await knex('releases').select('id').pluck('id');
@ -198,25 +180,18 @@ async function flushScenes() {
logger.info(`Removed ${deleteCount}/${sceneIds.length} scenes`); logger.info(`Removed ${deleteCount}/${sceneIds.length} scenes`);
} }
async function flushMovies() { async function deleteMovies(movieIds) {
const movieIds = await knex('movies').select('id').pluck('id'); if (movieIds.length === 0) {
return 0;
const confirmed = await inquirer.prompt([{
type: 'confirm',
name: 'flushMovies',
message: `You are about to remove ${movieIds.length} movies. Are you sure?`,
default: false,
}]);
if (!confirmed.flushScenes) {
logger.warn('Confirmation rejected, not flushing scenes');
return;
} }
const deleteCount = await deleteMovies(movieIds);
await flushOrphanedMedia(); const deleteCount = await knex('movies')
.whereIn('id', movieIds)
.delete();
logger.info(`Removed ${deleteCount}/${movieIds.length} movies`); logger.info(`Removed ${deleteCount}/${movieIds.length} movies`);
return deleteCount;
} }
async function flushBatches(batchIds) { async function flushBatches(batchIds) {
@ -258,7 +233,6 @@ module.exports = {
fetchScene, fetchScene,
fetchScenes, fetchScenes,
flushBatches, flushBatches,
flushMovies,
flushScenes, flushScenes,
searchScenes, searchScenes,
deleteScenes, deleteScenes,