Updated files

Author: linusjf

spider5/spider.js

@@ -14,14 +14,16 @@ const TaskQueue = require("./taskQueue");
 const validator = require("./validator");
 
 function spiderLinks(currentUrl, body, nesting, callback) {
-  if(nesting === 0) {
+  if(nesting === 0) 
     return process.nextTick(callback);
-  }
 
   const links = utilities.getPageLinks(currentUrl, body);
-  if(links.length === 0) {
+  if(links.length === 0) 
     return process.nextTick(callback);
+<<<<<<< HEAD
   }
+=======
+>>>>>>> development
 let downloadQueue = new TaskQueue(cmdConfig.get("concurrency",2));
 
   let completed = 0, hasErrors = false;
@@ -93,14 +95,27 @@ function spider(url, nesting, callback) {
   });
 }
 
-if (!validator.validate())
-	process.exit();
+const errors = validator.validate();
+if (errors.length || cmdConfig.get("help"))
+{
+  console.log(cmdConfig.usage);
+  errors.forEach((err) => 
+  {
+    console.error(err);
+  });
+  process.exit(errors.length);
+}
 
 spider(cmdConfig.get("url"), cmdConfig.get("nesting",1), (err) => {
   if(err) {
-    console.log(err);
-    process.exit();
+    console.error(err);
+    process.exit(1);
   } else {
     console.log("Download complete");
+<<<<<<< HEAD
+=======
+    process.exit(0);
+>>>>>>> development
   }
 });
+

spider5/validator.js

@@ -6,6 +6,7 @@ const validator = require("validator");
 const cmdConfig = require("./cmdconfig");
 const assert = require("assert");
 
+<<<<<<< HEAD
 module.exports.validate = function()
 {
 	const options = cmdConfig.options;
@@ -56,12 +57,65 @@ assert(options._all.url,"No url specified");
 		console.error(err.message);
 	}
 	}
-
-			if (assertCount || options._all.help)
-	{
-		console.error(cmdConfig.usage);
-		return false;
-	}
-	
-	return true;
+=======
+module.exports.validate = function() {
+    const options = cmdConfig.options;
+    let errors = [];
+    errors = validateEmptyURL(options._all.url, errors);
+    errors = validateURLFormat(options._all.url, errors);
+    errors = validateConcurrency(options._all.concurrency, errors);
+    errors = validateNesting(options._all.nesting, errors);
+    return errors;
 };
+
+function validateEmptyURL(url, errors) {
+    try {
+        assert(url, "No url specified");
+    } catch (err) {
+        errors.push(err.message);
+    }
+    return errors;
+}
+>>>>>>> development
+
+function validateURLFormat(url, errors) {
+    if (url) {
+        try {
+            assert(validator.isURL(url, {
+                protocols: ["http", "https"],
+                require_host: true,
+                require_valid_protocol: true,
+                require_protocols: true
+            }), url + " is invalid.");
+        } catch (err) {
+            errors.push(err.message);
+        }
+    }
+    return errors;
+}
+
+function validateConcurrency(concurrency, errors) {
+    if (concurrency !== undefined) {
+        try {
+            assert(validator.isInt(concurrency.toString(), {
+                min: 1
+            }), "Concurrency must be greater than 0");
+        } catch (err) {
+            errors.push(err.message);
+        }
+    }
+    return errors;
+}
+
+function validateNesting(nesting, errors) {
+    if (nesting !== undefined) {
+        try {
+            assert(validator.isInt(nesting.toString(), {
+                gt: 0
+            }), "Nesting must be greater than 0");
+        } catch (err) {
+            errors.push(err.message);
+        }
+    }
+    return errors;
+}