fixed Wulffmorgenthaler (now Wumo), added TruthFacts and MeAndDanielle

dosagelib/plugins/kindofnormal.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from dosagelib.helpers import indirectStarter
+from ..scraper import make_scraper, _ParserScraper
+
+
+def add(name, url):
+    attrs = dict(
+        name=name,
+        url='http://kindofnormal.com/' + url,
+        imageSearch='//article[1]//div[@class="box-content"]//img',
+        prevSearch='//a[@class="prev"]'
+    )
+    globals()[name] = make_scraper(name, _ParserScraper, **attrs)
+
+
+add('MeAndDanielle', 'meanddanielle')
+add('TruthFacts', 'truthfacts')
+add('Wumo', 'wumo')
+add('Wulffmorgenthaler', 'wumo') # name in previous versions

dosagelib/plugins/w.py

@@ -239,14 +239,3 @@ class _WorldOfWarcraftEh(_BasicScraper):
     stripUrl = None
     imageSearch = compile(r'http://woweh.com/(comics/.+?)"')
     prevSearch = compile(r'woweh.com/(\?p=.+:?)".+:?="prev')
-
-
-class Wulffmorgenthaler(_BasicScraper):
-    url = 'http://kindofnormal.com/wumo/'
-    rurl = escape(url)
-    stripUrl = url + '%s'
-    imageSearch = compile(tagre("div", "class", r'box-content') + r"\s*" +
-        tagre("a", "href", r'[^"]+') + r"\s*" +
-        tagre("img", "src", r'(http://kindofnormal\.com/img/wumo/\d+/\d+/[^/"]+)'))
-    prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl) + tagre("i", "class", r'icon-chevron-left'))
-    help = 'Index format: yyyy/mm/dd'