Fixed merge conflict

avelynhc · Sep 13, 2023 · 072cc8c · 072cc8c
2 parents 0f155cf + 628a1f8
commit 072cc8c
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/src/helper/convertToHTML.ts b/src/helper/convertToHTML.ts
@@ -20,7 +20,10 @@ ${body}
 </html>`;
 
     htmlFs.writeFile(`${outputFolder}/${title}.html`, result, function (err: any) {
-        if (err) console.error(err);
+        if (err) {
+            console.error(err);
+            process.exit(-1);
+        }
     });
     console.log(`${title}.html is created successfully!`);
 };
diff --git a/src/helper/readFile.ts b/src/helper/readFile.ts
@@ -16,8 +16,8 @@ module.exports.readFile = function (inputPath: string, cssLink: string, selected
             .join("");
     } catch (err) {
         console.error(err);
+        process.exit(-1);
     }
 
     html.convertToHTML(title, cssLink, body, selectedLang, outputFolder);
-    return title;
 };
diff --git a/src/helper/readFolder.ts b/src/helper/readFolder.ts
@@ -2,16 +2,21 @@ import readFolderFs from "fs";
 const fileModule = require("./readFile");
 
 module.exports.readFolder = function (path: string, cssLink: string, selectedLang: string,  outputFolder: string) {
-    readFolderFs.readdir(path, function (err: any, files: any[]) {
-        if (err) return console.log(err);
-        const textFiles:any[] = files.filter(file => file.split('.').pop()==='txt');
-        textFiles.forEach(function (file) {
-            fileModule.readFile(
-                `${path}/${file}`,
-                cssLink,
-                selectedLang,
-                outputFolder
-            );
+    try {
+        readFolderFs.readdir(path, function (err: any, files: any[]) {
+            if (err) return console.log(err);
+            const textFiles:any[] = files.filter(file => file.split('.').pop()==='txt');
+            textFiles.forEach(function (file) {
+                fileModule.readFile(
+                    `${path}/${file}`,
+                    cssLink,
+                    selectedLang,
+                    outputFolder
+                );
+            });
         });
-    });
+    } catch (error) {
+        console.error(error);
+        process.exit(-1);
+    }
 };
diff --git a/src/index.ts b/src/index.ts
@@ -53,7 +53,7 @@ const selectedLang:string = argv.lang;
 fs.stat(argv.input, (err: any, stats: { isDirectory: () => any; isFile: () => any; }) => {
     if (err) {
         console.error(err);
-        return;
+        process.exit(-1);
     }
 
     if (stats.isDirectory()) {
@@ -62,5 +62,6 @@ fs.stat(argv.input, (err: any, stats: { isDirectory: () => any; isFile: () => an
         file.readFile(argv.input, cssLink, selectedLang, outputFolder);
     } else {
         console.error("Error: file extension should be .txt");
+        process.exit(-1);
     }
 });