Improve checking and fix issue where pre-existing files weren't returned

package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-image-node-module",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "description": "UBports System image client/server module",
   "main": "./src/module.js",
   "scripts": {

src/client.js

@@ -100,9 +100,13 @@ class Client {
             }
           }
         }, 1000);
-        common.checkFiles(urls).then((_urls) => {
-          Promise.all(_urls.map((file) => {
-            return new Promise(function(resolve, reject) {
+        Promise.all(urls.map((file) => {
+          return new Promise(function(resolve, reject) {
+            common.checksumFile(file).then(() => {
+              next(++filesDownloaded, urls.length);
+              resolve();
+              return;
+            }).catch(() => {
               download(file.url, file.path).on("response", (res) => {
                 var totalSize = eval(res.headers['content-length']);
                 overallSize += totalSize;
@@ -112,33 +116,35 @@ class Client {
                 });
               }).then(() => {
                 common.checksumFile(file).then(() => {
-                  next(++filesDownloaded, _urls.length);
+                  next(++filesDownloaded, urls.length);
+                  resolve();
+                  return;
                 }).catch((err) => {
                   reject(err);
                   return;
                 });
               });
             });
-          })).then(() => {
-            var files = _this.getFilePushArray(urls);
-            files.push({
-              src: _this.createInstallCommandsFile(
-                _this.createInstallCommands(
-                  latest.files,
-                  options.installerCheck,
-                  options.wipe,
-                  options.enable
-                ),
-                options.device
+          });
+        })).then(() => {
+          var files = _this.getFilePushArray(urls);
+          files.push({
+            src: _this.createInstallCommandsFile(
+              _this.createInstallCommands(
+                latest.files,
+                options.installerCheck,
+                options.wipe,
+                options.enable
               ),
-              dest: ubuntuPushDir + ubuntuCommandFile
-            });
-            resolve(files);
-            return;
-          }).catch((err) => {
-            reject(err);
-            return;
+              options.device
+            ),
+            dest: ubuntuPushDir + ubuntuCommandFile
           });
+          resolve(files);
+          return;
+        }).catch((err) => {
+          reject(err);
+          return;
         });
       });
     });

src/common.js

@@ -27,57 +27,30 @@ function getRandomInt(min, max) {
 
 function checksumFile(file) {
   return new Promise(function(resolve, reject) {
-    if (!file.checksum) {
-      // No checksum so return true;
-      resolve();
-      return;
-    } else {
-      checksum.file(path.join(file.path, path.basename(file.url)), {
-        algorithm: "sha256"
-      }, function(err, sum) {
-        console.log("checked: " +path.basename(file.url), sum === file.checksum);
-        if (sum === file.checksum) resolve()
-        else reject()
-      });
-    }
-  });
-}
-
-function checkFiles(urls) {
-  return new Promise(function(resolve, reject) {
-    var urls_ = [];
-    var next = () => {
-      if (urls.length <= 1) {
-        resolve(urls_)
+    fs.access(path.join(file.path, path.basename(file.url)), (err) => {
+      if (err) {
+        reject();
       } else {
-        urls.shift();
-        check()
-      }
-    }
-    var check = () => {
-      fs.access(path.join(urls[0].path, path.basename(urls[0].url)), (err) => {
-        if (err) {
-          console.log("Not existing " + path.join(urls[0].path, path.basename(urls[0].url)));
-          urls_.push(urls[0]);
-          next();
+        if (!file.checksum) {
+          // No checksum so return true;
+          resolve();
+          return;
         } else {
-          checksumFile(urls[0]).then(() => {
-            console.log(path.join(urls[0].path, path.basename(urls[0].url)) + " exists with the expected checksum, so the download will be skipped.");
-            next();
-          }).catch(() => {
-            console.log("Checksum mismatch on " + path.join(urls[0].path, path.basename(urls[0].url)) + ". This file will be downloaded again.");
-            urls_.push(urls[0]);
-            next();
+          checksum.file(path.join(file.path, path.basename(file.url)), {
+            algorithm: "sha256"
+          }, function(err, sum) {
+            console.log("checked: " +path.basename(file.url), sum === file.checksum);
+            if (sum === file.checksum) resolve()
+            else reject()
           });
         }
-      })
-    }
-    check();
+      }
+    });
   });
 }
 
+
 module.exports = {
   getRandomInt: getRandomInt,
-  checkFiles: checkFiles,
   checksumFile: checksumFile
 };