diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py index 83d38303c..f1d60a229 100644 --- a/dosagelib/plugins/a.py +++ b/dosagelib/plugins/a.py @@ -64,17 +64,17 @@ class AbstruseGoose(_BasicScraper): class AcademyVale(_BasicScraper): latestUrl = 'http://imagerie.com/vale/' imageUrl = 'http://imagerie.com/vale/avarch.cgi?%s' - imageSearch = compile(tagre('img', 'src', r'(avale\d{4}-\d{2}\..*?)')) - prevSearch = compile(tagre('a', 'href', r'(avarch.*?)') + tagre('img', 'src', 'AVNavBack\.gif')) + imageSearch = compile(tagre('img', 'src', r'(avale\d{4}-\d{2}\.gif)')) + prevSearch = compile(tagre('a', 'href', r'(avarch[^"]+)') + tagre('img', 'src', 'AVNavBack\.gif')) help = 'Index format: nnn' class Alice(_BasicScraper): latestUrl = 'http://alice.alicecomics.com/' - imageUrl = 'http://alice.alicecomics.com/%s' - imageSearch = compile(r'(/comics/.+?)"') - prevSearch = compile(r' .+"?com(/.+?)" rel="prev') - help = 'Index format: non' + imageUrl = 'http://alice.alicecomics.com/wp-content/webcomic/alicecomics/%s.jpg' + imageSearch = compile(tagre("img", "src", r'(http://alice\.alicecomics\.com/wp-content/webcomic/alicecomics/[^"]+)')) + prevSearch = compile(tagre("a", "href", r'(http://alice.alicecomics.com/archive/[^!]+)', after="previous")) + help = 'Index format: yyyy-mm-dd' class AlienLovesPredator(_BasicScraper): @@ -131,20 +131,11 @@ class Angels2200(_BasicScraper): class AppleGeeks(_BasicScraper): latestUrl = 'http://www.applegeeks.com/' imageUrl = 'http://www.applegeeks.com/comics/viewcomic.php?issue=%s' - imageSearch = compile(r'Previous Comic\s*

', MULTILINE) help = 'Index format: n (unpadded)' -class AppleGeeksLite(_BasicScraper): - latestUrl = 'http://www.applegeeks.com/lite/' - imageUrl = 'http://applegeeks.com/lite/index.php?aglitecomic=%s' - imageSearch = compile(r'(◄|⇐ Previous)') + imageSearch = compile(tagre("img", "src", r'(http://www\.butternutsquash\.net/comics/[^"]+)')) + prevSearch = compile(tagre("a", "href", r'(http://www\.butternutsquash\.net/[^!]+)', after="prev")) help = 'Index format: yyyy/mm/dd/strip-name-author-name' diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py index 317c5f48d..4d1b993bd 100644 --- a/dosagelib/plugins/c.py +++ b/dosagelib/plugins/c.py @@ -3,7 +3,7 @@ from re import compile from ..scraper import _BasicScraper -from ..helpers import constStarter, bounceStarter, indirectStarter +from ..helpers import constStarter, bounceStarter from ..util import tagre, getQueryParams @@ -427,10 +427,10 @@ class CasuallyKayla(_BasicScraper): class Collar6(_BasicScraper): latestUrl = 'http://collar6.com/' - imageUrl = 'http://collar6.com/%s' - imageSearch = compile(r'src="(http://collar6.com/comics/.+?)"') - prevSearch = compile(r' href="(http://collar6.com/\d+/\S+)">◄ Previous') - help = 'Index format: yyyy/namednumber' + imageUrl = 'http://collar6.com/wp-content/webcomic/collar6/%s.jpg' + imageSearch = compile(tagre("img", "src", r'(http://collar6\.com/wp-content/webcomic/collar6/[^"]+)')) + prevSearch = compile(tagre("a", "href", r'(http://collar6\.com/archive/[^"]+)', after="previous")) + help = 'Index format: yyyy-mm-dd-Collar-n-nnn'