Fix some comics.

This commit is contained in:
Bastian Kleineidam 2012-11-12 18:59:19 +01:00
parent a5108dfb45
commit 30a28cdb3e
3 changed files with 15 additions and 31 deletions

View file

@ -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'<img src="(http://www.allkindsofbees.com/comics/.+?)"')
prevSearch = compile(r'<div class="nav-previous"><a href="(http://www.allkindsofbees.com/.+?)">')
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'<img src="(http://www.amyachronicles.com/comics/.+?)"')
prevSearch = compile(r'<div class="nav-previous"><a href="(http://www.amyachronicles.com/archives/.+?)"')
help = 'Index format: nnn'
imageUrl = 'http://www.amyachronicles.com/comics/%s.jpg'
imageSearch = compile(tagre("img", "src", r'(http://www\.amyachronicles\.com/comics/[^"]+)'))
prevSearch = compile(tagre("a", "href", r'(http://www\.amyachronicles\.com/archives/\d+)', after="Previous"))
help = 'Index format: yyyy-mm-dd'

View file

@ -128,14 +128,6 @@ class ButternutSquash(_BasicScraper):
class Bhag(_BasicScraper):
latestUrl = 'http://bhag.sackofjustice.com/'
imageUrl = 'http://bhag.sackofjustice.com/daily.php?date='
imageSearch = compile(r'/(comics/.+?)">')
prevSearch = compile(r'first.+?/(daily.php\?date=.+?)".+?previous')
help = 'Index format: yymmdd'
def blankLabel(name, baseUrl):
return type('BlankLabel_%s' % name,
(_BasicScraper,),

View file

@ -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</a>.+?"(.+?)".+?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-<name>'
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'<a href="([^"]+)"><img src="next\.gif"'))
starter = bounceStarter(baseUrl, compile(tagre("a", "href", r'([^"]+)')+tagre("img", "src", r"next\.gif")))
else:
starter = constStarter(imageUrl % (lastStrip,))
starter = constStarter(imageUrl % lastStrip)
def namer(self, imageUrl, pageUrl):
return '%03d' % (int(getQueryParams(pageUrl)['page'][0]),)
return '%03d' % int(getQueryParams(pageUrl)['page'][0])
return type('CloneManga_%s' % name,
(_BasicScraper,),
@ -213,8 +214,8 @@ def cloneManga(name, shortName, lastStrip=None):
name='CloneManga/' + name,
starter=starter,
imageUrl=imageUrl,
imageSearch=compile(r'<img src="(http://manga\.clone-army\.org/[^"]+)"'),
prevSearch=compile(r'<a href="([^"]+)"><img src="previous\.gif"'),
imageSearch=compile(tagre("img", "src", r'((?:%s)?/%s/[^"]+)' % (url, shortName), after="center")),
prevSearch=compile(tagre("a", "href", r'([^"]+)')+tagre("img", "src", r"previous\.gif")),
help='Index format: n',
namer=namer)
)