From 3edaa97fb96ba060546d28b06ac6f5e03b28cc83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damjan=20Ko=C5=A1ir?= Date: Mon, 25 May 2015 20:06:58 +1200 Subject: [PATCH] fixing KatzenfutterGeleespritzer --- dosagelib/plugins/comicpress.py | 5 ++++- dosagelib/plugins/k.py | 15 --------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dosagelib/plugins/comicpress.py b/dosagelib/plugins/comicpress.py index 4a6110b4f..1c46041ff 100644 --- a/dosagelib/plugins/comicpress.py +++ b/dosagelib/plugins/comicpress.py @@ -7,7 +7,9 @@ def add(name, url, firstUrl=None, lang=None): name=name, url=url, imageSearch='//div[@id="comic"]//img', - prevSearch=['//a[contains(text(), " Prev")]', "//a[contains(concat(' ', @class, ' '), ' navi-prev ')]"] + prevSearch=['//a[contains(text(), " Prev")]', + "//a[contains(concat(' ', @class, ' '), ' navi-prev ')]", + "//a[contains(concat(' ', @class, ' '), ' navi-prev-in ')]"] ) if lang: attrs['lang'] = lang @@ -19,6 +21,7 @@ def add(name, url, firstUrl=None, lang=None): add('BloodBound', 'http://bloodboundcomic.com/', 'comic/06112006/') add('BroodHollow', 'http://broodhollow.chainsawsuit.com/', 'page/2012/10/06/book-1-curious-little-thing') add('CourtingDisaster', 'http://www.courting-disaster.com/', 'comic/courting-disaster-17/') +add('KatzenfutterGeleespritzer', 'http://www.katzenfuttergeleespritzer.de/', 'comics/gert-grendil/', 'de') add('OnTheEdge', 'http://ontheedgecomics.com/', 'comic/ote0001/') add('PandyLand', 'http://pandyland.net/', '1/') add('Hipsters', 'http://www.hipsters-comic.com/', 'comic/hip01/') diff --git a/dosagelib/plugins/k.py b/dosagelib/plugins/k.py index 4d5e0f069..34da2beef 100644 --- a/dosagelib/plugins/k.py +++ b/dosagelib/plugins/k.py @@ -8,21 +8,6 @@ from ..util import tagre from ..helpers import indirectStarter -class KatzenfutterGeleespritzer(_BasicScraper): - url = 'http://www.katzenfuttergeleespritzer.de/' - rurl = escape(url) - stripUrl = url + 'comics/%s/' - firstStripUrl = stripUrl % 'dont-drink-and-drive' - imageSearch = ( - compile(tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/\d+-\d+-\d+[^"]+)' % rurl)), - compile(tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/mmai_404[^"]+)' % rurl)), - ) - # XXX disallowed by robots.txt - #prevSearch = compile(tagre("a", "href", r'(%scomics/[^"]+)' % rurl, after="navi-prev")) - #help = 'Index format: stripname' - lang = 'de' - - class KevinAndKell(_BasicScraper): url = 'http://www.kevinandkell.com/' stripUrl = url + '%s/kk%s%s.html'