Bunch of updates

Author: jleeothon

bin/intersects-checksums.js

@@ -1,3 +1,6 @@
+'use strict';
+
+const {program} = require('commander');
 const {promisify} = require('util');
 const pcloudSdk = require('pcloud-sdk-js');
 const pMap = require('p-map');
@@ -43,9 +46,9 @@ async function getChecksum(file) {
 	return [file.name, checksum];
 }
 
-async function run() {
-	const folderId = Number.parseInt(process.env.FOLDER_ID, 10);
-	const allFiles = await pClient.listfolder(folderId, {recursive: true});
+async function run(path) {
+	const response = await pClient.api('listfolder', {params: {path, recursive: 1}});
+	const allFiles = response.metadata;
 	const goodFolders = allFiles.contents.filter(file => file.isfolder);
 
 	const hashesPerName = await pMap(goodFolders, async folder => {
@@ -67,8 +70,14 @@ async function run() {
 	console.log(onlyNames);
 }
 
-run().catch(error => {
-	console.error(error);
-}).finally(() => {
-	rClient.quit();
-});
+program
+	.arguments('<path>')
+	.action(path => {
+		run(path).catch(error => {
+			console.error(error);
+		}).finally(() => {
+			rClient.quit();
+		});
+	});
+
+program.parse(process.argv);

bin/intersects-hashes.js

@@ -1,3 +1,5 @@
+'use strict';
+
 const pcloudSdk = require('pcloud-sdk-js');
 const pMap = require('p-map');
 

bin/merge-folder.js

@@ -0,0 +1,64 @@
+'use strict';
+
+const pcloudSdk = require('pcloud-sdk-js');
+const pMap = require('p-map');
+const delay = require('delay');
+const {join} = require('path');
+
+const pClient = pcloudSdk.createClient(process.env.ACCESS_TOKEN);
+
+const {program} = require('commander');
+
+async function run(folderPaths) {
+	const folders = await pMap(folderPaths, async path => {
+		const {metadata} = await pClient.api('listfolder', {params: {path}});
+		return metadata;
+	});
+
+	const fileNamesToFiles = new Map();
+	for (const folder of folders) {
+		for (const file of folder.contents) {
+			const fileName = file.name;
+			const entry = fileNamesToFiles.get(fileName) || [];
+			entry.push(file);
+			fileNamesToFiles.set(fileName, entry);
+		}
+	}
+
+	// Order by oldest to newest
+	for (const files of fileNamesToFiles.values()) {
+		files.sort((a, b) => a.created - b.created);
+	}
+
+	const [destinationFolder, ...otherFolders] = folders;
+
+	await pMap(fileNamesToFiles.values(), async files => {
+		const file = files[0];
+		if (file.parentfolderid === destinationFolder.folderid) {
+			return;
+		}
+
+		console.log(`Moving "${file.path}" to "${destinationFolder.path}"`);
+		await pClient.movefile(Number.parseInt(file.fileid), destinationFolder.folderid);
+	}, {concurrency: 1});
+
+	await pMap(otherFolders, async folder => {
+		console.log(`Deleting ${folder.path}`);
+		await pClient.deletefolder(folder.folderid);
+	});
+}
+
+// First folder is destination
+
+program
+	.option('-p, --prefix <prefix>')
+	.arguments('<folders...>')
+	.action((folders, {prefix}) => {
+		if (prefix) {
+			folders = folders.map(f => join(prefix, f));
+		}
+
+		run(folders).catch(error => console.error(error));
+	});
+
+program.parse(process.argv);

bin/rm-dups.js

@@ -1,3 +1,5 @@
+'use strict';
+
 // Finds duplicates within folders, recursively
 
 const pcloudSdk = require('pcloud-sdk-js');

bin/rm-empty.js

@@ -1,16 +1,21 @@
+'use strict';
+
 // Remove empty folders
 
 const pcloudSdk = require('pcloud-sdk-js');
 const pMap = require('p-map');
 const pFilter = require('p-filter');
 const delay = require('delay');
+const {getFoldersRecursive} = require('../lib/iter');
+
+const {program} = require('commander');
 
 const client = pcloudSdk.createClient(process.env.ACCESS_TOKEN);
 
-async function run() {
-	const folderId = Number.parseInt(process.env.FOLDER_ID, 10);
-	const allFiles = await client.listfolder(folderId, {recursive: true});
-	const foldersToRemove = await pFilter(allFiles.contents, f => {
+async function run(path) {
+	const response = await client.api('listfolder', {params: {path, recursive: 1}});
+	const root = getFoldersRecursive(response.metadata);
+	const foldersToRemove = await pFilter(root, f => {
 		return f.isfolder && f.contents.length === 0;
 	});
 	console.log(foldersToRemove);
@@ -21,4 +26,12 @@ async function run() {
 	}, {concurrency: 10});
 }
 
-run().catch(error => console.error('Error', error));
+program
+	.arguments('<path>')
+	.action(path => {
+		run(path).catch(error => {
+			console.error(error);
+		});
+	});
+
+program.parse(process.argv);

lib/redis-cacher.js

@@ -46,7 +46,7 @@ class RedisCacher {
 		await pMap(files, async file => {
 			const checksum = await this._cacheChecksum(file);
 			console.log('✓', {file: file.name, checksum});
-		}, {concurrency: 10});
+		}, {concurrency: 100});
 	}
 
 	async quit() {