Merge pull request #4 from ochameau/bug/733582-post-1.4-refactoring-f…

…ixes Bug 733582: Post 1.4 refactoring fixes. r=@erikvold
mozilla · Sep 10, 2012 · 0c040e6 · 0c040e6
2 parents 7b46c8f + ccf05aa
commit 0c040e6
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 189 deletions.
diff --git a/lib/addon-install.js b/lib/addon-install.js
diff --git a/lib/addons-builder-helper.js b/lib/addons-builder-helper.js
@@ -5,40 +5,50 @@
 const { Cc, Ci, Cu } = require('chrome');
 const windowManager = Cc['@mozilla.org/appshell/window-mediator;1'].
                       getService(Ci.nsIWindowMediator);
+const windowUtils = require("api-utils/window/utils");
 
 const { PageMod } = require("addon-kit/page-mod");
 
-const { AddonInstall } = require("addon-install");
+const AddonInstaller = require("api-utils/addon/installer");
-const { createTemporaryFileFromData } = require("file-utils");
+const tmpFile = require("test-harness/tmp-file");
 
 const CONFIG_FILENAME = "addon-config.json";
 const CONFIG_PREF = "extensions.addonBuilderHelper.trustedOrigins";
 
 
 /**
  * Utility method to toggle the XUL JS Console.
- * Return `message` attribute send back to webpage.
+ * Return `message` attribute sent back to the webpage.
  */
-let consoleWindow = null;
 function toggleConsoleWindow(command) {
-  consoleWindow = windowManager.getMostRecentWindow('global:console');
+  let consoleWindow = windowManager.getMostRecentWindow('global:console');
   switch(command) {
     case 'open':
-      consoleWindow = consoleWindow ? consoleWindow.focus() :
+      if (consoleWindow)
-                                      windowManager.getMostRecentWindow(null)
+        consoleWindow.focus();
-                                                   .open('chrome://global/content/console.xul',
+      else
-                                                         '_blank',
+        windowUtils.open('chrome://global/content/console.xul', {
-                                                         'chrome,extrachrome,menubar,resizable,scrollbars,status,toolbar');
+          features: {
+            chrome: true, 
+            extrachrome: true,
+            menubar: true,
+            resizable: true,
+            scrollbars: true,
+            status: true,
+            toolbar: true
+          }
+        });
       break;
     case 'close':
-      consoleWindow = consoleWindow ? consoleWindow.close() : null;
+      if (consoleWindow)
+        consoleWindow.close();
       break;
     case 'isOpen':
       return consoleWindow ? true : false;
       break;
     default:
-      return 'An unrecognized command was passed through the "contents" ' +
+      return 'An unrecognized command was passed for the "toggleConsole" ' +
-             'property of the mozFlightDeck send object. Available commands ' +
+             'command of the mozFlightDeck send action. Available commands ' +
              'are "open", "close", and "isOpen"';
   }
   return null;
@@ -124,36 +134,49 @@ function onContentScriptRequest(addonManager, args, callback) {
 }
 
 function SingleAddonManager() {
-  var self = this;
+  let currentAddonId = null;
-  var currExtension = null;
 
   return {
     get isInstalled() {
-      return (currExtension != null && currExtension.isInstalled);
+      return currentAddonId != null;
     },
 
     get installedID() {
-      if (!currExtension)
+      return currentAddonId;
-        return null;
-      return currExtension.id;
     },
 
     install: function install(xpiData, callback) {
-      if (currExtension) {
+      // If an addon is already installed, uninstall it first
+      if (currentAddonId) {
         let self = this;
         self.uninstall(function () {
           self.install(xpiData, callback);
         });
       }
-      else
+      else {
-        currExtension = AddonInstall.new(createTemporaryFileFromData(xpiData), callback);
+        let xpiPath = tmpFile.createFromString(xpiData);
+        AddonInstaller.install(xpiPath).then(function success(addonId) {
+          currentAddonId = addonId;
+          if (typeof callback == "function")
+            callback(true, addonId);
+        },
+        function failure(reason) {
+          currentAddonId = null;
+          if (typeof callback == "function")
+            callback(false);
+        });
+      }
     },
 
     uninstall: function uninstall(callback) {
-      if (currExtension) {
+      if (!currentAddonId) {
-        var oldExtension = currExtension;
+        if (typeof callback == "function")
-        currExtension = null;
+          callback();
-        oldExtension.unload(callback);
+      }
+      else {
+        let addonId = currentAddonId;
+        currentAddonId = null;
+        AddonInstaller.uninstall(addonId).then(callback);
       }
     }
   };
@@ -186,7 +209,7 @@ exports.main = function main() {
     try {
       config.trustedOrigins = config.trustedOrigins.concat(pref.split(","));
     } catch (e) {
-      console.log("Error when reading preference " + CONFIG_PREF);
+      console.error("Error when reading preference " + CONFIG_PREF);
       console.exception(e);
     }
   }

diff --git a/lib/file-utils.js b/lib/file-utils.js
diff --git a/tests/test-addon-install.js b/tests/test-addon-install.js
diff --git a/tests/test-addons-builder-helper.js b/tests/test-addons-builder-helper.js
@@ -4,9 +4,9 @@
 
 const { Cc, Ci, Cu } = require("chrome");
 const tabs = require("addon-kit/tabs");
-const { Services } = Components.utils.import("resource://gre/modules/Services.jsm");
+const { Services } = Cu.import("resource://gre/modules/Services.jsm");
 
-const { readBinaryURI } = require("file-utils");
+const { getChromeURIContent } = require("api-utils/utils/data");
 
 const TEST_ADDON_URL = require("self").data.url("abh-unit-test@mozilla.com.xpi");
 
@@ -189,7 +189,7 @@ exports.testInstall = createTest(
     Services.obs.addObserver(eventsObserver, "abh-unit-test", false);
 
     // We can't use self.data.load as it doesn't read in binary mode!
-    let xpiData = readBinaryURI(TEST_ADDON_URL);
+    let xpiData = getChromeURIContent(TEST_ADDON_URL);
     worker.port.emit("xpiData", xpiData);
 
     worker.port.on("uninstalled", function () {