🔧 Refactoring core-service to autowatch and import comics

mixins/db.mixin.ts

@@ -12,6 +12,7 @@ export const DbMixin = (collection, model)  => {
 				pass: process.env.MONGO_INITDB_ROOT_PASSWORD,
 				keepAlive: true,
 				useUnifiedTopology: true,
+				family: 4,
 			}),
 			model,
 			collection,

package.json

@@ -43,7 +43,7 @@
     "@types/string-similarity": "^4.0.0",
     "7zip-bin": "^5.1.1",
     "7zip-min": "^1.4.0",
-    "chokidar": "^3.5.2",
+    "chokidar": "^3.5.3",
     "dotenv": "^10.0.0",
     "fs-extra": "^10.0.0",
     "imghash": "^0.0.9",

services/api.service.ts

@@ -90,7 +90,6 @@ export default class ApiService extends Service {
 
 			methods: {},
 			started(): any {
-				
 				// Add a connect listener
 				io.on("connection", (client) => {
 					console.log("Client connected via websocket!");
@@ -112,19 +111,23 @@ export default class ApiService extends Service {
 					client.on("disconnect", () => {
 						console.log("Client disconnected");
 					});
-				});
 
 					// Filewatcher
-				const fileWatcher = chokidar.watch(path.resolve("./comics"), {
+					const fileWatcher = chokidar.watch(
+						path.resolve("./comics"),
+						{
 							ignored: /(^|[\/\\])\../, // ignore dotfiles
 							persistent: true,
+							usePolling: true,
 							ignoreInitial: true,
 							atomic: true,
+							depth: 1,
 							awaitWriteFinish: {
 								stabilityThreshold: 2000,
 								pollInterval: 100,
 							},
-				});
+						}
+					);
 					const fileCopyDelaySeconds = 10;
 					const checkFileCopyComplete = (path, previousPath) => {
 						fs.stat(path, async (err, stat) => {
@@ -135,20 +138,18 @@ export default class ApiService extends Service {
 								stat.mtime.getTime() ===
 								previousPath.mtime.getTime()
 							) {
-							console.log("File detected, starting import...");
+								console.log(
+									"File detected, starting import..."
+								);
 								// this walking business needs to go, SACURATAYYY, SACURATAYYY!! This dude needs to go.
-							const walkedFolders: IFolderData =
+								const walkedFolder: IFolderData =
 									await broker.call("import.walkFolders", {
 										basePathToWalk: path,
 									});
-							const extractionOptions: IExtractionOptions = {
+								console.log(walkedFolder);
-								extractTarget: "cover",
-								targetExtractionFolder: "./userdata/covers",
-								extractionMode: "single",
-							};
 								await this.broker.call(
 									"import.processAndImportToDB",
-								{ walkedFolders, extractionOptions }
+									{ walkedFolder }
 								);
 							} else {
 								setTimeout(
@@ -177,7 +178,8 @@ export default class ApiService extends Service {
 											err.message
 									);
 									console.log(
-									"Error file not processed. PATH: " + path
+										"Error file not processed. PATH: " +
+											path
 									);
 									throw err;
 								}
@@ -187,6 +189,10 @@ export default class ApiService extends Service {
 									path,
 									stat
 								);
+								client.emit("action", {
+									type: "LS_COMIC_ADDED",
+									result: path,
+								});
 							});
 						})
 						.on("change", (path, stats) =>
@@ -200,6 +206,7 @@ export default class ApiService extends Service {
 						.on("addDir", (path) =>
 							console.log(`Directory ${path} has been added`)
 						);
+				});
 			},
 		});
 	}

services/import.service.ts

@@ -27,6 +27,7 @@ import klaw from "klaw";
 import path from "path";
 import { COMICS_DIRECTORY, USERDATA_DIRECTORY } from "../constants/directories";
 
