From d4a81c5de43ba4eed359ef0e25ed24b7399de3d5 Mon Sep 17 00:00:00 2001
From: Matěj Cepl <mcepl@redhat.com>
Date: Tue, 22 Jun 2010 09:49:01 +0200
Subject: Make skipping over attachment.cgi work and more cleanup

- improve regexp in main.js / skipThisPage
- fix util.notification to not crash
- remove non-ASCII characters from package.json
---
 lib/main.js |  7 ++++---
 lib/util.js | 12 ++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/main.js b/lib/main.js
index 7c72599..61a566d 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -32,7 +32,8 @@ config.skipMatches = [
     "https://bugzilla.redhat.com/process_bug.cgi",
     "https://bugzilla.redhat.com/post_bug.cgi",
     "https://bugzilla.mozilla.org/post_bug.cgi",
-    "https://bugzilla.mozilla.org/process_bug.cgi"
+    "https://bugzilla.mozilla.org/process_bug.cgi",
+    "https://bugzilla.redhat.com/attachment.cgi$"
 ];
 
 // ==============================================================
@@ -74,10 +75,10 @@ function isOurPage(window, matchingURLs) {
 function skipThisPage(doc) {
     var stemURL = "https://HOSTNAME/show_bug.cgi?id=";
     var titleStr = doc.getElementsByTagName("title")[0].textContent;
-    var REArr = new RegExp("[0-9]+").exec(titleStr);
+    var REArr = new RegExp("[bB]ug\\s+([0-9]+)").exec(titleStr);
     var hostname = urlMod.URL(doc.location.href).host;
     if (REArr) {
-        var bugNo = REArr[0];
+        var bugNo = REArr[1];
         console.log("bugNo = " + bugNo + ", hostname = " + hostname);
         var emailsSent = doc.
         querySelector("#bugzilla-body > dl:nth-of-type(1)").textContent;
diff --git a/lib/util.js b/lib/util.js
index b832ac0..02fd476 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -62,12 +62,12 @@ exports.notification = function notification(msg) {
 
     if (typeof(msg) === "object") {
         body = msg.body;
-    }
-    if ("title" in msg) {
-        title = msg.title;
-    }
-    if ("icon" in msg) {
-        icon = msg.icon;
+        if ("title" in msg) {
+            title = msg.title;
+        }
+        if ("icon" in msg) {
+            icon = msg.icon;
+        }
     }
     try {
         var classObj = Cc["@mozilla.org/alerts-service;1"];
-- 
cgit