Merge branch 'master' of github.com:wummel/dosage

This commit is contained in:
Bastian Kleineidam 2014-08-06 20:01:46 +02:00
commit f76006d89d
2 changed files with 3 additions and 3 deletions

View file

@ -159,7 +159,7 @@ class DieFruehreifen(_BasicScraper):
url = 'http://www.die-fruehreifen.de/index.php'
stripUrl = url + '?id=%s&order=DESC'
firstStripUrl = stripUrl % '1'
imageSearch = compile(tagre("img", "src", r"(strips/[F,f]rueh[_]?[S,s]trip_\d+.jpg)"))
imageSearch = compile(tagre("img", "src", r'([^"]*/strips/[Ff]rueh_?[Ss]trip_\d+.jpg)'))
prevSearch = compile(tagre("a", "href", r"(index\.php\?id=\d+&order=DESC)") + tagre("img","id",r"naechster"))
help = 'Index format: n (unpadded)'
lang = 'de'

View file

@ -96,6 +96,6 @@ class Ruthe(_BasicScraper):
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"))
imageSearch = compile(tagre("img", "src", r'(/?cartoons/strip_\d+[^"]+)'))
prevSearch = compile(tagre("a", "href", r'(/cartoon/\d+/datum/asc/)')+'vorheriger')
help = 'Index format: number'