Changeset 658

Timestamp:

02/10/08 13:42:00 (10 months ago)

Author:

ma..@jesperkristensen.dk

Message:

Changes to Config.initFilename. Use nsIFile.createUnique instead of buggy code.

Files:

• branches/config-service/src/chrome/chromeFiles/content/config.js (modified) (8 diffs)
• branches/config-service/src/chrome/chromeFiles/content/newscript.js (modified) (1 diff)
• branches/config-service/src/chrome/chromeFiles/content/versioning.js (modified) (2 diffs)

branches/config-service/src/chrome/chromeFiles/content/config.js

@@ +1 @@
+// In this file protected properties (prefixed with an underscore) may be
+// used anywhere within this file and versioning.js
+
-function Config() {
-  this.onload = null;
@@ -22 +25 @@
-  return -1;
-};
-
-Config.prototype.initFilename = function(script) {
-  var index = {};
-  var base = script.name.replace(/[^A-Z0-9_]/gi, "").toLowerCase();
-
-  // If no Latin characters found - use default
-  if (!base) {
-    base = "gm_script";
-  }
-
-  // 24 is a totally arbitrary max length
-  if (base.length > 24) {
-    base = base.substring(0, 24);
-  }
-
-  for (var i = 0; i < this.scripts.length; i++) {
-    index[this.scripts[i].basedir] = this.scripts[i];
-  }
-
-  if (!index[base]) {
-    script.filename = base + ".user.js";
-    script.basedir = base;
-    return;
-  }
-
-  for (var count = 1; count < Number.MAX_VALUE; count++) {
-    if (!index[base + count]) {
-      script.filename = base + ".user.js";
-      script.basedir = base + "("+ count + ")";
-      return;
-    }
-
-    if (!index[filename]) {
-      // Check to make sure there's no file already in that space.
-      var file = this.scriptDir.clone();
-      file.append(filename);
-      if (!file.exists()) {
-        script.filename = filename;
-        return;
-      }
-    }
-  }
-  // NOTE: non localised string
-  throw new Error("doooooooode. get some different user script or something.");
-};
-
-Config.prototype.initDependencyFilename = function(script, req) {
-  var remoteFilename = req.url.substr(req.url.lastIndexOf("/") + 1);
-
-  if(remoteFilename.indexOf("?")>0){
-    remoteFilename = remoteFilename.substr(0, remoteFilename.indexOf("?"));
-  }
-
-  var dotIndex = remoteFilename.lastIndexOf(".");
-  if (dotIndex > 0) {
-    var base = remoteFilename.substring(0, dotIndex);
-    var ext = remoteFilename.substring(dotIndex+1);
-  } else {
-    var base = remoteFilename;
-    var ext = "";
-  }
-
-  ext = ext.replace(/[^A-Z0-9_]/gi, "");
-  base = base.replace(/[^A-Z0-9_]/gi, "");
-
-  if (base.length > 24) {
-    base = base.substring(0, 24);
-  }
-
-  if (ext.length > 0){
-    ext = "."+ext;
-  }
-
-  for (var count = 0; count < Number.MAX_VALUE; count++) {
-    var stamp = (count > 0) ? "(" + count + ")" : "";
-    var filename = base + stamp + ext;
-    var file = script.basedirFile;
-    file.append(filename);
-
-    if (!file.exists()) {
-      return filename;
-    }
-  }
-  return undefined;
-}
-
-Config.prototype.load = function() {
@@ -220 +138 @@
-
-  try {
-    // initialize a new script object
-    script.filename = script.tempFile.leafName;
-
-    var newDir = this.scriptDir;
-    var existingIndex = this.find(script.namespace, script.name);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    this.scripts.push(script);
@@ -259 +158 @@
-    // NOTE: unlocalised string
-    alert("Error installing user script:\n\n" + (e2 ? e2 : ""));
+    throw e2;
-  }
-};
@@ -275 +175 @@
-     GM_prefRoot.remove("scriptvals." + script.namespace + "/" + script.name + ".");
-}
-
-Config.prototype.installDependency = function(script, req){
-  GM_log("Installing dependency: " + req.url  + " from " + req.tempFile.path);
-
-  var scriptDir = this.scriptDir;
-  GM_log("Installing to " + script.basedir);
-  scriptDir.append(script.basedir);
-
-  req.filename = this.initDependencyFilename(script, req);
-  GM_log("Installing as: " + req.filename);
-
-  try {
-    req.tempFile.copyTo(scriptDir, req.filename)
-  } catch(e) {
-    throw e;
-  }
-};
-
-Config.prototype.__defineGetter__("scriptDir", function() {
@@ -358 +241 @@
-    file.append(this.basedir);
-    return file;
+  },
+
+  _initFileName: function(name, useExt)
+  {
+    var ext = "";
+    name = name.toLowerCase();
+
+    var dotIndex = name.lastIndexOf(".");
+    if (dotIndex > 0 && useExt) {
+      ext = name.substring(dotIndex + 1);
+      name = name.substring(0, dotIndex);
+    }
+
+    name = name.replace(/[^A-Z0-9_]/gi, "");
+    ext = ext.replace(/[^A-Z0-9_]/gi, "");
+
+    // If no Latin characters found - use default
+    if (!name)
+      name = "gm_script";
+
+    // 24 is a totally arbitrary max length
+    if (name.length > 24)
+      name = name.substring(0, 24);
+
+    if (ext)
+      name += "." + ext;
+  
+    return name;
+  },
+
+  _initFile: function(tempFile)
+  {
+    var file = this._config.scriptDir;
+    var name = this._initFileName(this.name, false);
+
+    file.append(name);
+    file.createUnique(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0755);
+    this.basedir = file.leafName;
+
+    file.append(name + ".user.js");
+    file.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644);
+    this.filename = file.leafName;
+
+    GM_log("Moving script file from " + tempFile.path + " to " + file.path);
+
+    file.remove(true);
+    tempFile.moveTo(file.parent, file.leafName);
-  }
-}
@@ -375 +305 @@
-    file.append(this.filename);
-    return file;
+  },
+
+  _initFile: function()
+  {
+    var name = this.url.substr(this.url.lastIndexOf("/") + 1);
+    if(name.indexOf("?") > 0)
+      name = name.substr(0, name.indexOf("?"));
+    name = this._script._initFileName(name, true);
+
+    var file = this._script.basedirFile;
+    file.append(name);
+    file.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644);
+    this.filename = file.leafName;
+
+    GM_log("Moving dependency file from " + this.tempFile.path + " to " + file.path);
+
+    file.remove(true);
+    this.tempFile.moveTo(file.parent, file.leafName);
+    this.tempFile = null;
-  }
-}
@@ -395 +344 @@
-    file.append(this.filename);
-    return file;
-
-
+
+
+
+

branches/config-service/src/chrome/chromeFiles/content/newscript.js

@@ -46 +46 @@
-  // finish making the script object ready to install
-  script.tempFile = tempFile;
-  config.initFilename(script);
-
-  // install this script

branches/config-service/src/chrome/chromeFiles/content/versioning.js

@@ +1 @@
+// In this file protected properties (prefixed with an underscore) may be
+// used anywhere within this file and config.js
+
-/**
- * Checks whether the version has changed since the last run and performs
@@ -129 +132 @@
-        var scriptFile = this.oldScriptDir;
-        scriptFile.append(script.filename);
-
-
-
+
-      }
-    }