Changeset 625

Timestamp:

01/19/08 14:13:14 (11 months ago)

Author:

oyasu..@gmail.com

Message:

Refactoring: centralizing @header parsing code to utils.js::GM_parseScriptHeaders, in preparation of improved @require/@resource handling. Still no functional changes, though; it's just as incomplete as it ever was.

Files:

• branches/jhs1/chrome/chromeFiles/content/config.js (modified) (1 diff)
• branches/jhs1/chrome/chromeFiles/content/scriptdownloader.js (modified) (2 diffs)
• branches/jhs1/chrome/chromeFiles/content/utils.js (modified) (2 diffs)

branches/jhs1/chrome/chromeFiles/content/config.js

@@ -283 +283 @@
-};
-
-)
-null
+url) 
+url || null;
-  this.file = null;
-  this.filename = null;
-};
-
-)
-
-
+name, url) 
+url || 
+ame || n
-  this.file = null;
-  this.filename = null;

branches/jhs1/chrome/chromeFiles/content/scriptdownloader.js

@@ -227 +227 @@
-
-ScriptDownloader.prototype.parseScript = function(source, uri) {
+  function resolveURL(url, baseurl) {
+    url = ioservice.newURI(url, null, baseurl);
+    return url.spec;
+  }
-  var ioservice = Components.classes["@mozilla.org/network/io-service;1"]
-                            .getService();
@@ -233 +237 @@
-  script.uri = uri;
-  script.enabled = true;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-      }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  this.script = script;

branches/jhs1/chrome/chromeFiles/content/utils.js

@@ -474 +474 @@
-};
-
+/**
+ * Returns true if the given script should be invoked on url, otherwise false.
+ */
-function GM_scriptMatchesUrl(script, url) {
-  for (var i = 0, glob; glob = script.includes[i]; i++) {
@@ -488 +491 @@
-  return false;
-}
+
+/**
+ * Returns an associative array from header name (sans @ prefix) to value.
+ * Values are arrays, unless headerSpec[name] was 1, in which case the value
+ * is a string only (the value of the last header with that name).
+ *
+ * If, instead of 1, a callback function is provided, the return value of that
+ * callback is becomes appended to the array instead. This callback is invoked
+ * with two arguments: the raw header, and the array with all prior callback
+ * results for this header (or the empty array).
+ *
+ * oldHeaders (optional) is used as the target object headers are appended to.
+ */
+function GM_parseScriptHeaders(source, headerSpec, oldHeaders) {
+  var headerRe = /.*/;
+  if (headerSpec) {
+    var allHeaders = [];
+    for (var header in headerSpec)
+      allHeaders.push(header);
+    headerRe = new RegExp("^(" + allHeaders.join("|") + ")$");
+  }
+
+  // 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;
+  var headers = oldHeaders || {};
+
+  while ((result = lines[lnIdx++])) {
+    if (result.indexOf("// ==UserScript==") == 0) {
+      GM_log("* found metadata");
+      foundMeta = true;
+      break;
+    }
+  }
+
+  // gather up meta lines
+  if (foundMeta) {
+    while ((result = lines[lnIdx++])) {
+      if (result.indexOf("// ==/UserScript==") == 0) {
+        break;
+      }
+
+      var match = result.match(/\/\/ \@(\S+)\s+([^\n]+)/);
+      if (match != null) {
+        var name = match[1], value = match[2];
+        if (!name.match(headerRe))
+          continue;
+        if (headerSpec && headerSpec[name] == 1) {
+          headers[name] = value; // only wanted the last value
+        }
+        else { // want an array of all values
+          if (!headers.hasOwnProperty(name))
+            headers[name] = [];
+          var callback = headerSpec && headerSpec[name] ||
+            function(header) { return header; };
+          headers[name].push(callback(value, headers[name]));
+        }
+      }
+    }
+  }
+  return headers;
+};