+console.log(process.env.MONGO_URI);
 export default class ImportService extends Service {
 	public constructor(public broker: ServiceBroker) {
 		super(broker);
@@ -128,8 +129,7 @@ export default class ImportService extends Service {
 					params: {},
 					async handler(
 						ctx: Context<{
-							extractionOptions: any;
+							walkedFolder: {
-							walkedFolders: {
 								name: string;
 								path: string;
 								extension: string;
@@ -141,10 +141,9 @@ export default class ImportService extends Service {
 						}>
 					) {
 						try {
-							const { extractionOptions, walkedFolders } =
+							const { walkedFolder } = ctx.params;
-								ctx.params;
 							let comicExists = await Comic.exists({
-								"rawFileDetails.name": `${walkedFolders.name}`,
+								"rawFileDetails.name": `${walkedFolder.name}`,
 							});
 							// rough flow of import process
 							// 1. Walk folder
@@ -157,7 +156,7 @@ export default class ImportService extends Service {
 									| IExtractedComicBookCoverFile
 									| IExtractComicBookCoverErrorResponse
 									| IExtractedComicBookCoverFile[] = await extractCoverFromFile2(
-									extractionOptions
+									walkedFolder[0]
 								);
 
 								// 2. Add to mongo
@@ -185,7 +184,7 @@ export default class ImportService extends Service {
 								};
 							} else {
 								console.info(
-									`Comic: \"${walkedFolders.name}\" already exists in the database`
+									`Comic: \"${walkedFolder.name}\" already exists in the database`
 								);
 							}
 						} catch (error) {
@@ -459,7 +458,9 @@ export default class ImportService extends Service {
 									});
 
 									resp.on("end", () => {
-										console.log(`${apiDetailURL} returned data.`)
+										console.log(
+											`${apiDetailURL} returned data.`
+										);
 										const volumeInformation =
 											JSON.parse(data);
 										resolve(volumeInformation.results);

services/libraryqueue.service.ts

@@ -14,6 +14,7 @@ import { extractCoverFromFile2 } from "../utils/uncompression.utils";
 import { io } from "./api.service";
 const REDIS_URI = process.env.REDIS_URI || `redis://0.0.0.0:6379`;
 
+console.log(`REDIS -> ${REDIS_URI}`);
 export default class LibraryQueueService extends Service {
 	public constructor(public broker: ServiceBroker) {
 		super(broker);

utils/file.utils.ts

@@ -17,7 +17,7 @@ export const walkFolder = async (folder: string, formats: string[]): Promise<IFo
 	const result: IFolderData[] = [];
 	let walkResult: IFolderData = {
 		name: "",
-		path: "",
+		filePath: "",
 		extension: "",
 		containedIn: "",
 		isFile: false,
@@ -34,7 +34,7 @@ export const walkFolder = async (folder: string, formats: string[]): Promise<IFo
 		if ([...formats].includes(path.extname(dirent.name))) {
 			walkResult = {
 				name: path.basename(dirent.name, path.extname(dirent.name)),
-				path: path.dirname(pathname),
+				filePath: path.resolve(pathname),
 				extension: path.extname(dirent.name),
 				fileSize: fs.statSync(path.resolve(pathname)).size,
 				containedIn: path.dirname(pathname),

utils/uncompression.utils.ts

@@ -55,7 +55,9 @@ export const extractCoverFromFile2 = async (
 	fileObject: any
 ): Promise<any> => {
 	try {
-		const { filePath, size} = fileObject;
+		console.log("ASDASD!@#!#!@#!@#");
+		console.log(fileObject);
+		const { filePath, fileSize} = fileObject;
 		
 		const calibre = new Calibre();
 		console.info(`Initiating extraction process for path ${filePath}`);
@@ -111,7 +113,7 @@ export const extractCoverFromFile2 = async (
 			return {
 				name: fileNameWithoutExtension,
 				path:  filePath,
-				fileSize: size,
+				fileSize,
 				extension: path.extname(filePath),
 				cover: {
 					filePath: path.relative(process.cwd(),renditionPath),