diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py index 98681fd9a..896889112 100644 --- a/dosagelib/plugins/a.py +++ b/dosagelib/plugins/a.py @@ -148,8 +148,8 @@ class AppleGeeksLite(_BasicScraper): class Achewood(_BasicScraper): latestUrl = 'http://www.achewood.com/' imageUrl = 'http://www.achewood.com/index.php?date=%s' - imageSearch = compile(r']+/images/nav_02\.gif"), + prevSearch=compile(tagre("a", "href", r'[^"]*(/d/\d+\.s?html)')+r"[^>]+/images/(?:nav_02|previous_day)\.gif"), #prevSearch=compile(r'(?:"([^"]*(?:/d/[^"\r\n]*)|(?:/strip/.+?))")(?:(?:.{43}starshift_back.gif)|(?:.+?cxn_previous)|(?:.{43}previous)|(?:[^<>]*>[^<>]*<[^<>]*previous)|(?:.*?back_button)|(?:.*?comicnav-previous))'), help='Index format: yyyymmdd') ) @@ -186,15 +178,6 @@ class BeePower(_BasicScraper): -class Bellen(_BasicScraper): - latestUrl = 'http://boxbrown.com/' - imageUrl = 'http://boxbrown.com/?p=%s' - imageSearch = compile(r'') - help = 'Index format: nnn' - - - class BlankIt(_BasicScraper): latestUrl = 'http://blankitcomics.com/' imageUrl = 'http://blankitcomics.com/%s' diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py index fd6c03828..30383a574 100644 --- a/dosagelib/plugins/c.py +++ b/dosagelib/plugins/c.py @@ -238,26 +238,32 @@ class CatAndGirl(_BasicScraper): def comicsDotCom(name, section): - baseUrl = 'http://www.comics.com/%s/%s/archive/' % (section, name) + latestUrl = 'http://www.gocomics.com/%s' % name @classmethod def namer(cls, imageUrl, pageUrl): - htmlname = pageUrl.split('/')[-1] - filename = htmlname.split('.')[0] - return filename + prefix, year, month, day = pageUrl.split('/', 3) + return "%s_%s%s%s.gif" % (name, year, month, day) - return type('ComicsDotCom_%s' % name, + return type('GoComicsDotCom_%s' % name, (_BasicScraper,), dict( - name='ComicsDotCom/' + name, - starter=indirectStarter(baseUrl, compile(r'(?:(?: