Merge branch 'issue-6' into master

tianlangwu · Oct 7, 2020 · c3af227 · c3af227
2 parents f0ed3d5 + bbc0644
commit c3af227
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 31 deletions.
diff --git a/readers/fileReader.js b/readers/fileReader.js
@@ -1,7 +1,8 @@
 fs = require('fs');
 const sendRequest = require("../urlRequest/urlRequest.js")
 
-const readFile = (fileString, json) => { 
+const readFile = (fileString, json, status) => { 
+
 
 fs.readFile(fileString, function (err, data) {
 
@@ -19,7 +20,7 @@ fs.readFile(fileString, function (err, data) {
 
         for (let i = 0; i < uniqueUrls.length; i++) {
             let url = uniqueUrls[i];
-            sendRequest(url, json);
+            sendRequest(url, json, status);
         }
     }
 

diff --git a/urlRequest/urlRequest.js b/urlRequest/urlRequest.js
@@ -1,29 +1,36 @@
 const request = require('sync-request');
 const chalk = require('chalk');
 
-const sendRequest = (url, json) => { 
-
-try {
-    let response = request('GET', url);
-
-    if (json == true){
-
-        jsonObj = {
-            url: url,
-            status: response.statusCode.toString()
+const sendRequest = (url, json, status) => { 
+
+    try {
+        const response = request('GET', url);
+
+        if (json == true){
+            jsonObj = {
+                url: url,
+                status: response.statusCode.toString()
+            }
+            console.log(JSON.stringify(jsonObj));
         }
 
-        console.log(JSON.stringify(jsonObj));
-    }
-
-    else{ 
-        if (response.statusCode == 200) console.log(chalk.green("[GOOD] " + url));
-        else if (response.statusCode == 400 || response.statusCode == 404) console.log(chalk.red("[BAD] " + url));
-        else if (response.statusCode == 301 || response.statusCode == 307|| response.statusCode == 308) console.log(chalk.blue("[Redirect]" + url))
-        else console.log(chalk.grey("[UNKNOWN]" + url));
-    }
-
-} catch (e) { console.log("[Broken/No Response]" + url) }
+        else {
+                if (status == "good"){
+                    if (response.statusCode == 200) console.log(chalk.green("[GOOD] " + url));
+                }
+
+                else if(status == "bad"){
+                    if (response.statusCode == 400 || response.statusCode == 404) console.log(chalk.red("[BAD] " + url));
+                }
+
+                else {
+                    if (response.statusCode == 200) console.log(chalk.green("[GOOD] " + url));
+                    else if (response.statusCode == 400 || response.statusCode == 404) console.log(chalk.red("[BAD] " + url));
+                    else if (response.statusCode == 301 || response.statusCode == 307|| response.statusCode == 308) console.log(chalk.blue("[Redirect]" + url))
+                    else console.log(chalk.grey("[UNKNOWN]" + url));
+                }
+            }
+    } catch (e){}
 
 }
 

diff --git a/urlstatuschecker.js b/urlstatuschecker.js
@@ -27,21 +27,26 @@ else if (process.argv.length == 3) {
 
 else if (process.argv.length > 3) {
 
-    if (argv.u) readUrl(process.argv[3]);
+    let status = "all";
+    let json = false;
+    let i = 3;
 
-    else if(argv.j || argv.json) {
-        for (let i = 3; i< process.argv.length; i++){
-            readFile(process.argv[i], true);
-        }
+    if (argv.good) status = "good";
+    else if (argv.bad) status = "bad";
+    else if (argv.json || argv.j) json = true;
+    else {
+        status = "all";
+        i = 2;
     }
+
+    if (argv.u) readUrl(process.argv[3]);
 
     else {
-        for (let i = 2; i< process.argv.length; i++){
-            readFile(process.argv[i], false);
+        for (i; i< process.argv.length; i++){
+            readFile(process.argv[i], json, status);
         }
     }
 
 }
 
 else console.log("Wrong arguments passed");
-