From 0b195d6ff3dded0170541e94fabeea3d495dd2c5 Mon Sep 17 00:00:00 2001
From: Rishi Ghan <rishi.ghan@gmail.com>
Date: Wed, 11 May 2022 10:57:30 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=A2=20Rewired=20the=20download=20->=20?=
 =?UTF-8?q?import=20to=20lib=20workflow?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 services/importqueue.service.ts |  3 ++-
 services/library.service.ts     |  4 ++--
 services/opds.service.ts        | 18 ++----------------
 utils/uncompression.utils.ts    |  4 +++-
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/services/importqueue.service.ts b/services/importqueue.service.ts
index 23638ac..f371484 100644
--- a/services/importqueue.service.ts
+++ b/services/importqueue.service.ts
@@ -71,6 +71,7 @@ export default class QueueService extends Service {
 						const {
 							name,
 							filePath,
+							fileSize,
 							extension,
 							cover,
 							containedIn,
@@ -100,7 +101,7 @@ export default class QueueService extends Service {
 							rawFileDetails: {
 								name,
 								filePath,
-								fileSize: job.data.fileObject.fileSize,
+								fileSize,
 								extension,
 								containedIn,
 								cover,
diff --git a/services/library.service.ts b/services/library.service.ts
index f36dcf5..56d9e81 100644
--- a/services/library.service.ts
+++ b/services/library.service.ts
@@ -332,9 +332,9 @@ export default class ImportService extends Service {
 						);
 						console.log(result);
 						await Comic.findOneAndUpdate({ _id: new ObjectId(ctx.params.comicObjectId) }, {
-							rawFileDetails: {
+							rawFileDetails: result,
+							acquisition: { wanted: false, } 
 
-							}
 						})
 					}
 				},
diff --git a/services/opds.service.ts b/services/opds.service.ts
index 23e7e85..c192e84 100644
--- a/services/opds.service.ts
+++ b/services/opds.service.ts
@@ -31,7 +31,7 @@ export default class OpdsService extends Service {
 					},
 					hooks: {},
 					actions: {
-						opds: {
+						serve: {
 							rest: "POST /serve",
 							handler: async (ctx) => {
 								return buildAsync(
@@ -137,18 +137,4 @@ export default class OpdsService extends Service {
 			)
 		);
 	}
-}
-
-// router.use("/file/*", async (req, res) => {
-//   const file: string = req.params[0];
-//   const ext = extname(file);
-
-//   if ([".cbr", ".cbz", ".cb7", ".cba", ".cbt"].includes(ext)) {
-//     const content = await fs.readFile(join(path_of_books, file));
-//     const mime = lookup(ext) || "application/octet-stream";
-//     res.set("Content-Type", mime);
-//     return responseStream(res, content);
-//   }
-
-//   res.status(404).end(`'${file}' not exists`);
-// });
+}
\ No newline at end of file
diff --git a/utils/uncompression.utils.ts b/utils/uncompression.utils.ts
index 56339ee..c0b103b 100644
--- a/utils/uncompression.utils.ts
+++ b/utils/uncompression.utils.ts
@@ -31,7 +31,7 @@ SOFTWARE.
  *     Initial:        2021/05/04        Rishi Ghan
  */
 
-import { createReadStream, createWriteStream, existsSync } from "fs";
+import { createReadStream, createWriteStream, existsSync, statSync } from "fs";
 import { isEmpty, isNil, isUndefined, remove, each, map } from "lodash";
 import * as p7zip from "p7zip-threetwo";
 import path from "path";
@@ -160,6 +160,7 @@ export const extractComicInfoXMLFromRar = async (
 					name: fileNameWithoutExtension,
 					extension,
 					containedIn: targetDirectory,
+					fileSize: fse.statSync(filePath).size,
 					cover: {
 						filePath: path.relative(
 							process.cwd(),
@@ -284,6 +285,7 @@ export const extractComicInfoXMLFromZip = async (
 						name: fileNameWithoutExtension,
 						extension,
 						containedIn: targetDirectory,
+						fileSize: fse.statSync(filePath).size,
 						cover: {
 							filePath: path.relative(
 								process.cwd(),