Fix comics.
This commit is contained in:
parent
256a08bf31
commit
67939b3d71
3 changed files with 14 additions and 31 deletions
|
@ -180,15 +180,6 @@ class AfterStrife(_BasicScraper):
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class AnUnrehearsedRiot(_BasicScraper):
|
|
||||||
latestUrl = 'http://unrehearsedriot.com/'
|
|
||||||
imageUrl = 'http://unrehearsedriot.com/%s'
|
|
||||||
imageSearch = compile(r'<img src="(http://unrehearsedriot.com/comics/.+?)"')
|
|
||||||
prevSearch = compile(r'<a href="(http://unrehearsedriot.com/.+?)" class="navi navi-prev"')
|
|
||||||
help = 'Index format: yyyy/mm/dd/strip-name'
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class ALLCAPS(_BasicScraper):
|
class ALLCAPS(_BasicScraper):
|
||||||
latestUrl = 'http://www.allcapscomix.com/'
|
latestUrl = 'http://www.allcapscomix.com/'
|
||||||
imageUrl = 'http://www.allcapscomix.com/%s'
|
imageUrl = 'http://www.allcapscomix.com/%s'
|
||||||
|
@ -285,23 +276,14 @@ class Amya(_BasicScraper):
|
||||||
|
|
||||||
|
|
||||||
class Angband(_BasicScraper):
|
class Angband(_BasicScraper):
|
||||||
latestUrl = 'http://angband.calamarain.net/index.php'
|
latestUrl = 'http://angband.calamarain.net/'
|
||||||
imageUrl = 'http://angband.calamarain.net/view.php?date=%s'
|
imageUrl = 'http://angband.calamarain.net/view.php?date=%s'
|
||||||
imageSearch = compile(r'<img src="(comics/Strip.+?)"')
|
imageSearch = compile(tagre("img", "src", r'(comics/Scroll[^"]+)'))
|
||||||
prevSearch = compile(r'<a href="(view.php\?date\=.+?)">Previous</a>')
|
prevSearch = compile(tagre("a", "href", r'(view\.php\?date\=[^"]+)')+"Previous")
|
||||||
help = 'Index format: yyyy-mm-dd'
|
help = 'Index format: yyyy-mm-dd'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class ArcticBlast(_BasicScraper):
|
|
||||||
latestUrl = 'http://www.arcticblastcomic.com/'
|
|
||||||
imageUrl = 'http://www.arcticblastcomic.com/?p=%s'
|
|
||||||
imageSearch = compile(r'<img src="(http://www.arcticblastcomic.com/comics/.+?)"')
|
|
||||||
prevSearch = compile(r'<div class="nav-previous"><a href="(http://www.arcticblastcomic.com/.+?)"')
|
|
||||||
help = 'Index format: nnn'
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class ActionAthena(_BasicScraper):
|
class ActionAthena(_BasicScraper):
|
||||||
latestUrl = 'http://actionathena.com/'
|
latestUrl = 'http://actionathena.com/'
|
||||||
imageUrl = 'http://actionathena.com/2%s'
|
imageUrl = 'http://actionathena.com/2%s'
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
|
# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
|
||||||
from re import compile
|
from re import compile
|
||||||
|
|
||||||
|
from ..util import tagre
|
||||||
from ..scraper import _BasicScraper
|
from ..scraper import _BasicScraper
|
||||||
|
|
||||||
|
|
||||||
|
@ -143,21 +144,21 @@ class Bhag(_BasicScraper):
|
||||||
help = 'Index format: yymmdd'
|
help = 'Index format: yymmdd'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def blankLabel(name, baseUrl):
|
def blankLabel(name, baseUrl):
|
||||||
return type('BlankLabel_%s' % name,
|
return type('BlankLabel_%s' % name,
|
||||||
(_BasicScraper,),
|
(_BasicScraper,),
|
||||||
dict(
|
dict(
|
||||||
name='BlankLabel/' + name,
|
name='BlankLabel/' + name,
|
||||||
latestUrl=baseUrl,
|
latestUrl=baseUrl,
|
||||||
imageUrl='d/%s.html',
|
imageUrl='/d/%s.shtml',
|
||||||
imageSearch=compile(r'"(/comic[s|/].+?)"'),
|
imageSearch=compile(tagre("img", "src", r'(/comic[s|/][^"]+)')),
|
||||||
prevSearch=compile(r'(?:"([^"]*(?:/d/[^"\r\n]*)|(?:/strip/.+?))")(?:(?:.{43}starshift_back.gif)|(?:.+?cxn_previous)|(?:.{43}previous)|(?:[^<>]*>[^<>]*<[^<>]*previous)|(?:.*?back_button)|(?:.*?comicnav-previous))'),
|
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')
|
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/')
|
courtingDisaster = blankLabel('CourtingDisaster', 'http://www.courting-disaster.com/')
|
||||||
evilInc = blankLabel('EvilInc', 'http://www.evil-comic.com/')
|
evilInc = blankLabel('EvilInc', 'http://www.evil-comic.com/')
|
||||||
greystoneInn = blankLabel('GreystoneInn', 'http://www.greystoneinn.net/')
|
greystoneInn = blankLabel('GreystoneInn', 'http://www.greystoneinn.net/')
|
||||||
|
@ -205,9 +206,9 @@ class BlankIt(_BasicScraper):
|
||||||
|
|
||||||
class BobWhite(_BasicScraper):
|
class BobWhite(_BasicScraper):
|
||||||
latestUrl = 'http://www.bobwhitecomics.com/'
|
latestUrl = 'http://www.bobwhitecomics.com/'
|
||||||
imageUrl = 'http://www.bobwhitecomics.com/%s.shtml'
|
imageUrl = 'http://www.bobwhitecomics.com/?webcomic_post=%s'
|
||||||
imageSearch = compile(r'src="(/comics/.+?)"')
|
imageSearch = compile(tagre("img", "src", r"(http://www\.bobwhitecomics\.com/wp/wp-content/webcomic/untitled/\d+.jpg)"))
|
||||||
prevSearch = compile(r'"><a href="(.+?)"[^>]+?><img[^>]+?src="/images/prev.jpg">')
|
prevSearch = compile(tagre("a", "href", "(http://www\.bobwhitecomics\.com/\?webcomic_post=\d+)")+r'[^"]+Previous')
|
||||||
help = 'Index format: yyyymmdd'
|
help = 'Index format: yyyymmdd'
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -232,8 +232,8 @@ penny = cloneManga('PennyTribute', 'penny')
|
||||||
class CatAndGirl(_BasicScraper):
|
class CatAndGirl(_BasicScraper):
|
||||||
latestUrl = 'http://catandgirl.com/'
|
latestUrl = 'http://catandgirl.com/'
|
||||||
imageUrl = 'http://catandgirl.com/?p=%s'
|
imageUrl = 'http://catandgirl.com/?p=%s'
|
||||||
imageSearch = compile(r'<img src="(http://catandgirl.com/archive/.+?)"')
|
imageSearch = compile(tagre("img", "src", r'(http://catandgirl\.com/archive/[^"]+)'))
|
||||||
prevSearch = compile(r'\s+<a href="(.+?)">◄ Previous</a>')
|
prevSearch = compile(tagre("a", "href", r'([^"]+)')+r"[^<]+Previous</a>")
|
||||||
help = 'Index format: n (unpadded)'
|
help = 'Index format: n (unpadded)'
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue