Changeset 659

Timestamp:

02/11/08 06:01:07 (10 months ago)

Author:

ma..@jesperkristensen.dk

Message:

Move script meta-data parsing from ScriptDownloader? to Config

Files:

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

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

@@ -134 +134 @@
-};
-
+Config.prototype.parse = function(source, uri)
+{
+  var ioservice = Components.classes["@mozilla.org/network/io-service;1"]
+                            .getService(Components.interfaces.nsIIOService);
+
+  var script = new Script(this);
+  script.enabled = true;
+  script.includes = [];
+  script.excludes = [];
+
+  // read one line at a time looking for start meta delimiter or EOF
+  var lines = source.match(/.+/g);
+  var lnIdx = 0;
+  var result = {};
+  var foundMeta = false;
+
+  while ((result = lines[lnIdx++])) {
+    if (result.indexOf("// ==UserScript==") == 0) {
+      foundMeta = true;
+      break;
+    }
+  }
+
+  // gather up meta lines
+  if (foundMeta) {
+    // used for duplicate resource name detection
+    var previousResourceNames = {};
+
+    while ((result = lines[lnIdx++])) {
+      if (result.indexOf("// ==/UserScript==") == 0) {
+        break;
+      }
+
+      var match = result.match(/\/\/ \@(\S+)\s+([^\n]+)/);
+      if (match != null) {
+        switch (match[1]) {
+          case "name":
+          case "namespace":
+          case "description":
+            script[match[1]] = match[2];
+            break;
+          case "include":
+          case "exclude":
+            script[match[1]+"s"].push(match[2]);
+            break;
+          case "require":
+            var reqUri = ioservice.newURI(match[2], null, uri);
+            var scriptRequire = new ScriptRequire(script);
+            scriptRequire.url = reqUri.spec;
+            script.requires.push(scriptRequire);
+            break;
+          case "resource":
+            var res = match[2].match(/(\S+)\s+(.*)/);
+            if (res === null) {
+              // NOTE: Unlocalized strings
+              throw new Error("Invalid syntax for @resource declaration '" +
+                              match[2] + "'. Resources are declared like: " +
+                              "@resource <name> <url>.");
+            }
+
+            var resName = res[1];
+            if (previousResourceNames[resName]) {
+              throw new Error("Duplicate resource name '" + resName + "' " +
+                              "detected. Each resource must have a unique " +
+                              "name.");
+            } else {
+              previousResourceNames[resName] = true;
+            }
+
+            var resUri = ioservice.newURI(res[2], null, uri);
+            var scriptResource = new ScriptResource(script);
+            scriptResource.name = resName;
+            scriptResource.url = resUri.spec;
+            script.resources.push(scriptResource);
+            break;
+        }
+      }
+    }
+  }
+
+  // if no meta info, default to reasonable values
+  if (script.name == null) {
+    script.name = parseScriptName(uri);
+  }
+
+  if (script.namespace == null) {
+    script.namespace = uri.host;
+  }
+
+  if (script.includes.length == 0) {
+    script.includes.push("*");
+  }
+
+  return script;
+}
+
-Config.prototype.install = function(script) {
-  GM_log("> Config.install");

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

@@ -32 +32 @@
-
-  // create a script object with parsed metadata,
-
-
-
-
+
-
-  // make sure entered details will not ruin an existing file

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

@@ -53 +53 @@
-    var source = this.req_.responseText;
-
-
+
+
-
-    var file = Components.classes["@mozilla.org/file/directory_service;1"]
@@ -226 +227 @@
-};
-
-ScriptDownloader.prototype.parseScript = function(source, uri) {
-  var ioservice = Components.classes["@mozilla.org/network/io-service;1"]
-                            .getService(Components.interfaces.nsIIOService);
-
-  var config = new Config(); // This is fragile, but temporary until config becomes a service
-  var script = new Script(config);
-  script.enabled = true;
-  script.includes = [];
-  script.excludes = [];
-
-  // read one line at a time looking for start meta delimiter or EOF
-  var lines = source.match(/.+/g);
-  var lnIdx = 0;
-  var result = {};
-  var foundMeta = false;
-
-  while ((result = lines[lnIdx++])) {
-    if (result.indexOf("// ==UserScript==") == 0) {
-      foundMeta = true;
-      break;
-    }
-  }
-
-  // gather up meta lines
-  if (foundMeta) {
-    // used for duplicate resource name detection
-    var previousResourceNames = {};
-
-    while ((result = lines[lnIdx++])) {
-      if (result.indexOf("// ==/UserScript==") == 0) {
-        break;
-      }
-
-      var match = result.match(/\/\/ \@(\S+)\s+([^\n]+)/);
-      if (match != null) {
-        switch (match[1]) {
-          case "name":
-          case "namespace":
-          case "description":
-            script[match[1]] = match[2];
-            break;
-          case "include":
-          case "exclude":
-            script[match[1]+"s"].push(match[2]);
-            break;
-          case "require":
-            var reqUri = ioservice.newURI(match[2], null, uri);
-            var scriptRequire = new ScriptRequire(script);
-            scriptRequire.url = reqUri.spec;
-            script.requires.push(scriptRequire);
-            break;
-          case "resource":
-            var res = match[2].match(/(\S+)\s+(.*)/);
-            if (res === null) {
-              // NOTE: Unlocalized strings
-              throw new Error("Invalid syntax for @resource declaration '" +
-                              match[2] + "'. Resources are declared like: " +
-                              "@resource <name> <url>.");
-            }
-
-            var resName = res[1];
-            if (previousResourceNames[resName]) {
-              throw new Error("Duplicate resource name '" + resName + "' " +
-                              "detected. Each resource must have a unique " +
-                              "name.");
-            } else {
-              previousResourceNames[resName] = true;
-            }
-
-            var resUri = ioservice.newURI(res[2], null, uri);
-            var scriptResource = new ScriptResource(script);
-            scriptResource.name = resName;
-            scriptResource.url = resUri.spec;
-            script.resources.push(scriptResource);
-            break;
-        }
-      }
-    }
-  }
-
-  // if no meta info, default to reasonable values
-  if (script.name == null) {
-    script.name = parseScriptName(uri);
-  }
-
-  if (script.namespace == null) {
-    script.namespace = uri.host;
-  }
-
-  if (script.includes.length == 0) {
-    script.includes.push("*");
-  }
-
-  this.script = script;
-};
-
-
-function NotificationCallbacks() {
-};