From 4de87eee014c4152e2e32a4b3dce07a986baf294 Mon Sep 17 00:00:00 2001
From: Rishi Ghan <rishi.ghan@gmail.com>
Date: Wed, 21 Apr 2021 20:19:31 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=9B=A0=20Refactored=20unrar=20functions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../route/routes/importComics.routes.ts       |  6 ++--
 src/server/utils/fs.utils.ts                  | 34 ++++++++++++-------
 2 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src/server/route/routes/importComics.routes.ts b/src/server/route/routes/importComics.routes.ts
index c10f687..847b05b 100644
--- a/src/server/route/routes/importComics.routes.ts
+++ b/src/server/route/routes/importComics.routes.ts
@@ -11,9 +11,9 @@ import { Request, Response } from "express";
 
 router.route("/getComicCovers").post(async (req: Request, res: Response) => {
   const options = {
-    name: "Gyo v02 (2004) (Digital) (LostNerevarine-Empire)",
-    extension: ".cbz",
-    containedIn: "comics/ITOU Junji - Gyo",
+    name: "Fatale 004 (2012) (Digital) (Zone-Empire)",
+    extension: ".cbr",
+    containedIn: "comics",
     isFile: true,
     isLink: false,
   };
diff --git a/src/server/utils/fs.utils.ts b/src/server/utils/fs.utils.ts
index 479ec09..e85bc01 100644
--- a/src/server/utils/fs.utils.ts
+++ b/src/server/utils/fs.utils.ts
@@ -16,7 +16,6 @@ import {
   IExtractionOptions,
   IFolderData,
 } from "../interfaces/folder.interface";
-import { WriteStream } from "node:fs";
 
 export const unrar = async (
   extractionOptions: IExtractionOptions,
@@ -25,19 +24,25 @@ export const unrar = async (
   | IExtractedComicBookCoverFile[]
   | IExtractComicBookCoverErrorResponse
 > => {
-  const extractionTargetPath =
-    extractionOptions.sourceFolder + extractionOptions.targetExtractionFolder;
+  const targetPath =
+    extractionOptions.sourceFolder +
+    "/" +
+    extractionOptions.targetExtractionFolder +
+    "/" +
+    extractionOptions.folderDetails.name;
+
+  const inputFilePath =
+    extractionOptions.folderDetails.containedIn +
+    "/" +
+    extractionOptions.folderDetails.name +
+    extractionOptions.folderDetails.extension;
+
   const directoryOptions = {
     mode: 0o2775,
   };
-  const fileBuffer = await readFile(
-    extractionOptions.folderDetails.containedIn +
-      "/" +
-      extractionOptions.folderDetails.name,
-  ).catch((err) => console.error("Failed to read file", err));
-
-  const targetPath =
-    extractionTargetPath + "/" + extractionOptions.folderDetails.name;
+  const fileBuffer = await readFile(inputFilePath).catch((err) =>
+    console.error("Failed to read file", err),
+  );
 
   try {
     await fse.ensureDir(targetPath, directoryOptions);
@@ -61,7 +66,10 @@ export const unrar = async (
       return new Promise(async (resolve, reject) => {
         try {
           const fileName = explodePath(extractedFile.fileHeader.name).fileName;
-          if (fileName !== "") {
+          if (
+            fileName !== "" &&
+            extractedFile.fileHeader.flags.directory === false
+          ) {
             await writeFile(targetPath + "/" + fileName, fileArrayBuffer);
           }
           resolve({
@@ -85,7 +93,7 @@ export const unrar = async (
           const fileBuffer = file.extraction;
           const fileName = explodePath(file.fileHeader.name).fileName;
           try {
-            if (fileName !== "") {
+            if (fileName !== "" && file.fileHeader.flags.directory === false) {
               await writeFile(targetPath + "/" + fileName, fileBuffer);
             }
             comicBookCoverFiles.push({