json output done

PedroFonsecaDEV · Oct 10, 2020 · ca5adf0 · ca5adf0
1 parent dbb46ba
commit ca5adf0
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 12 deletions.
diff --git a/src/index.js b/src/index.js
@@ -21,17 +21,20 @@ module.exports.main = () => {
   else if(args.bad || args.good || args.unk) {
     let filterResult = args.bad ? 400 : 200;
     filterResult = args.unk ? 9999 : filterResult;
-
+    let displayJson = false;
+    if(args.j || args.json) displayJson = true;
     for(const file of filesToRead){
       initializeStream(file)
-      .then(data => testUrl(data, filterResult))
+      .then(data => testUrl(data, filterResult, displayJson))
       .catch(() => console.log("Error: Please provide a path to a file."));
     } 
   }
-  else if(Object.keys(args).length === 0) {
+  else if(Object.keys(args).length === 0 || args.j || args.json ) {
+    let displayJson = false;
+    if(args.j || args.json) displayJson = true;
     for(const file of filesToRead){
       initializeStream(file)
-      .then(data => testUrl(data))
+      .then(data => testUrl(data,null,displayJson))
       .catch(() => console.log("Error: Please provide a path to a file."));
     }
   }

diff --git a/src/url_functions/url-funcs.js b/src/url_functions/url-funcs.js
@@ -22,19 +22,35 @@ const testUrl = (urlArray, filterResult = null, output = false) => {
   Promise.all(urlPromises)
   .then(finalResults => finalResults.map(urlTest => {
     if(filterResult === null){
-      if (urlTest.status == 200) printLog(`URL: ${urlTest.url} Status: 200`, 200);
-      else if (urlTest.status == 400 || urlTest.status == 404) printLog(`URL: ${urlTest.url} Status: 400`, 400);
-      else printLog(`URL: ${urlTest.url} Status: Unknown`, 9999);
+      if (urlTest.status == 200){
+        printLog(`URL: ${urlTest.url} Status: 200`, 200);
+        return urlTest;
+      } 
+      else if (urlTest.status == 400 || urlTest.status == 404) {
+        printLog(`URL: ${urlTest.url} Status: 400`, 400);
+        return urlTest;
       }
-      else {
-        if((urlTest.status == filterResult) || (filterResult == 400 && urlTest.status == 404)) printLog(`URL: ${urlTest.url} Status: ${filterResult}`, filterResult);
-        else if((filterResult == 9999) && urlTest.status != 200 && urlTest.status && 400 && urlTest.status != 404 ) printLog(`URL: ${urlTest.url} Status: Unknown`, 9999);
+      else { 
+        printLog(`URL: ${urlTest.url} Status: Unknown`, 9999);
+        return urlTest;
       }
-      return urlTest
+    }
+    else {
+      if((urlTest.status == filterResult) || (filterResult == 400 && urlTest.status == 404)) {
+        printLog(`URL: ${urlTest.url} Status: ${filterResult}`, filterResult);
+        return urlTest;
+      }
+      else if((filterResult == 9999) && urlTest.status != 200 && urlTest.status != 400 && urlTest.status != 404 ){
+        printLog(`URL: ${urlTest.url} Status: Unknown`, 9999);
+        return urlTest;
+      } 
+    }
   }))
   .then((results) => {
+    if(output) {
     console.log("FINAL RESULT JSON:");
-    if(output) console.log(JSON.stringify(results));
+    console.log(JSON.stringify(results.filter(urlObj => urlObj != null)));
+    }
   })
   .catch((urlObj) => {
     console.log(urlObj);