From f4889350725bdf28288f6c42c21e5e55eac807af Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Sun, 22 Dec 2013 08:01:58 +0100 Subject: [PATCH] Fix AbstruseGoose and QuestionabelContent. --- doc/changelog.txt | 2 ++ dosagelib/plugins/a.py | 4 ++-- dosagelib/plugins/q.py | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/changelog.txt b/doc/changelog.txt index d1a7d9631..e41601dee 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -10,6 +10,8 @@ Features: Fixes: - comics: Get larger images from GoComics. +- comics: Fix AbstruseGoose and QuestionabelContent. + Closes: GH bug #50 Dosage 2.8 (released 8.12.2013) diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py index 900bda653..f5b967e75 100644 --- a/dosagelib/plugins/a.py +++ b/dosagelib/plugins/a.py @@ -30,12 +30,12 @@ class AbsurdNotions(_BasicScraper): class AbstruseGoose(_BasicScraper): - url = 'http://abstrusegoose.com/' + url = 'http://www.abstrusegoose.com/' rurl = escape(url) starter = bounceStarter(url, compile(tagre('a', 'href', r'(%s\d+)' % rurl)+"Next »")) stripUrl = url + '%s' firstStripUrl = stripUrl % '1' - imageSearch = compile(tagre('img', 'src', r'(%sstrips/[^<>"]+)' % rurl)) + imageSearch = compile(tagre('img', 'src', r'(http://abstrusegoose\.com/strips/[^<>"]+)')) prevSearch = compile(tagre('a', 'href', r'(%s\d+)' % rurl) + r'« Previous') help = 'Index format: n (unpadded)' textSearch = compile(tagre("img", "title", r'([^"]+)')) diff --git a/dosagelib/plugins/q.py b/dosagelib/plugins/q.py index bab16075f..854ca5c44 100644 --- a/dosagelib/plugins/q.py +++ b/dosagelib/plugins/q.py @@ -11,7 +11,7 @@ class QuestionableContent(_BasicScraper): url = 'http://www.questionablecontent.net/' stripUrl = url + 'view.php?comic=%s' firstStripUrl = stripUrl % '1' - imageSearch = compile(tagre("img", "src", r'([^"]+/comics/[^"]+)', before="strip")) + imageSearch = compile(tagre("img", "src", r'([^"]+/comics/[^"]+)')) prevSearch = compile(tagre("a", "href", r'(view\.php\?comic=\d+)') + 'Previous') help = 'Index format: n (unpadded)'