Fix some comics.

This commit is contained in:
Bastian Kleineidam 2012-11-13 06:51:54 +01:00
parent 30a28cdb3e
commit e4600df1bd
3 changed files with 14 additions and 23 deletions

View file

@ -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'<img src="((?:/comics/)?issue\d+?\..+?)"')
imageSearch = compile(tagre("img", "src", r'"(strips/\d+?\..+?)"'))
prevSearch = compile(r'<div class="caption">Previous Comic</div>\s*<p><a href="([^"]+)">', 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'<img src="(strips/.+?)"')
prevSearch = compile(r'<a href="(index.php\?aglitecomic=.+?)".+?back')
help = 'Index format: yyyy-mm-dd'
class Achewood(_BasicScraper):
latestUrl = 'http://www.achewood.com/'
imageUrl = 'http://www.achewood.com/index.php?date=%s'

View file

@ -122,8 +122,8 @@ class BoyOnAStickAndSlither(_BasicScraper):
class ButternutSquash(_BasicScraper):
latestUrl = 'http://www.butternutsquash.net/'
imageUrl = 'http://www.butternutsquash.net/v3/%s'
imageSearch = compile(r'<img src="(http://www.butternutsquash.net/v3/comics/.+?)"')
prevSearch = compile(r'<a href="(http://www.butternutsquash.net/v3/.+?)">(<span class="prev">&#9668;|&#8656; Previous</a>)')
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'

View file

@ -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+)">&#9668; 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'