✌️

cli/clean-drive.js

@@ -1,3 +1,5 @@
+const chalk = require('chalk');
+const log = require('single-line-log').stdout;
 const sequential = require('promise-sequential');
 const { default: DriveFile, deleteDriveFile } = require('../built/models/drive-file');
 const { default: Note } = require('../built/models/note');
@@ -12,7 +14,8 @@ async function main() {
 	let prev;
 
 	for (let i = 0; i < count; i++) {
-		promiseGens.push(() => new Promise(async (res, rej) => {
+		promiseGens.push(() => {
+			const promise = new Promise(async (res, rej) => {
 				const file = await DriveFile.findOne(prev ? {
 					_id: { $gt: prev._id }
 				} : {}, {
@@ -23,7 +26,9 @@ async function main() {
 
 				prev = file;
 
-			console.log(`scanning ${file._id}`);
+				if (file == null) return res();
+
+				log(chalk`scanning: {bold ${file._id}} ...`);
 
 				const attachingUsersCount = await User.count({
 					$or: [{
@@ -44,13 +49,26 @@ async function main() {
 				}, { limit: 1 });
 				if (attachingMessagesCount !== 0) return res();
 
-			console.log(`deleting ${file._id}`);
-
 				deleteDriveFile(file).then(res).catch(rej);
-		}));
+			});
+
+			promise.then(x => {
+				if (prev) {
+					if (x == null) {
+						log(chalk`{green skipped: {bold ${prev._id}}}`);
+					} else {
+						log(chalk`{red deleted: {bold ${prev._id}}}`);
+					}
+				}
+				log.clear();
+				console.log();
+			});
+
+			return promise;
+		});
 	}
 
 	return await sequential(promiseGens);
 }
 
-main().then(console.dir).catch(console.error);
+main().then().catch(console.error);

package.json

@@ -76,6 +76,7 @@
 		"@types/request-promise-native": "1.0.14",
 		"@types/rimraf": "2.0.2",
 		"@types/seedrandom": "2.4.27",
+		"@types/single-line-log": "^1.1.0",
 		"@types/speakeasy": "2.0.2",
 		"@types/tmp": "0.0.33",
 		"@types/uuid": "3.4.3",
@@ -180,6 +181,7 @@
 		"s-age": "1.1.2",
 		"sass-loader": "7.0.1",
 		"seedrandom": "2.4.3",
+		"single-line-log": "^1.1.2",
 		"speakeasy": "2.0.0",
 		"style-loader": "0.21.0",
 		"stylus": "0.54.5",