Merge pull request #804 from hdhoang/master

add some enhancers

2 files changed, 40 insertions, 8 deletions

diff --git a/articleenhancer/regexenhancers.json b/articleenhancer/regexenhancers.json
index fd83d0b3f..53eeece40 100644
--- a/articleenhancer/regexenhancers.json
+++ b/articleenhancer/regexenhancers.json
@@ -4,11 +4,6 @@
             "%http://www.twogag.com/comics-rss/([^.]+)\\.jpg%": "http://www.twogag.com/comics/$1.jpg"
         }
     },
-    "buttersafe.com": {
-        "%(?:buttersafe.com)|(feedproxy.google.com/~r/Buttersafe)%": {
-            "%buttersafe.com/comics/rss/([^.]+)RSS([^.]+)?.jpg%": "buttersafe.com/comics/$1$2.jpg"
-        }
-    },
     "nichtlustig.de": {
         "%nichtlustig.de%": {
             "%.*static.nichtlustig.de/comics/full/(\\d+).*%s": "<img src=\"http://static.nichtlustig.de/comics/full/$1.jpg\" />"
@@ -32,5 +27,33 @@
             "%-\\d+x\\d+%": "",
             "%(width|height)=\"\\d+\"%" : ""
         }
+    },
+    "extrafabulouscomics.com": {
+	"%extrafabulouscomics.com/comic/%": {
+            "%-\\d+x\\d+%": "",
+            "%(width|height)=\"\\d+\"%" : ""
+	}
+    },
+    "endlessorigami.com": {
+	"%endlessorigami.com/comic/%": {
+            "%-\\d+x\\d+%": "",
+            "%(width|height)=\"\\d+\"%" : ""
+	}
+    },
+    "www.loadingartist.com": {
+	"%www.loadingartist.com/comic/%": {
+            "%-\\d+x\\d+%": "",
+            "%(width|height)=\"\\d+\"%" : ""
+	}
+    },
+    "xkcd.com": {
+	"%xkcd.com/\\d+/%": {
+	    "%alt=\"(.+)\" */>%": "/><br/>$1"
+	}
+    },
+    "www.treelobsters.com": {
+	"%www.treelobsters.com%": {
+	    "%title=\"(.+)\" */>%": "/><br/>$1"
+	}
     }
 }
diff --git a/articleenhancer/xpathenhancers.json b/articleenhancer/xpathenhancers.json
index 520c84a6f..a088a6ec6 100644
--- a/articleenhancer/xpathenhancers.json
+++ b/articleenhancer/xpathenhancers.json
@@ -99,9 +99,6 @@
     "eqcomics.com": {
         "%feedproxy.google.com/~r/eqcomics%": "//div[@id=\"comic\"]/div/a/img"
     },
-    "loadingartist.com": {
-        "%feedproxy.google.com/~r/LoadingArtist%": "//div[@id=\"comic\"]"
-    },
     "thegamercat.com": {
         "%thegamercat.com%": "//div[@id=\"comic\"] | //div[@class=\"post-content\"]/div[@class=\"entry\"]/p"
     },
@@ -173,5 +170,17 @@
     },
     "outdoordeals.de": {
         "%outdoordeals.de%": "//article[contains(@class,'blogpost')]/div[@class='inner']"
+    },
+    "buttersafe.com": {
+	"%buttersafe.com%": "//div[@id='comic'] | //div[@class='post-comic']"
+    },
+    "www.pixelbeat.org": {
+	"%www.pixelbeat.org%": "//div[@class='contentText']"
+    },
+    "gocomics.com/pearlsbeforeswine": {
+	"%gocomics.com/pearlsbeforeswine%": "//div[1]/p[1]/a[1]/img"
+    },
+    "marriedtothesea.com": {
+	"%marriedtothesea.com%": "//div[@align]/a/img"
     }
 }