From ca2d722d39140fa84a06f84c30305487d3d37e64 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Thu, 31 Jul 2014 21:18:15 +0200 Subject: [PATCH 1/3] 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/3] 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' From b9f7fb23e77e553b6e3fcff9c8183a7e01c82547 Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Wed, 6 Aug 2014 01:56:37 +0200 Subject: [PATCH 3/3] Updated votes [ci skip] --- doc/web/content/comics/CyanideAndHappiness.md | 2 +- doc/web/content/comics/NichtLustig.md | 2 +- doc/web/content/comics/Ruthe.md | 2 +- doc/web/media/js/comicdata.js | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/web/content/comics/CyanideAndHappiness.md b/doc/web/content/comics/CyanideAndHappiness.md index 530f1872b..925eb3944 100644 --- a/doc/web/content/comics/CyanideAndHappiness.md +++ b/doc/web/content/comics/CyanideAndHappiness.md @@ -32,7 +32,7 @@ if (window.location.search === '?edit_info_mail=sent_ok') { Statusok on 22.01.2014 -Votes2 +Votes3
diff --git a/doc/web/content/comics/NichtLustig.md b/doc/web/content/comics/NichtLustig.md index 99aee631b..fcaeb490b 100644 --- a/doc/web/content/comics/NichtLustig.md +++ b/doc/web/content/comics/NichtLustig.md @@ -32,7 +32,7 @@ if (window.location.search === '?edit_info_mail=sent_ok') { Statusok on 22.01.2014 -Votes4 +Votes5 diff --git a/doc/web/content/comics/Ruthe.md b/doc/web/content/comics/Ruthe.md index 83b1da4f0..6f25dda50 100644 --- a/doc/web/content/comics/Ruthe.md +++ b/doc/web/content/comics/Ruthe.md @@ -32,7 +32,7 @@ if (window.location.search === '?edit_info_mail=sent_ok') { Statusok on 22.01.2014 -Votes1 +Votes2 diff --git a/doc/web/media/js/comicdata.js b/doc/web/media/js/comicdata.js index ea12e717d..5c3702fea 100644 --- a/doc/web/media/js/comicdata.js +++ b/doc/web/media/js/comicdata.js @@ -464,7 +464,7 @@ $(document).ready(function() { ["CucumberQuest", "Other", "English", "ok", "0"], ["Curtailed", "Other", "English", "ok", "0"], ["Curvy", "Other", "English", "ok", "0"], -["CyanideAndHappiness", "Other", "English", "ok", "2"], +["CyanideAndHappiness", "Other", "English", "ok", "3"], ["DMFA", "Other", "English", "ok", "0"], ["DailyDose", "Other", "English", "ok", "0"], ["DamnLol", "Other", "English", "ok", "0"], @@ -1146,7 +1146,7 @@ $(document).ready(function() { ["NeoEarth", "Other", "English", "ok", "0"], ["NewAdventuresOfBobbin", "Other", "English", "error", "0"], ["NewWorld", "Other", "English", "ok", "0"], -["NichtLustig", "Other", "German", "ok", "4"], +["NichtLustig", "Other", "German", "ok", "5"], ["Nicky510", "Other", "English", "ok", "0"], ["1997", "Other", "English", "ok", "0"], ["Nnewts", "Other", "English", "ok", "0"], @@ -1210,7 +1210,7 @@ $(document).ready(function() { ["RedsPlanet", "Other", "English", "ok", "0"], ["RomanticallyApocalyptic", "Other", "English", "error", "0"], ["Roza", "Other", "English", "error", "0"], -["Ruthe", "Other", "German", "ok", "1"], +["Ruthe", "Other", "German", "ok", "2"], ["SMBC", "Other", "English", "ok", "2"], ["SPQRBlues", "Other", "English", "ok", "0"], ["SabrinaOnline", "Other", "English", "ok", "0"],