Fix for Issue# 1, 2, and 4

SerpentBytes · Sep 16, 2022 · c4116ce · c4116ce
1 parent 22e8287
commit c4116ce
Showing 1 changed file with 124 additions and 111 deletions.
diff --git a/src/utility.js b/src/utility.js
@@ -1,134 +1,147 @@
-const packageJson = require('../package.json')
-const fs = require('fs')
-const path = require('path')
-const { cmd, flag, hdg, src, err, success } = require('./cliDisplay')
-const { generateHTML } = require('./htmlGenerator')
+const packageJson = require("../package.json");
+const fs = require("fs");
+const path = require("path");
+const {
+  cmd,
+  flag,
+  hdg,
+  src,
+  err,
+  success,
+  secondary,
+} = require("./cliDisplay");
+const { generateHTML } = require("./htmlGenerator");
 
 const handleImproperUsage = (flag) => {
-    switch(flag){
-        // case "-v":
-        //     console.log(`Invalid option\nusage: siteit --version\nusage: siteit -v`)
-        //     break
-        // case "-h":
-        //     console.log(`Invalid option\nusage: siteit --help\nusage: siteit -h`)
-        //     break
-        case "-i":
-            console.log(`-- Invalid flag --\n${cmd()} -i myfile.txt\nusage: ${cmd()} --input myfile.txt`)
-            break
-        default:
-            console.log(`-- Invalid flag --\nusage: ${cmd()} [flag] [source]`)
-    }
-}
-const displayNameVersion = (() => {
-    console.log(`Name: ${packageJson.name}\nVersion: ${packageJson.version}`)
-})
-
-
-const displayManual = (() => {
-    console.log(`   
-${hdg('SiteIt - USAGE MANUAL')}
+  switch (flag) {
+    // case "-v":
+    //     console.log(`Invalid option\nusage: siteit --version\nusage: siteit -v`)
+    //     break
+    // case "-h":
+    //     console.log(`Invalid option\nusage: siteit --help\nusage: siteit -h`)
+    //     break
+    case "-i":
+      console.log(
+        `-- Invalid flag --\n${cmd()} -i myfile.txt\nusage: ${cmd()} --input myfile.txt`
+      );
+      break;
+    default:
+      console.log(`-- Invalid flag --\nusage: ${cmd()} [flag] [source]`);
+  }
+};
+const displayNameVersion = () => {
+  console.log(`Name: ${packageJson.name}\nVersion: ${packageJson.version}`);
+};
+
+const displayManual = () => {
+  console.log(`   
+${hdg("SiteIt - USAGE MANUAL")}
 
     usage:   
-             ${cmd()} ${flag('[flag]')}
-             ${cmd()} ${flag('[flag]')} ${src('[source_file]')}
-             ${cmd()} ${flag('[flag]')} ${src('[source_directory]')}
+             ${cmd()} ${flag("[flag]")}
+             ${cmd()} ${flag("[flag]")} ${src("[source_file]")}
+             ${cmd()} ${flag("[flag]")} ${src("[source_directory]")}
 
     example: 
-             ${cmd()} ${flag('-v')}
-             ${cmd()} ${flag('-i')} ${src('source_file.txt')}
-             ${cmd()} ${flag('-i')} ${src('./source_directory')}
+             ${cmd()} ${flag("-v")}
+             ${cmd()} ${flag("-i")} ${src("source_file.txt")}
+             ${cmd()} ${flag("-i")} ${src("./source_directory")}
 
 Common SiteIt Flag Options
 ----------------------------------------------------------------------
 
-    ${flag('--version | -v')}     Outputs tool name and version information
+    ${flag("--version | -v")}     Outputs tool name and version information
 
-    ${flag('--help    | -h')}     Outputs Siteit command usage manual 
+    ${flag("--help    | -h")}     Outputs Siteit command usage manual 
 
-    ${flag('--input   | -i')}    Accepts a source file or a directory containing 
+    ${flag(
+      "--input   | -i"
+    )}    Accepts a source file or a directory containing 
                        files as input, and outputs an HTML file for 
                        each file supplied
 
 ----------------------------------------------------------------------
                         *** END OF MANUAL ***                   
-    `)
-})
-
-const deleteOutputDir = () => {
-    console.log('-- checking if output directory exists --')
-        console.log('-- deleting existing output directory --')
-        fs.rm(path.join(__dirname, '../dist'), {recursive: true}, (error => {}))
-        console.log('-- DONE deleting output directory --')
-       // createOutputDir()
-}
-
-const createOutputDir = () => {
-        console.log('-- creating output directory -- ')
-        fs.mkdirSync(path.join(__dirname, '../dist'))
-        console.log(success(`-- DONE creating output directory: ${path.resolve('../dist')} --`))
-}
-
-const outputDirManager = () => {
-    (fs.existsSync(path.join(__dirname, '../dist')))
-       ? deleteOutputDir() : createOutputDir()
-}
+    `);
+};
+
+const distManager = () => {
+  try {
+    console.log(secondary("-- Attempting to create output directory --"));
+    fs.mkdirSync(path.join(__dirname, "../dist"));
+  } catch (e) {
+    if (e.code === "EEXIST") {
+      console.log(
+        secondary('-- Output directory exists. Attempting to delete it --')
+      );
+      fs.rmSync(path.join(__dirname, "../dist"), {
+        recursive: true,
+        force: true,
+      });
+      console.log(success(`-- Pre-existing output directory deleted --`));
+      fs.mkdirSync(path.join(__dirname, "../dist"));
+    }
+  }
+  console.log(
+    success(`-- DONE creating output directory: ${path.resolve("../dist")} --`)
+  );
+};
 
 const processFile = (file) => {
-    let filePath = path.isAbsolute(file) ? file : path.resolve(file)
-    //console.log(filePath)
-    try{
-       let content = fs.readFileSync(filePath, { encoding: 'utf8' })
-       generateHTML(file, content)
-
-    } catch(e){
-        console.error(`${err('-- ERROR: error reading file. Make sure file supplied exists --')}`)
-    }
-}
+  let filePath = path.isAbsolute(file) ? file : path.resolve(file);
+  try {
+    let content = fs.readFileSync(filePath, { encoding: "utf8" });
+    generateHTML(file, content);
+  } catch (e) {
+    console.error(
+      `${err(
+        "-- ERROR: error reading file. Make sure file supplied exists --"
+      )}`
+    );
+  }
+};
 
 const processDir = (dir) => {
-    let dirPath = path.isAbsolute(dir) ? dir : path.resolve(dir)
-    try{
-        let files = fs.readdirSync(dirPath)
-        console.log(files)
-    } catch(e){
-
-    }
-}
-const processInput = ((args) => {
-   const src = args[1].splice(3)
-   //console.log("blah")
- outputDirManager()
-
-   for(let i = 0; i < src.length; i++){
-    try{
-        //console.log(src[i])
-        if(fs.statSync(src[i]).isFile()){
-
-            //console.log(src[i])
-            processFile(src[i])
-        } else if(fs.statSync(src[i]).isDirectory()) {
-           // outputDirManager()
-           // processDir(src)
+  let dirPath = path.isAbsolute(dir) ? dir : path.resolve(dir);
+  try {
+    let files = fs.readdirSync(dirPath);
+    console.log('Feature not yet implemented');
+  } catch (e) {}
+};
+const processInput = (args) => {
+  let src = args[1].splice(3);
+  if (src.length === 0) {
+    console.error(err("-- ERROR: No source supplied --"));
+  } else {
+    distManager();
+    for (let i = 0; i < src.length; i++) {
+      try {
+        if (fs.statSync(src[i]).isFile()) {
+          processFile(src[i]);
+        } else if (fs.statSync(src[i]).isDirectory()) {
+          // processDir(src)
         }
-   } catch (e){
-        console.error(`${err('-- ERROR Invalid or non-existing source supplied --')}`)
-   }
-}
-
-})
-
-const dispatch = ((...args) => {
-    switch(args[0]){
-        case '-v':
-            displayNameVersion()
-            break
-        case '-h':
-            displayManual()
-            break
-        case '-i':
-            processInput(args)
-            break
+      } catch (e) {
+        console.error(
+          `${err("-- ERROR Invalid or non-existing source supplied --")}`
+        );
+      }
     }
-}) 
-
-module.exports = { dispatch, handleImproperUsage }
+  }
+};
+
+const dispatch = (...args) => {
+  switch (args[0]) {
+    case "-v":
+      displayNameVersion();
+      break;
+    case "-h":
+      displayManual();
+      break;
+    case "-i":
+      processInput(args);
+      break;
+  }
+};
+
+module.exports = { dispatch, handleImproperUsage };