From ca2d722d39140fa84a06f84c30305487d3d37e64 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Thu, 31 Jul 2014 21:18:15 +0200 Subject: [PATCH 1/2] Fix DieFruehreifen (closes #73). --- dosagelib/plugins/d.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dosagelib/plugins/d.py b/dosagelib/plugins/d.py index 0368b2d41..c6afbe276 100644 --- a/dosagelib/plugins/d.py +++ b/dosagelib/plugins/d.py @@ -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' From 08175d28c9dae1a339ba002bb22e9225ab666547 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Thu, 31 Jul 2014 21:27:49 +0200 Subject: [PATCH 2/2] Fix Ruthe (see #73). --- dosagelib/plugins/r.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dosagelib/plugins/r.py b/dosagelib/plugins/r.py index 2b462013b..1d1e6f0db 100644 --- a/dosagelib/plugins/r.py +++ b/dosagelib/plugins/r.py @@ -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'