From 5569439c43d14ac6ab5bb6ed2a46f76c91741683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damjan=20Ko=C5=A1ir?= Date: Mon, 25 May 2015 21:57:06 +1200 Subject: [PATCH] fixed 16 comics --- dosagelib/plugins/a.py | 26 -------------------------- dosagelib/plugins/b.py | 9 --------- dosagelib/plugins/c.py | 10 ---------- dosagelib/plugins/comicpress.py | 19 +++++++++++++++++-- dosagelib/plugins/i.py | 18 ------------------ dosagelib/plugins/m.py | 20 -------------------- dosagelib/plugins/n.py | 20 -------------------- dosagelib/plugins/num.py | 11 ----------- dosagelib/plugins/s.py | 33 ++++----------------------------- dosagelib/plugins/t.py | 19 ------------------- dosagelib/plugins/y.py | 15 --------------- 11 files changed, 21 insertions(+), 179 deletions(-) diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py index 2b68bce48..8b954f38a 100644 --- a/dosagelib/plugins/a.py +++ b/dosagelib/plugins/a.py @@ -220,16 +220,6 @@ class AmazingSuperPowers(_BasicScraper): ) -class Amya(_BasicScraper): - url = 'http://www.amyachronicles.com/' - rurl = escape(url) - stripUrl = url + 'archives/%s' - firstStripUrl = stripUrl % '117' - imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl)) - prevSearch = compile(tagre("a", "href", r'(%sarchives/\d+)' % rurl, after="Previous")) - help = 'Index format: n' - - class Angband(_BasicScraper): url = 'http://angband.calamarain.net/' stripUrl = url + 'view.php?date=%s' @@ -331,19 +321,3 @@ class ASkeweredParadise(_BasicScraper): imageSearch = compile(tagre("img", "src", r'(http://aspcomics\.net/sites/default/files[^"]*/asp\d+\.jpg)[^"]+')) prevSearch = compile(tagre("a", "href", "(/comic/\d+)")+r"[^>]+Previous") help = 'Index format: nnn' - - -class AxeCop(_BasicScraper): - url = 'http://axecop.com/' - rurl = escape(url) - starter = bounceStarter(url, - ( - compile(tagre("a", "href", r'(%scomic/page-\d+-[^"]+/)' % rurl, after="navi-next")), - compile(tagre("a", "href", r'(%scomic/[^"]+/)' % rurl, after="navi-next")), - ) - ) - stripUrl = url + 'comic/%s/' - firstStripUrl = stripUrl % '0' - imageSearch = compile(tagre("img", "src", r'(http://mainsite\.axecop\.wpengine\.com/wp-content/uploads/sites/\d+/\d+/\d+/[^"]+)')) - prevSearch = compile(tagre("a", "href", r'(%scomic/[^"]+/)' % rurl, after="navi-prev")) - help = 'Index format: usually stripname' diff --git a/dosagelib/plugins/b.py b/dosagelib/plugins/b.py index 2cc9af077..dfaf13e1f 100644 --- a/dosagelib/plugins/b.py +++ b/dosagelib/plugins/b.py @@ -249,15 +249,6 @@ class BoyOnAStickAndSlither(_BasicScraper): return pageUrl.rsplit('/')[-1] -class BratHalla(_BasicScraper): - url = 'http://brat-halla.com/' - stripUrl = url + 'comic/%s/' - firstStripUrl = stripUrl % '1-balder-dash' - imageSearch = compile(r"(/comics/.+?)' target='_blank") - prevSearch = compile(r'headernav2".+?"(http.+?)"') - help = 'Index format: number-stripname' - - class BrentalFloss(_BasicScraper): url = 'http://brentalflossthecomic.com/' stripUrl = url + '?id=%s' diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py index 7900e2e7f..e626d3f07 100755 --- a/dosagelib/plugins/c.py +++ b/dosagelib/plugins/c.py @@ -99,16 +99,6 @@ class CatAndGirl(_BasicScraper): ) -class Catena(_BasicScraper): - url = 'http://catenamanor.com/' - rurl = escape(url) - stripUrl = url + '%s/' - firstStripUrl = stripUrl % '2003/06/17/the-start-of-it-all' - imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl)) - prevSearch = compile(tagre("a", "href", r'([^"]+)', after='rel="prev"')) - help = 'Index format: yyyy/mm/dd/' - - class CatsAndCameras(_BasicScraper): url = 'http://catsncameras.com/cnc/' rurl = escape(url) diff --git a/dosagelib/plugins/comicpress.py b/dosagelib/plugins/comicpress.py index 1c46041ff..9cf58a46e 100644 --- a/dosagelib/plugins/comicpress.py +++ b/dosagelib/plugins/comicpress.py @@ -17,11 +17,26 @@ def add(name, url, firstUrl=None, lang=None): attrs['firstUrl'] = url + firstUrl globals()[name] = make_scraper(name, _ParserScraper, **attrs) - +add('1997', 'http://1977thecomic.com/') +add('Amya', 'http://www.amyachronicles.com/') +add('AxeCop', 'http://axecop.com/comic/season-two/') add('BloodBound', 'http://bloodboundcomic.com/', 'comic/06112006/') +add('BratHalla', 'http://brat-halla.com/') add('BroodHollow', 'http://broodhollow.chainsawsuit.com/', 'page/2012/10/06/book-1-curious-little-thing') +add('Catena', 'http://catenamanor.com/') add('CourtingDisaster', 'http://www.courting-disaster.com/', 'comic/courting-disaster-17/') +add('Hipsters', 'http://www.hipsters-comic.com/', 'comic/hip01/') +add('IDreamOfAJeanieBottle', 'http://jeaniebottle.com/') +add('ItsWalky', 'http://www.itswalky.com/') add('KatzenfutterGeleespritzer', 'http://www.katzenfuttergeleespritzer.de/', 'comics/gert-grendil/', 'de') +add('Meiosis', 'http://meiosiswebcomic.com/') +add('Melonpool', 'http://www.melonpool.com/') +add('Nedroid', 'http://nedroid.com/') +add('Nicky510', 'http://www.nickyitis.com/') add('OnTheEdge', 'http://ontheedgecomics.com/', 'comic/ote0001/') add('PandyLand', 'http://pandyland.net/', '1/') -add('Hipsters', 'http://www.hipsters-comic.com/', 'comic/hip01/') +add('SailorsunOrg', 'http://sailorsun.org/') +add('SlightlyDamned', 'http://www.sdamned.com/') +add('SPQRBlues', 'http://spqrblues.com/IV/') +add('TheDreamlandChronicles', 'http://www.thedreamlandchronicles.com/') +add('YAFGC', 'http://yafgc.net/') diff --git a/dosagelib/plugins/i.py b/dosagelib/plugins/i.py index d415bd18a..88636ea70 100644 --- a/dosagelib/plugins/i.py +++ b/dosagelib/plugins/i.py @@ -27,15 +27,6 @@ class ICanBarelyDraw(_BasicScraper): help = 'Index format: number' -class IDreamOfAJeanieBottle(_BasicScraper): - url = 'http://jeaniebottle.com/' - stripUrl = url + '?p=%s' - firstStripUrl = stripUrl % '15' - imageSearch = compile(r'(/comics/.+?)"') - prevSearch = compile(tagre("a", "href", r'(http://jeaniebottle\.com/\?p=\d+)', after="prev")) - help = 'Index format: n (unpadded)' - - class InternetWebcomic(_BasicScraper): url = 'http://www.internet-webcomic.com/' rurl = escape(url) @@ -53,12 +44,3 @@ class IrregularWebcomic(_BasicScraper): imageSearch = compile(r'') prevSearch = compile(r'Previous ') help = 'Index format: nnn' - - -class ItsWalky(_BasicScraper): - url = 'http://www.itswalky.com/' - stripUrl = url + 'd/%s.html' - firstStripUrl = stripUrl % '19970908' - imageSearch = compile(tagre("img", "src", r'(/comic[s|/][^"]+)')) - prevSearch = compile(tagre("a", "href", r'[^"]*(/d/\d+\.s?html)')+r"[^>]+/images/(?:nav_02|previous_day)\.gif") - help = 'Index format: yyyymmdd' diff --git a/dosagelib/plugins/m.py b/dosagelib/plugins/m.py index afe9765d3..c106867fa 100755 --- a/dosagelib/plugins/m.py +++ b/dosagelib/plugins/m.py @@ -111,16 +111,6 @@ class MegaTokyo(_BasicScraper): help = 'Index format: nnnn' -class Meiosis(_BasicScraper): - url = 'http://meiosiswebcomic.com/' - rurl = escape(url) - stripUrl = url + '%s/' - firstStripUrl = stripUrl % '2006/10/10142006' - imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl)) - prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl, after="navi-prev")) - help = 'Index format: yyyy/mm/ddmmyyyy' - - class MenageA3(_BasicScraper): adult = True url = 'http://www.ma3comic.com/' @@ -130,16 +120,6 @@ class MenageA3(_BasicScraper): help = 'Index format: name' -class Melonpool(_BasicScraper): - url = 'http://www.melonpool.com/' - rurl = escape(url) - stripUrl = url + '?p=%s' - firstStripUrl = stripUrl % '41' - imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl)) - prevSearch = compile(tagre("a", "href", r'(%s\?p=\d+)' % rurl, after="prev")) - help = 'Index format: n' - - class Misfile(_BasicScraper): url = 'http://www.misfile.com/' stripUrl = url + '?date=%s' diff --git a/dosagelib/plugins/n.py b/dosagelib/plugins/n.py index 775096b2d..c23970195 100644 --- a/dosagelib/plugins/n.py +++ b/dosagelib/plugins/n.py @@ -47,16 +47,6 @@ class NatalieDee(_BasicScraper): return '%s-%s' % (date, filename) -class Nedroid(_BasicScraper): - url = 'http://nedroid.com/' - rurl = escape(url) - stripUrl = url + '%s/' - firstStripUrl = stripUrl % '2005/09/2210-whee' - imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl)) - prevSearch = compile(tagre("a", "href", r'(%s\d+/\d+/[^"]+)' % rurl, after="prev")) - help = 'Index format: yyyy/mm/dd/name' - - class NeoEarth(_BasicScraper): url = 'http://www.neo-earth.com/NE/' stripUrl = url + 'index.php?date=%s' @@ -82,16 +72,6 @@ class NewWorld(_BasicScraper): help = 'Index format: yyyy/mm/dd/stripn' -class Nicky510(_BasicScraper): - url = 'http://www.nickyitis.com/' - rurl = escape(url) - stripUrl = url + '%s/' - firstStripUrl = stripUrl % 'close-enough' - imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl)) - prevSearch = compile(tagre("a", "href", r'(%scomic/[^"]+)' % rurl, after="Previous")) - help = 'Index format: stripname' - - class NekkoAndJoruba(_BasicScraper): url = 'http://www.nekkoandjoruba.com/' stripUrl = url + '?p=%s' diff --git a/dosagelib/plugins/num.py b/dosagelib/plugins/num.py index 12b87fcf4..e16600982 100644 --- a/dosagelib/plugins/num.py +++ b/dosagelib/plugins/num.py @@ -6,14 +6,3 @@ from re import compile, escape from ..util import tagre from ..scraper import _BasicScraper - - -class NineteenNinetySeven(_BasicScraper): - name = '1997' - url = 'http://1977thecomic.com/' - rurl = escape(url) - stripUrl = url + '%s/' - firstStripUrl = stripUrl % '1977-comics/from-the-beginning-part-1' - imageSearch = compile(tagre("img", "src", r'(%scomics-1977/[^"]+)' % rurl)) - prevSearch = compile(tagre("a", "href", r'([^"]+)')+"Previous") - help = 'Index format: yyyy/mm/dd/strip-name' diff --git a/dosagelib/plugins/s.py b/dosagelib/plugins/s.py index cb2380477..2d1662a10 100644 --- a/dosagelib/plugins/s.py +++ b/dosagelib/plugins/s.py @@ -27,6 +27,7 @@ class SabrinaOnline(_BasicScraper): archivepages = search.findall(data) return cls.url + archivepages[-1] + class SafelyEndangered(_BasicScraper): url = 'http://www.safelyendangered.com/' stripUrl = url + 'comic/%s' @@ -36,15 +37,6 @@ class SafelyEndangered(_BasicScraper): textSearch = compile(tagre("img", "title", r'([^"]+)', before=r'http://www\.safelyendangered\.com/wp-content/uploads')) help = 'Index format: yyyy/mm/stripname' -class SailorsunOrg(_BasicScraper): - url = 'http://sailorsun.org/' - rurl = escape(url) - stripUrl = url + '?p=%s' - firstStripUrl = stripUrl % '21' - imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl)) - prevSearch = compile(tagre("a", "href", r'(%s\?p=\d+)' % rurl, after="prev")) - help = 'Index format: n (unpadded)' - class SamAndFuzzy(_BasicScraper): url = 'http://www.samandfuzzy.com/' @@ -54,6 +46,7 @@ class SamAndFuzzy(_BasicScraper): prevSearch = compile(r'">