From 8e2a01f19f5c018a8d2b42700b9c317107d14ce9 Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Mon, 18 Feb 2013 20:55:54 +0100 Subject: [PATCH] Fix some comics. --- dosagelib/plugins/d.py | 2 +- dosagelib/plugins/g.py | 5 +++-- dosagelib/plugins/p.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dosagelib/plugins/d.py b/dosagelib/plugins/d.py index 2c9f62498..246342564 100644 --- a/dosagelib/plugins/d.py +++ b/dosagelib/plugins/d.py @@ -138,7 +138,7 @@ class DieselSweeties(_BasicScraper): class DominicDeegan(_BasicScraper): url = 'http://www.dominic-deegan.com/' stripUrl = url + 'view.php?date=%s' - imageSearch = compile(tagre("img", "src", r'(comics/\d+\.gif)')) + imageSearch = compile(tagre("img", "src", r'(comics/[^"]+)')) prevSearch = compile(r'"(view.php\?date=[^"]+)".+?prev21') help = 'Index format: yyyy-mm-dd' diff --git a/dosagelib/plugins/g.py b/dosagelib/plugins/g.py index 8d8ec2d97..683a31d44 100644 --- a/dosagelib/plugins/g.py +++ b/dosagelib/plugins/g.py @@ -31,7 +31,8 @@ class GUComics(_BasicScraper): url = 'http://www.gucomics.com/comic/' stripUrl = url + '?cdate=%s' imageSearch = compile(tagre("img", "src", r'(/comics/\d{4}/gu_[^"]+)')) - prevSearch = compile(tagre("a", "href", r'(/comic/\?cdate=\d+)') + '< Prev') + prevSearch = compile(tagre("a", "href", r'(/comic/\?cdate=\d+)') + + tagre("img", "src", r'/images/nav/prev\.png')) help = 'Index format: yyyymmdd' @@ -46,7 +47,7 @@ class GirlGenius(_BasicScraper): class GirlsWithSlingshots(_BasicScraper): url = 'http://www.girlswithslingshots.com/' stripUrl = url + 'comic/gws-%s/' - imageSearch = compile(tagre("img", "src", r'(http://cdn\.girlswithslingshots\.com/comics/[^"]+)')) + imageSearch = compile(tagre("img", "src", r'(http://(?:www|cdn)\.girlswithslingshots\.com/comics/[^"]+)')) prevSearch = compile(tagre("a", "href", r'(http://www\.girlswithslingshots\.com/comic/[^"]+)', after="prev")) help = 'Index format: nnn' diff --git a/dosagelib/plugins/p.py b/dosagelib/plugins/p.py index 20c09a3df..ebedb2c8a 100644 --- a/dosagelib/plugins/p.py +++ b/dosagelib/plugins/p.py @@ -19,7 +19,7 @@ class PandyLand(_BasicScraper): class ParadigmShift(_BasicScraper): url = 'http://www.paradigmshiftmanga.com/' starter = indirectStarter(url, compile(tagre("a", "href", r'([^"]+)', after="next-comic-link"))) - imageUrl = url + 'ps/%s.html' + stripUrl = url + 'ps/%s.html' imageSearch = compile(tagre("img", "src", r'([^"]*comics/ps/[^"]*)')) prevSearch = compile(tagre("a", "href", r'([^"]+)', after="previous-comic-link")) help = 'Index format: custom'