Checks path to archive before processing

blackberry · Nov 5, 2012 · 7fbf0d3 · 7fbf0d3
1 parent bbdd2ae
commit 7fbf0d3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/lib/file-manager.js b/lib/file-manager.js
@@ -108,10 +108,14 @@ function prepare(session) {
     }
 
     // unzip archive
-    if (session.archivePath.toLowerCase().match("[.]zip$")) {
-        unzip(session.archivePath, session.sourceDir);
+    if (path.existsSync(session.archivePath)) {
+        if (session.archivePath.toLowerCase().match("[.]zip$")) {
+            unzip(session.archivePath, session.sourceDir);
+        } else {
+            copyDirContents(session.archivePath, session.sourceDir);
+        }
     } else {
-        copyDirContents(session.archivePath, session.sourceDir);
+        throw localize.translate("EXCEPTION_INVALID_ARCHIVE_PATH", session.archivePath);
     }
 
     //test for existing webworks.js files

diff --git a/lib/localize.js b/lib/localize.js
@@ -174,6 +174,9 @@ var Localize = require("localize"),
         },
         "WARN_WEBPLATFORM_I18N_PACKAGED" : {
             "en": "i18n.js has been packaged as an alternative to the on device version"
+        },
+        "EXCEPTION_INVALID_ARCHIVE_PATH" : {
+            "en": "An archive or directory does not exist at the path specified: \"$[1]\""
         }
 
     }, "", ""); // TODO maybe a bug in localize, must set default locale to "" in order get it to work

diff --git a/test/unit/lib/file-manager.js b/test/unit/lib/file-manager.js
@@ -10,6 +10,7 @@ var srcPath = __dirname + "/../../../lib/",
     conf = require(srcPath + "conf"),
     fileMgr = require(srcPath + "file-manager"),
     testData = require("./test-data"),
+    testUtilities = require("./test-utilities"),
     session = testData.session,
     extManager = {
         getAllExtensionsToCopy: function (accessList) {
@@ -257,4 +258,13 @@ describe("File manager", function () {
         expect(path.existsSync(session.sourcePaths.LIB)).toBeTruthy();
     });
 
+    it("prepareOutputFiles() should throw an error if the archive path doesn't exist", function () {
+        spyOn(wrench, "copyDirSyncRecursive");
+        var tempSession = testUtilities.cloneObj(session);
+        tempSession.archivePath = path.resolve("test/non-existant.zip");
+        expect(function () {
+            fileMgr.prepareOutputFiles(tempSession);
+        }).toThrow(localize.translate("EXCEPTION_INVALID_ARCHIVE_PATH", tempSession.archivePath));
+    });
+
 });