Add and fix some comics.

doc/changelog.txt

@@ -2,9 +2,14 @@ Dosage 1.14 (released xx.xx.2013)
 
 Features:
 - comics: Added KeenSpot comic strips, enable ComicGenesis
-  comic strips, added FullFrontalNerdity, GeeksNextDoor.
+  comic strips, added DerFlix, FonFlatter, FullFrontalNerdity,
+  GeeksNextDoor, Ruthe.
   Closes: GH bug #15
 
+Changes:
+- comics: The scraper can check a list of previous and image link
+  regular expressions, not only a single one.
+
 
 Dosage 1.13 (released 11.3.2013)
 

dosagelib/plugins/d.py

@@ -79,6 +79,17 @@ class DeepFried(_BasicScraper):
     help = 'Index format: non'
 
 
+class DerFlix(_BasicScraper):
+    url = 'http://derflix.de/'
+    stripUrl = url + 'index.php?preselect=%s'
+    firstStripUrl = stripUrl % '1'
+    lang = 'de'
+    imageSearch = compile(tagre("img", "src", r'(autocartoons/\d+\.[^"]+)'))
+    prevSearch = compile(tagre("a", "href", r'(index\.php\?preselect=\d+)') +
+        tagre("img", "src", r'autocartoons/rahmen_zurueck\.jpg'))
+    help = 'Index format: number'
+
+
 class DieselSweeties(_BasicScraper):
     url = 'http://www.dieselsweeties.com/'
     stripUrl = url + 'archive/%s'

dosagelib/plugins/f.py

@@ -107,6 +107,16 @@ class Flipside(_BasicScraper):
     help = 'Index format: nnnn'
 
 
+class FonFlatter(_BasicScraper):
+    url = 'http://www.fonflatter.de/'
+    stripUrl = url + '%s/'
+    firstStripUrl = stripUrl % '2005/09/20/01-begegnung-mit-batman'
+    lang = 'de'
+    imageSearch = compile(tagre("img", "src", r'(http://www\.fonflatter\.de/\d+/fred_\d+-\d+-\d+[^"]+)'))
+    prevSearch = compile(tagre("a", "href", r'(http://www\.fonflatter\.de/[^"]+)', after="prev"))
+    help = 'Index format: yyyy/mm/dd/number-stripname'
+
+
 class Footloose(_BasicScraper):
     url = 'http://footloosecomic.com/footloose/today.php'
     stripUrl = 'http://footloosecomic.com/footloose/pages.php?page=%s'

dosagelib/plugins/g.py

@@ -52,14 +52,6 @@ class GeeksNextDoor(_BasicScraper):
     help = 'Index format: yyyy-mm-dd'
 
 
-class GirlGenius(_BasicScraper):
-    url = 'http://girlgeniusonline.com/comic.php'
-    stripUrl = url + '?date=%s'
-    imageSearch = compile(r"(/ggmain/strips/.+?)'")
-    prevSearch = compile(r"</a> <a href=.+?(/comic.php\?date=.+?)'.+?Previous")
-    help = 'Index format: yyyymmdd'
-
-
 class GirlsWithSlingshots(_BasicScraper):
     url = 'http://www.girlswithslingshots.com/'
     stripUrl = url + 'comic/gws-%s/'

dosagelib/plugins/p.py

@@ -161,7 +161,7 @@ class Precocious(_BasicScraper):
       compile(tagre("a", "href", r'(/archive/comic/[^"]+)') + tagre("img", "src", r"/templates/precocious_main/images/next_arrow\.png"))
     )
     stripUrl = url + 'archive/comic/%s'
-    imageSearch = compile(tagre("img", "src", r'(/comics/\d+\.jpg)'))
+    imageSearch = compile(tagre("img", "src", r'(/comics/\d+[^"]*\.jpg)'))
     prevSearch = compile(tagre("a", "href", r'(/archive/comic/[^"]+)') + tagre("img", "src", r"/templates/precocious_main/images/back_arrow\.png"))
     help = 'Index format: yyyy/mm/dd'
 

dosagelib/plugins/r.py

@@ -51,3 +51,13 @@ class Roza(_BasicScraper):
     imageSearch = compile(r'<img src="(pages/.+?)"')
     prevSearch = compile(r'<a href="(index.php\?date=.+?)">[^>].+?navtable_01.gif')
     help = 'Index format: yyyy-mm-dd'
+
+
+class Ruthe(_BasicScraper):
+    url = 'http://ruthe.de/'
+    stripUrl = url + 'index.php?pic=%s&sort=datum&order=ASC'
+    firstStripUrl = stripUrl % '1'
+    lang = 'de'
+    imageSearch = compile(tagre("img", "src", r'(cartoons/strip_\d+[^"]+)'))
+    prevSearch = compile(tagre("a", "href", r'(index\.php\?pic=[^"]+)', before="b_back"))
+    help = 'Index format: number'