diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py index 0075b7526..98681fd9a 100644 --- a/dosagelib/plugins/a.py +++ b/dosagelib/plugins/a.py @@ -180,15 +180,6 @@ class AfterStrife(_BasicScraper): -class AnUnrehearsedRiot(_BasicScraper): - latestUrl = 'http://unrehearsedriot.com/' - imageUrl = 'http://unrehearsedriot.com/%s' - imageSearch = compile(r'Previous') + imageSearch = compile(tagre("img", "src", r'(comics/Scroll[^"]+)')) + prevSearch = compile(tagre("a", "href", r'(view\.php\?date\=[^"]+)')+"Previous") help = 'Index format: yyyy-mm-dd' -class ArcticBlast(_BasicScraper): - latestUrl = 'http://www.arcticblastcomic.com/' - imageUrl = 'http://www.arcticblastcomic.com/?p=%s' - imageSearch = compile(r']*>[^<>]*<[^<>]*previous)|(?:.*?back_button)|(?:.*?comicnav-previous))'), + imageUrl='/d/%s.shtml', + imageSearch=compile(tagre("img", "src", r'(/comic[s|/][^"]+)')), + prevSearch=compile(tagre("a", "href", r'(/d/\d+\.shtml)')+r"[^>]+/images/nav_02\.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') ) -checkerboardNightmare = blankLabel('CheckerboardNightmare', 'http://www.checkerboardnightmare.com/') +checkerboard = blankLabel('CheckerboardNightmare', 'http://www.checkerboardnightmare.com') courtingDisaster = blankLabel('CourtingDisaster', 'http://www.courting-disaster.com/') evilInc = blankLabel('EvilInc', 'http://www.evil-comic.com/') greystoneInn = blankLabel('GreystoneInn', 'http://www.greystoneinn.net/') @@ -205,9 +206,9 @@ class BlankIt(_BasicScraper): class BobWhite(_BasicScraper): latestUrl = 'http://www.bobwhitecomics.com/' - imageUrl = 'http://www.bobwhitecomics.com/%s.shtml' - imageSearch = compile(r'src="(/comics/.+?)"') - prevSearch = compile(r'">]+?>]+?src="/images/prev.jpg">') + imageUrl = 'http://www.bobwhitecomics.com/?webcomic_post=%s' + imageSearch = compile(tagre("img", "src", r"(http://www\.bobwhitecomics\.com/wp/wp-content/webcomic/untitled/\d+.jpg)")) + prevSearch = compile(tagre("a", "href", "(http://www\.bobwhitecomics\.com/\?webcomic_post=\d+)")+r'[^"]+Previous') help = 'Index format: yyyymmdd' diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py index 625362bef..fd6c03828 100644 --- a/dosagelib/plugins/c.py +++ b/dosagelib/plugins/c.py @@ -232,8 +232,8 @@ penny = cloneManga('PennyTribute', 'penny') class CatAndGirl(_BasicScraper): latestUrl = 'http://catandgirl.com/' imageUrl = 'http://catandgirl.com/?p=%s' - imageSearch = compile(r'◄ Previous') + imageSearch = compile(tagre("img", "src", r'(http://catandgirl\.com/archive/[^"]+)')) + prevSearch = compile(tagre("a", "href", r'([^"]+)')+r"[^<]+Previous") help = 'Index format: n (unpadded)'