diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py index 896889112..83d38303c 100644 --- a/dosagelib/plugins/a.py +++ b/dosagelib/plugins/a.py @@ -248,15 +248,6 @@ class AlienShores(_BasicScraper): -class AllKindsOfBees(_BasicScraper): - latestUrl = 'http://www.allkindsofbees.com/' - imageUrl = 'http://www.allkindsofbees.com/?p=%s' - imageSearch = compile(r'') - help = 'Index format: nnn' - - - class AllTheGrowingThings(_BasicScraper): latestUrl = 'http://typodmary.com/growingthings/' imageUrl = 'http://typodmary.com/growingthings/%s/' @@ -268,10 +259,10 @@ class AllTheGrowingThings(_BasicScraper): class Amya(_BasicScraper): latestUrl = 'http://www.amyachronicles.com/' - imageUrl = 'http://www.amyachronicles.com/archives/%s' - imageSearch = compile(r'') - prevSearch = compile(r'first.+?/(daily.php\?date=.+?)".+?previous') - help = 'Index format: yymmdd' - - def blankLabel(name, baseUrl): return type('BlankLabel_%s' % name, (_BasicScraper,), diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py index 30383a574..317c5f48d 100644 --- a/dosagelib/plugins/c.py +++ b/dosagelib/plugins/c.py @@ -50,10 +50,10 @@ class CaribbeanBlue(_BasicScraper): class Catena(_BasicScraper): latestUrl = 'http://catenamanor.com/' - imageUrl = 'http://catenamanor.com/index.php?comic=%s' - imageSearch = compile(r'(comics/catena/.+?)"') - prevSearch = compile(r'First.+?"(.+?)".+?Previous') - help = 'Index format: n (unpadded)' + imageUrl = 'http://catenamanor.com/%s.gif' + imageSearch = compile(tagre("img", "src", r'(http://catenamanor\.com/comics/[^"]+)')) + prevSearch = compile(tagre("a", "href", r'[^"]+', after='rel="prev"')) + help = 'Index format: yyyy-mm-dd-' class Catharsis(_BasicScraper): @@ -197,15 +197,16 @@ class Curvy(_BasicScraper): def cloneManga(name, shortName, lastStrip=None): - baseUrl = 'http://manga.clone-army.org/%s.php' % (shortName,) + url = 'http://manga.clone-army.org' + baseUrl = '%s/%s.php' % (url, shortName) imageUrl = baseUrl + '?page=%s' if lastStrip is None: - starter = bounceStarter(baseUrl, compile(r'