diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py index f1d60a229..a771feecd 100644 --- a/dosagelib/plugins/a.py +++ b/dosagelib/plugins/a.py @@ -8,7 +8,7 @@ from ..helpers import regexNamer, bounceStarter, indirectStarter class ALessonIsLearned(_BasicScraper): latestUrl = 'http://www.alessonislearned.com/' - imageUrl = 'http://www.alessonislearned.com/lesson%s.html' + stripUrl = 'http://www.alessonislearned.com/lesson%s.html' imageSearch = compile(tagre("img", "src", r"(cmx/lesson\d+\.[a-z]+)")) prevSearch = compile(tagre("a", "href", r"(index\.php\?comic=\d+)", quote="'")+r"[^>]+previous") help = 'Index format: nnn' @@ -16,7 +16,7 @@ class ALessonIsLearned(_BasicScraper): class ASofterWorld(_BasicScraper): latestUrl = 'http://www.asofterworld.com/' - imageUrl = 'http://www.asofterworld.com/index.php?id=%s' + stripUrl = 'http://www.asofterworld.com/index.php?id=%s' imageSearch = compile(tagre("img", "src", r'(http://www\.asofterworld\.com/clean/[^"]+)')) prevSearch = compile(tagre("a", "href", "(index\.php\?id=\d+)")+'< back') help = 'Index format: n (unpadded)' @@ -24,7 +24,7 @@ class ASofterWorld(_BasicScraper): class AbleAndBaker(_BasicScraper): latestUrl = 'http://www.jimburgessdesign.com/comics/index.php' - imageUrl = 'http://www.jimburgessdesign.com/comics/index.php?comic=%s' + stripUrl = 'http://www.jimburgessdesign.com/comics/index.php?comic=%s' imageSearch = compile(tagre('img', 'src', r'(comics/.+)')) prevSearch = compile(tagre('a', 'href', r'(.+\d+)') + '.+?previous.gif') help = 'Index format: nnn' @@ -32,7 +32,7 @@ class AbleAndBaker(_BasicScraper): class AbominableCharlesChristopher(_BasicScraper): latestUrl = 'http://abominable.cc/' - imageUrl = 'http://abominable.cc/%s' + stripUrl = 'http://abominable.cc/%s' imageSearch = compile(tagre("img", "src", r'(http://www\.abominable\.cc/comics/[^"]+)')) prevSearch = compile(tagre("a", "href", r'([^"]+)')+"[^<]+Previous") help = 'Index format: yyyy/mm/dd/comicname' @@ -40,7 +40,7 @@ class AbominableCharlesChristopher(_BasicScraper): class AbsurdNotions(_BasicScraper): latestUrl = 'http://www.absurdnotions.org/page129.html' - imageUrl = 'http://www.absurdnotions.org/page%s.html' + stripUrl = 'http://www.absurdnotions.org/page%s.html' imageSearch = compile(tagre('img', 'src', r'(an[^"]+)')) prevSearch = compile(tagre('a', 'href', r'([^"]+)') + tagre('img', 'src', 'nprev\.gif')) help = 'Index format: n (unpadded)' @@ -49,7 +49,7 @@ class AbsurdNotions(_BasicScraper): class AbstruseGoose(_BasicScraper): starter = bounceStarter('http://abstrusegoose.com/', compile(tagre('a', 'href', r'(http://abstrusegoose\.com/\d+)')+"Next »")) - imageUrl = 'http://abstrusegoose.com/c%s.html' + stripUrl = 'http://abstrusegoose.com/c%s.html' imageSearch = compile(tagre('img', 'src', r'(http://abstrusegoose\.com/strips/[^<>"]+)')) prevSearch = compile(tagre('a', 'href', r'(http://abstrusegoose\.com/\d+)') + r'« Previous') help = 'Index format: n (unpadded)' @@ -63,7 +63,7 @@ class AbstruseGoose(_BasicScraper): class AcademyVale(_BasicScraper): latestUrl = 'http://imagerie.com/vale/' - imageUrl = 'http://imagerie.com/vale/avarch.cgi?%s' + stripUrl = 'http://imagerie.com/vale/avarch.cgi?%s' 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' @@ -71,14 +71,14 @@ class AcademyVale(_BasicScraper): class Alice(_BasicScraper): latestUrl = 'http://alice.alicecomics.com/' - imageUrl = 'http://alice.alicecomics.com/wp-content/webcomic/alicecomics/%s.jpg' + stripUrl = '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): - imageUrl = 'http://alienlovespredator.com/%s' + stripUrl = 'http://alienlovespredator.com/%s' imageSearch = compile(r']+>(
\n|\n|
\n)
 
', MULTILINE) prevSearch = compile(r'') prevSearch = compile(r'Back') @@ -130,7 +130,7 @@ class Angels2200(_BasicScraper): class AppleGeeks(_BasicScraper): latestUrl = 'http://www.applegeeks.com/' - imageUrl = 'http://www.applegeeks.com/comics/viewcomic.php?issue=%s' + stripUrl = 'http://www.applegeeks.com/comics/viewcomic.php?issue=%s' imageSearch = compile(tagre("img", "src", r'"(strips/\d+?\..+?)"')) prevSearch = compile(r'
Previous Comic
\s*

', MULTILINE) help = 'Index format: n (unpadded)' @@ -138,7 +138,7 @@ class AppleGeeks(_BasicScraper): class Achewood(_BasicScraper): latestUrl = 'http://www.achewood.com/' - imageUrl = 'http://www.achewood.com/index.php?date=%s' + stripUrl = 'http://www.achewood.com/index.php?date=%s' imageSearch = compile(tagre("img", "src", r'(/comic\.php\?date=\d+)')) prevSearch = compile(tagre("a", "href", r'(index\.php\?date=\d+)', after="Previous")) help = 'Index format: mmddyyyy' @@ -150,7 +150,7 @@ class AstronomyPOTD(_BasicScraper): starter = bounceStarter( 'http://antwrp.gsfc.nasa.gov/apod/astropix.html', compile(r'>')) - imageUrl = 'http://antwrp.gsfc.nasa.gov/apod/ap%s.html' + stripUrl = 'http://antwrp.gsfc.nasa.gov/apod/ap%s.html' imageSearch = compile(r'') prevSearch = compile(r'<') help = 'Index format: yymmdd' @@ -164,7 +164,7 @@ class AstronomyPOTD(_BasicScraper): class AfterStrife(_BasicScraper): latestUrl = 'http://afterstrife.com/?p=262' - imageUrl = 'http://afterstrife.com/?p=%s' + stripUrl = 'http://afterstrife.com/?p=%s' imageSearch = compile(r'") help = 'Index format: yyyy/mm/strip-name' @@ -182,7 +182,7 @@ class ALLCAPS(_BasicScraper): class ASkeweredParadise(_BasicScraper): latestUrl = 'http://aspcomics.net/' - imageUrl = 'http://aspcomics.net/archindex.php?strip_id=%s' + stripUrl = 'http://aspcomics.net/archindex.php?strip_id=%s' imageSearch = compile(tagre("img", "src", r'(http://aspcomics\.net/sites/default/files[^"]*/asp\d+\.jpg)[^"]+')) prevSearch = compile(tagre("a", "href", "(/comic/\d+)")+r"[^>]+Previous") help = 'Index format: nnn' @@ -192,7 +192,7 @@ class ASkeweredParadise(_BasicScraper): class AGirlAndHerFed(_BasicScraper): starter = bounceStarter('http://www.agirlandherfed.com/', compile(r'[^>]+Back')) - imageUrl = 'http://www.agirlandherfed.com/img/strip/%s' + stripUrl = 'http://www.agirlandherfed.com/img/strip/%s' imageSearch = compile(tagre("img", "src", r'(img/strip/[^"]+\.jpg)')) prevSearch = compile(r'[^>]+Back') help = 'Index format: nnn' @@ -205,7 +205,7 @@ class AGirlAndHerFed(_BasicScraper): class AetheriaEpics(_BasicScraper): latestUrl = 'http://aetheria-epics.schala.net/' - imageUrl = 'http://aetheria-epics.schala.net/%s.html' + stripUrl = 'http://aetheria-epics.schala.net/%s.html' imageSearch = compile(r'') help = 'Index format: nnn' @@ -214,7 +214,7 @@ class AetheriaEpics(_BasicScraper): class Adrift(_BasicScraper): latestUrl = 'http://www.adriftcomic.com/' - imageUrl = 'http://www.adriftcomic.com/page%s.html' + stripUrl = 'http://www.adriftcomic.com/page%s.html' imageSearch = compile(r'') prevSearch = compile(r'« Previous') help = 'Index format: nnn' @@ -232,7 +232,7 @@ class AirForceBlues(_BasicScraper): class AlienShores(_BasicScraper): latestUrl = 'http://alienshores.com/alienshores_band/' - imageUrl = 'http://alienshores.com/alienshores_band/?p=%s' + stripUrl = 'http://alienshores.com/alienshores_band/?p=%s' imageSearch = compile(r'>') help = 'Index format: nnn' @@ -241,7 +241,7 @@ class AlienShores(_BasicScraper): class AllTheGrowingThings(_BasicScraper): latestUrl = 'http://typodmary.com/growingthings/' - imageUrl = 'http://typodmary.com/growingthings/%s/' + stripUrl = 'http://typodmary.com/growingthings/%s/' imageSearch = compile(r'') prevSearch = compile(r'« Previous') help = 'Index format: yyyy/mm/dd/strip-name' @@ -277,7 +277,7 @@ class ActionAthena(_BasicScraper): class AlsoBagels(_BasicScraper): latestUrl = 'http://www.alsobagels.com/' - imageUrl = 'http://alsobagels.com/index.php/comic/%s/' + stripUrl = 'http://alsobagels.com/index.php/comic/%s/' imageSearch = compile(r'') help = 'Index format: strip-name' @@ -286,7 +286,7 @@ class AlsoBagels(_BasicScraper): class Annyseed(_BasicScraper): latestUrl = 'http://www.colourofivy.com/annyseed_webcomic_latest.htm' - imageUrl = 'http://www.colourofivy.com/annyseed_webcomic%s.htm' + stripUrl = 'http://www.colourofivy.com/annyseed_webcomic%s.htm' imageSearch = compile(r'') prevSearch = compile(r'"(/new/.+?)".+?previous.gif') help = 'Index format: n (unpadded)' @@ -16,7 +16,7 @@ class BadlyDrawnKitties(_BasicScraper): class Bardsworth(_BasicScraper): latestUrl = 'http://www.bardsworth.com/' - imageUrl = 'http://www.bardsworth.com/archive.php?p=s%' + stripUrl = 'http://www.bardsworth.com/archive.php?p=s%' imageSearch = compile(r'(strips/.+?)"') prevSearch = compile(r'"(http.+?)".+?/prev') help = 'Index format: nnn' @@ -24,7 +24,7 @@ class Bardsworth(_BasicScraper): class BetterDays(_BasicScraper): latestUrl = 'http://www.jaynaylor.com/betterdays/' - imageUrl = 'http://www.jaynaylor.com/betterdays/archives/%s' + stripUrl = 'http://www.jaynaylor.com/betterdays/archives/%s' imageSearch = compile(r'') prevSearch = compile(r'« Previous') help = 'Index format: yyyy/mm/.html' @@ -32,7 +32,7 @@ class BetterDays(_BasicScraper): class BetterYouThanMe(_BasicScraper): latestUrl = 'http://betteryouthanme.net/' - imageUrl = 'http://betteryouthanme.net/archive.php?date=%s.gif' + stripUrl = 'http://betteryouthanme.net/archive.php?date=%s.gif' imageSearch = compile(r'"(comics/.+?)"') prevSearch = compile(r'"(archive.php\?date=.+?)">.+?previous') help = 'Index format: yyyymmdd' @@ -40,7 +40,7 @@ class BetterYouThanMe(_BasicScraper): class BiggerThanCheeses(_BasicScraper): latestUrl = 'http://www.biggercheese.com' - imageUrl = 'http://www.biggercheese.com/index.php?comic=%s' + stripUrl = 'http://www.biggercheese.com/index.php?comic=%s' imageSearch = compile(r'src="(comics/.+?)" alt') prevSearch = compile(r'"(index.php\?comic=.+?)".+?_back') help = 'Index format: n (unpadded)' @@ -49,7 +49,7 @@ class BiggerThanCheeses(_BasicScraper): class BizarreUprising(_BasicScraper): latestUrl = 'http://www.bizarreuprising.com/' - imageUrl = 'http://www.bizarreuprising.com/view/%s' + stripUrl = 'http://www.bizarreuprising.com/view/%s' imageSearch = compile(r']+/images/(?:nav_02|previous_day)\.gif"), #prevSearch=compile(r'(?:"([^"]*(?:/d/[^"\r\n]*)|(?:/strip/.+?))")(?:(?:.{43}starshift_back.gif)|(?:.+?cxn_previous)|(?:.{43}previous)|(?:[^<>]*>[^<>]*<[^<>]*previous)|(?:.*?back_button)|(?:.*?comicnav-previous))'), @@ -163,7 +163,7 @@ uglyHill = blankLabel('UglyHill', 'http://www.uglyhill.com/') class BeePower(_BasicScraper): latestUrl = 'http://comicswithoutviolence.com/d/20080713.html' - imageUrl = 'http://comicswithoutviolence.com/d/%s.html' + stripUrl = 'http://comicswithoutviolence.com/d/%s.html' imageSearch = compile(r'src="(/comics/.+?)"') prevSearch = compile(r'(\d+\.html)">]+?src="/images/previous_day.png"') help = 'Index format: yyyy/mm/dd' @@ -172,7 +172,7 @@ class BeePower(_BasicScraper): class BlankIt(_BasicScraper): latestUrl = 'http://blankitcomics.com/' - imageUrl = 'http://blankitcomics.com/%s' + stripUrl = 'http://blankitcomics.com/%s' imageSearch = compile(r'') help = 'Index format: yyyy/mm/dd/name' @@ -181,7 +181,7 @@ class BlankIt(_BasicScraper): class BobWhite(_BasicScraper): latestUrl = 'http://www.bobwhitecomics.com/' - imageUrl = 'http://www.bobwhitecomics.com/?webcomic_post=%s' + stripUrl = 'http://www.bobwhitecomics.com/?webcomic_post=%s' imageSearch = compile(tagre("img", "src", r"(http://www\.bobwhitecomics\.com/wp/wp-content/webcomic/untitled/\d+.jpg)")) prevSearch = compile(tagre("a", "href", "(http://www\.bobwhitecomics\.com/\?webcomic_post=\d+)")+r'[^"]+Previous') help = 'Index format: yyyymmdd' @@ -190,7 +190,7 @@ class BobWhite(_BasicScraper): class BigFatWhale(_BasicScraper): latestUrl = 'http://www.bigfatwhale.com/' - imageUrl = 'http://www.bigfatwhale.com/archives/bfw_%s.htm' + stripUrl = 'http://www.bigfatwhale.com/archives/bfw_%s.htm' imageSearch = compile(r']+?>Previous') help = 'Index format: (sometimes chapternumber/)-yyyy-mm-dd/stripname' @@ -217,7 +217,7 @@ class Boozeathon4Billion(_BasicScraper): class BrightlyWound(_BasicScraper): latestUrl = 'http://www.brightlywound.com/' - imageUrl = 'http://www.brightlywound.com/?comic=%s' + stripUrl = 'http://www.brightlywound.com/?comic=%s' imageSearch = compile(r'') help = 'Index format: yyyy-mm-dd' @@ -235,7 +235,7 @@ class BlueCrashKit(_BasicScraper): class BloodBound(_BasicScraper): latestUrl = 'http://www.bloodboundcomic.com/' - imageUrl = 'http://www.bloodboundcomic.com/d/%s.html' + stripUrl = 'http://www.bloodboundcomic.com/d/%s.html' imageSearch = compile(r' src="(/comics/.+?)"') prevSearch = compile(r' ]+?src="/images/previous_day.jpg"') help = 'Index format: yyyymmdd' @@ -244,7 +244,7 @@ class BloodBound(_BasicScraper): class BookOfBiff(_BasicScraper): latestUrl = 'http://www.thebookofbiff.com/' - imageUrl = 'http://www.thebookofbiff.com/%s' + stripUrl = 'http://www.thebookofbiff.com/%s' imageSearch = compile(r'◄ Previous') help = 'Index format: yyyy/mm/dd/stripnum-strip-name' @@ -253,7 +253,7 @@ class BookOfBiff(_BasicScraper): class BillyTheDunce(_BasicScraper): latestUrl = 'http://www.duncepress.com/' - imageUrl = 'http://www.duncepress.com/%s/' + stripUrl = 'http://www.duncepress.com/%s/' imageSearch = compile(r'') help = 'Index format: yyyy/mm/dd/strip-name' @@ -280,7 +280,7 @@ class Baroquen(_BasicScraper): class BetweenFailures(_BasicScraper): latestUrl = 'http://betweenfailures.com/' - imageUrl = 'http://betweenfailures.com/%s' + stripUrl = 'http://betweenfailures.com/%s' imageSearch = compile(r'') prevSearch = compile(r'« Previous') help = 'Index format: yyyy/mm/dd/stripnum-strip-name' @@ -289,7 +289,7 @@ class BetweenFailures(_BasicScraper): class BillyTheBeaker(_BasicScraper): latestUrl = 'http://billy.defectivejunk.com/' - imageUrl = 'http://billy.defectivejunk.com/index.php?strip=%s' + stripUrl = 'http://billy.defectivejunk.com/index.php?strip=%s' imageSearch = compile(r'') help = 'Index format: nnn' diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py index 4d1b993bd..a8c1d8ba5 100644 --- a/dosagelib/plugins/c.py +++ b/dosagelib/plugins/c.py @@ -10,7 +10,7 @@ from ..util import tagre, getQueryParams class CalvinAndHobbes(_BasicScraper): starter = bounceStarter('http://www.gocomics.com/calvinandhobbes/', compile(tagre("a", "href", "(/calvinandhobbes/\d+/\d+/\d+)")+"Next feature")) - imageUrl = 'http://www.gocomics.com/calvinandhobbes/%s' + stripUrl = 'http://www.gocomics.com/calvinandhobbes/%s' imageSearch = compile(tagre("img", "src", "(http://assets\.amuniversal\.com/[a-f0-9]+)")) prevSearch = compile(tagre("a", "href", "(/calvinandhobbes/\d+/\d+/\d+)")+"Previous feature") help = 'Index format: yyyy/mm/dd' @@ -23,7 +23,7 @@ class CalvinAndHobbes(_BasicScraper): class CandyCartoon(_BasicScraper): latestUrl = 'http://www.candycartoon.com/' - imageUrl = 'http://www.candycartoon.com/archives/%s.html' + stripUrl = 'http://www.candycartoon.com/archives/%s.html' imageSearch = compile(r'[^prev') help = 'Index format: nnnnnn' @@ -32,7 +32,7 @@ class CandyCartoon(_BasicScraper): class CaptainSNES(_BasicScraper): latestUrl = 'http://captainsnes.com/' - imageUrl = 'http://captainsnes.com/?date=%s' + stripUrl = 'http://captainsnes.com/?date=%s' imageSearch = compile(r'') help = 'Index format: yyyymmdd' @@ -41,7 +41,7 @@ class CaptainSNES(_BasicScraper): class CaribbeanBlue(_BasicScraper): latestUrl = 'http://cblue.katbox.net/' - imageUrl = 'http://cblue.katbox.net/index.php?strip_id=%s' + stripUrl = 'http://cblue.katbox.net/index.php?strip_id=%s' imageSearch = compile(r'="(.+?strips/.+?)"') prevSearch = compile(r'') help = 'Index format: yyyy/mm/dd/strip-name' @@ -85,7 +85,7 @@ class Chisuji(_BasicScraper): class ChugworthAcademy(_BasicScraper): latestUrl = 'http://chugworth.com/' - imageUrl = 'http://chugworth.com/?p=%s' + stripUrl = 'http://chugworth.com/?p=%s' imageSearch = compile(r'Comic') prevSearch = compile(r'<a href=]+?title="Previous">') help = 'Index format: n (unpadded)' @@ -94,7 +94,7 @@ class ChugworthAcademy(_BasicScraper): class ChugworthAcademyArchive(_BasicScraper): latestUrl = 'http://chugworth.com/archive/?strip_id=422' - imageUrl = 'http://chugworth.com/archive/?strip_id=%s' + stripUrl = 'http://chugworth.com/archive/?strip_id=%s' imageSearch = compile(r'&laq') help = 'Index format: non' @@ -112,7 +112,7 @@ class CigarroAndCerveja(_BasicScraper): class CombustibleOrange(_BasicScraper): latestUrl = 'http://www.combustibleorange.com/' - imageUrl = 'http://www.combustibleorange.com/index.php?current=%s' + stripUrl = 'http://www.combustibleorange.com/index.php?current=%s' imageSearch = compile(r'') help = 'Index format: n (unpadded)' @@ -121,7 +121,7 @@ class CombustibleOrange(_BasicScraper): class Comedity(_BasicScraper): latestUrl = 'http://www.comedity.com/' - imageUrl = 'http://www.comedity.com/index.php?strip_id=%s' + stripUrl = 'http://www.comedity.com/index.php?strip_id=%s' imageSearch = compile(r' *\"Prior‹') help = 'Index format: n' @@ -147,7 +147,7 @@ class Commissioned(_BasicScraper): class CoolCatStudio(_BasicScraper): latestUrl = 'http://www.coolcatstudio.com/' - imageUrl = 'http://www.coolcatstudio.com/index.php?p=%s' + stripUrl = 'http://www.coolcatstudio.com/index.php?p=%s' imageSearch = compile(r'(/comics/.+?)"') prevSearch = compile(r"href='(.+?)'>PREV") help = 'Index format: n' @@ -156,7 +156,7 @@ class CoolCatStudio(_BasicScraper): class CourtingDisaster(_BasicScraper): latestUrl = 'http://www.courting-disaster.com/' - imageUrl = 'http://www.courting-disaster.com/archive/%s.html' + stripUrl = 'http://www.courting-disaster.com/archive/%s.html' imageSearch = compile(r'(/comics/.+?)"') prevSearch = compile(r']+?>') help = 'Index format: yyyymmdd' @@ -165,7 +165,7 @@ class CourtingDisaster(_BasicScraper): class CrapIDrewOnMyLunchBreak(_BasicScraper): latestUrl = 'http://crap.jinwicked.com/' - imageUrl = 'http://crap.jinwicked.com/%s' + stripUrl = 'http://crap.jinwicked.com/%s' imageSearch = compile(r'<< Previous page') help = 'Index format: yyyymmdd' @@ -199,11 +199,11 @@ class Curvy(_BasicScraper): def cloneManga(name, shortName, lastStrip=None): url = 'http://manga.clone-army.org' baseUrl = '%s/%s.php' % (url, shortName) - imageUrl = baseUrl + '?page=%s' + stripUrl = baseUrl + '?page=%s' if lastStrip is None: starter = bounceStarter(baseUrl, compile(tagre("a", "href", r'([^"]+)')+tagre("img", "src", r"next\.gif"))) else: - starter = constStarter(imageUrl % lastStrip) + starter = constStarter(stripUrl % lastStrip) def namer(self, imageUrl, pageUrl): return '%03d' % int(getQueryParams(pageUrl)['page'][0]) @@ -213,7 +213,7 @@ def cloneManga(name, shortName, lastStrip=None): dict( name='CloneManga/' + name, starter=starter, - imageUrl=imageUrl, + stripUrl=stripUrl, 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', @@ -232,7 +232,7 @@ penny = cloneManga('PennyTribute', 'penny') class CatAndGirl(_BasicScraper): latestUrl = 'http://catandgirl.com/' - imageUrl = 'http://catandgirl.com/?p=%s' + stripUrl = 'http://catandgirl.com/?p=%s' imageSearch = compile(tagre("img", "src", r'(http://catandgirl\.com/archive/[^"]+)')) prevSearch = compile(tagre("a", "href", r'([^"]+)')+r"[^<]+Previous") help = 'Index format: n (unpadded)' @@ -250,7 +250,7 @@ def comicsDotCom(name, section): (_BasicScraper,), dict( name='GoComicsDotCom/' + name, - imageUrl=latestUrl + '/%s', + stripUrl=latestUrl + '/%s', imageSearch=compile(tagre("img", "src", r'(http://assets\.amuniversal\.com/[0-9a-f]+)')), prevSearch=compile(tagre("a", "href", "(/%s/\d+/\d+/\d+)")+"Previous"), help='Index format: yyyy/mm/dd', @@ -352,7 +352,7 @@ def creators(name, shortname): dict( name='Creators/' + name, latestUrl='http://www.creators.com/comics_show.cfm?ComicName=%s' % (shortname,), - imageUrl=None, + stripUrl=None, imageSearch=compile(r'[^'), prevSearch=compile(r'< Previous') help = 'Index format: n (unpadded)' @@ -382,7 +382,7 @@ class CyanideAndHappiness(_BasicScraper): class CrimsonDark(_BasicScraper): latestUrl = 'http://www.davidcsimon.com/crimsondark/' - imageUrl = 'http://www.davidcsimon.com/crimsondark/index.php?view=comic&strip_id=%s' + stripUrl = 'http://www.davidcsimon.com/crimsondark/index.php?view=comic&strip_id=%s' imageSearch = compile(r'src="(.+?strips/.+?)"') prevSearch = compile(r'') help = 'Index format: nnn' @@ -409,7 +409,7 @@ class CatsAndCameras(_BasicScraper): class CowboyJedi(_BasicScraper): latestUrl = 'http://www.cowboyjedi.com/' - imageUrl = 'http://www.cowboyjedi.com/%s' + stripUrl = 'http://www.cowboyjedi.com/%s' imageSearch = compile(r'') help = 'Index format: nnn' @@ -427,7 +427,7 @@ class CasuallyKayla(_BasicScraper): class Collar6(_BasicScraper): latestUrl = 'http://collar6.com/' - imageUrl = 'http://collar6.com/wp-content/webcomic/collar6/%s.jpg' + stripUrl = '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' @@ -436,7 +436,7 @@ class Collar6(_BasicScraper): class Chester5000XYV(_BasicScraper): latestUrl = 'http://jessfink.com/Chester5000XYV/' - imageUrl = 'http://jessfink.com/Chester5000XYV/?p=%s' + stripUrl = 'http://jessfink.com/Chester5000XYV/?p=%s' imageSearch = compile(r'') help = 'Index format: nnn' @@ -445,7 +445,7 @@ class Chester5000XYV(_BasicScraper): class CalamitiesOfNature(_BasicScraper): latestUrl = 'http://www.calamitiesofnature.com/' - imageUrl = 'http://www.calamitiesofnature.com/archive/?c=%s' + stripUrl = 'http://www.calamitiesofnature.com/archive/?c=%s' imageSearch = compile(r'') help = 'Index format: nnn' @@ -454,7 +454,7 @@ class CalamitiesOfNature(_BasicScraper): class Champ2010(_BasicScraper): latestUrl = 'http://www.jedcollins.com/champ2010/' - imageUrl = 'http://jedcollins.com/champ2010/?p=%s' + stripUrl = 'http://jedcollins.com/champ2010/?p=%s' imageSearch = compile(r'Next>')) - imageUrl = 'http://corydoncafe.com/comic-%s.html' + stripUrl = 'http://corydoncafe.com/comic-%s.html' imageSearch = compile(r'<Previous') help = 'Index format: nnn' @@ -494,7 +494,7 @@ class CorydonCafe(_BasicScraper): class CraftedFables(_BasicScraper): latestUrl = 'http://www.craftedfables.com/' - imageUrl = 'http://www.caf-fiends.net/craftedfables/?p=%s' + stripUrl = 'http://www.caf-fiends.net/craftedfables/?p=%s' imageSearch = compile(r'') help = 'Index format: nnn' @@ -503,7 +503,7 @@ class CraftedFables(_BasicScraper): class Currhue(_BasicScraper): latestUrl = 'http://www.currhue.com/' - imageUrl = 'http://www.currhue.com/?p=%s' + stripUrl = 'http://www.currhue.com/?p=%s' imageSearch = compile(r'', IGNORECASE) prevSearch = compile(r' <.+?/aprev.gif"') help = 'Index format: nnn' @@ -43,7 +43,7 @@ class DeathToTheExtremist(_BasicScraper): class DeepFried(_BasicScraper): latestUrl = 'http://www.whatisdeepfried.com/' - imageUrl = 'http://www.whatisdeepfried.com/%s' + stripUrl = 'http://www.whatisdeepfried.com/%s' imageSearch = compile(r'(http://www.whatisdeepfried.com/comics/.+?)"') prevSearch = compile(r'"(http://www.whatisdeepfried.com/.+?)">') help = 'Index format: non' @@ -52,7 +52,7 @@ class DeepFried(_BasicScraper): class DoemainOfOurOwn(_BasicScraper): latestUrl = 'http://www.doemain.com/' - imageUrl = 'http://www.doemain.com/index.cgi/%s' + stripUrl = 'http://www.doemain.com/index.cgi/%s' imageSearch = compile(r"Previous Strip') prevSearch = compile(r'Previous Week,') help = 'Index format: nnnnn' @@ -70,7 +70,7 @@ class DrFun(_BasicScraper): class Dracula(_BasicScraper): latestUrl = 'http://draculacomic.net/' - imageUrl = 'http://draculacomic.net/comic.php?comicID=%s' + stripUrl = 'http://draculacomic.net/comic.php?comicID=%s' imageSearch = compile(r'« Prev') help = 'Index format: nnn' @@ -79,7 +79,7 @@ class Dracula(_BasicScraper): class DragonTails(_BasicScraper): latestUrl = 'http://www.dragon-tails.com/' - imageUrl = 'http://www.dragon-tails.com/archive.php?date=%s' + stripUrl = 'http://www.dragon-tails.com/archive.php?date=%s' imageSearch = compile(r'"(newcomic/.+?)"') prevSearch = compile(r'"(archive.+?)">.+n_2') help = 'Index format: yyyy-mm-dd' @@ -87,7 +87,7 @@ class DragonTails(_BasicScraper): class DreamKeepersPrelude(_BasicScraper): latestUrl = 'http://www.dreamkeeperscomic.com/Prelude.php' - imageUrl = 'http://www.dreamkeeperscomic.com/Prelude.php?pg=%s' + stripUrl = 'http://www.dreamkeeperscomic.com/Prelude.php?pg=%s' imageSearch = compile(r'(images/PreludeNew/.+?)"') prevSearch = compile(r'(Prelude.php\?pg=.+?)"') help = 'Index format: n' @@ -95,7 +95,7 @@ class DreamKeepersPrelude(_BasicScraper): class Drowtales(_BasicScraper): latestUrl = 'http://www.drowtales.com/mainarchive.php' - imageUrl = 'http://www.drowtales.com/mainarchive.php?location=%s' + stripUrl = 'http://www.drowtales.com/mainarchive.php?location=%s' imageSearch = compile(r'src=".(/tmpmanga/.+?)"') prevSearch = compile(r'.+?back') help = 'Index format: nnn.html' @@ -112,7 +112,7 @@ class DungeonCrawlInc(_BasicScraper): class DieselSweeties(_BasicScraper): latestUrl = 'http://www.dieselsweeties.com/' - imageUrl = 'http://www.dieselsweeties.com/archive/%s' + stripUrl = 'http://www.dieselsweeties.com/archive/%s' imageSearch = compile(r'src="(/hstrips/.+?)"') prevSearch = compile(r'href="(/archive/.+?)">(') starter = indirectStarter('http://dresdencodak.com/', compile(r'

')) @@ -157,7 +157,7 @@ class DresdenCodak(_BasicScraper): class DonkBirds(_BasicScraper): latestUrl = 'http://www.donkbirds.com/' - imageUrl = 'http://www.donkbirds.com/index.php?date=%s' + stripUrl = 'http://www.donkbirds.com/index.php?date=%s' imageSearch = compile(r'Previous') help = 'Index format: yyyy-mm-dd' @@ -166,7 +166,7 @@ class DonkBirds(_BasicScraper): class DrawnByDrunks(_BasicScraper): starter = bounceStarter('http://www.drawnbydrunks.co.uk/', compile(r'
')) - imageUrl = 'http://www.drawnbydrunks.co.uk/?p=%s' + stripUrl = 'http://www.drawnbydrunks.co.uk/?p=%s' imageSearch = compile(r'') help = 'Index format: nnn' @@ -179,7 +179,7 @@ class DrawnByDrunks(_BasicScraper): class DeathCord(_BasicScraper): latestUrl = 'http://deathchord.com/index.php' - imageUrl = 'http://deathchord.com/__.php?comicID=%s' + stripUrl = 'http://deathchord.com/__.php?comicID=%s' imageSearch = compile(r'?.+?]+?alt="Previous" />') help = 'Index format: nnn' diff --git a/dosagelib/plugins/drunkduck.py b/dosagelib/plugins/drunkduck.py index ea1b7e080..d56c8ba95 100644 --- a/dosagelib/plugins/drunkduck.py +++ b/dosagelib/plugins/drunkduck.py @@ -12,7 +12,7 @@ def drunkDuck(shortName): (_BasicScraper,), dict( name='DrunkDuck/' + shortName, - imageUrl='index.php?p=%s' % (shortName,), + stripUrl='index.php?p=%s' % (shortName,), imageSearch=compile(r"", IGNORECASE), prevSearch=compile(linkSearch % ('previous',), IGNORECASE), help='Index format: n (unpadded)', diff --git a/dosagelib/plugins/e.py b/dosagelib/plugins/e.py index 3597b8148..29983f3b0 100644 --- a/dosagelib/plugins/e.py +++ b/dosagelib/plugins/e.py @@ -8,7 +8,7 @@ from ..scraper import _BasicScraper class EerieCuties(_BasicScraper): latestUrl = 'http://www.eeriecuties.com/' - imageUrl = 'http://www.eeriecuties.com/d/%s.html' + stripUrl = 'http://www.eeriecuties.com/d/%s.html' imageSearch = compile(r'(/comics/.+?)"') prevSearch = compile(r'(/d/.+?.html).+?/previous_day.gif') help = 'Index format: yyyymmdd' @@ -17,7 +17,7 @@ class EerieCuties(_BasicScraper): class EdgeTheDevilhunter(_BasicScraper): name = 'KeenSpot/EdgeTheDevilhunter' latestUrl = 'http://www.edgethedevilhunter.com/' - imageUrl = 'http://www.edgethedevilhunter.com/comics/%s' + stripUrl = 'http://www.edgethedevilhunter.com/comics/%s' imageSearch = compile(r'(http://www.edgethedevilhunter.com/comics/.+?)" alt') prevSearch = compile(r'(http://www.edgethedevilhunter.com/comics/.+?)">
  • ]+?onmouseover=\'\$\("navimg(6|2)"\)') help = 'Index format: yyyy-mm-dd' @@ -59,7 +59,7 @@ class ElGoonishShiveNP(_BasicScraper): class ElsieHooper(_BasicScraper): latestUrl = 'http://www.elsiehooper.com/todaysserial.htm' - imageUrl = 'http://www.elsiehooper.com/comics/comic%s.htm' + stripUrl = 'http://www.elsiehooper.com/comics/comic%s.htm' imageSearch = compile(r'') prevSearch = compile(r']+?src="([^"]*?comics/.+?)"') prevSearch = compile(r'><Previous') help = 'Index format: yyyy-mm-dd' @@ -86,7 +86,7 @@ class ErrantStory(_BasicScraper): class EternalVenture(_BasicScraper): latestUrl = 'http://www.pulledpunches.com/venture/' - imageUrl = 'http://www.beaglespace.com/pulledpunches/venture/?p=%s' + stripUrl = 'http://www.beaglespace.com/pulledpunches/venture/?p=%s' imageSearch = compile(r'< Previous') help = 'Index format: yyyymmdd' @@ -103,7 +103,7 @@ class Evercrest(_BasicScraper): class EverybodyLovesEricRaymond(_BasicScraper): latestUrl = 'http://geekz.co.uk/lovesraymond/' - imageUrl = 'http://geekz.co.uk/lovesraymond/archive/%s' + stripUrl = 'http://geekz.co.uk/lovesraymond/archive/%s' imageSearch = compile(r'') help = 'Index format: name-of-old-comic' @@ -111,7 +111,7 @@ class EverybodyLovesEricRaymond(_BasicScraper): class EvilDiva(_BasicScraper): latestUrl = 'http://www.evildivacomics.com/' - imageUrl = 'http://www.evildivacomics.com/%s.html' + stripUrl = 'http://www.evildivacomics.com/%s.html' imageSearch = compile(r'(/comics/.+?)"') prevSearch = compile(r'http.+?com/(.+?)".+?"prev') help = 'Index format: cpn (unpadded)' @@ -120,7 +120,7 @@ class EvilDiva(_BasicScraper): class Exiern(_BasicScraper): latestUrl = 'http://www.exiern.com/' - imageUrl = 'http://www.exiern.com/comic/%s' + stripUrl = 'http://www.exiern.com/comic/%s' imageSearch = compile(r']*>') help = 'Index format: yyyy-mm-dd' @@ -179,7 +179,7 @@ class ExploitationNow(_BasicScraper): class Ellerbisms(_BasicScraper): latestUrl = 'http://www.ellerbisms.com/' - imageUrl = 'http://www.ellerbisms.com/?p=%s' + stripUrl = 'http://www.ellerbisms.com/?p=%s' imageSearch = compile(r'') help = 'Index format: nnn' diff --git a/dosagelib/plugins/f.py b/dosagelib/plugins/f.py index 9f7cf6e2f..536d0aa79 100644 --- a/dosagelib/plugins/f.py +++ b/dosagelib/plugins/f.py @@ -9,7 +9,7 @@ from ..helpers import indirectStarter class FalconTwin(_BasicScraper): latestUrl = 'http://www.falcontwin.com/' - imageUrl = 'http://www.falcontwin.com/index.html?strip=%s' + stripUrl = 'http://www.falcontwin.com/index.html?strip=%s' imageSearch = compile(r'"(strips/.+?)"') prevSearch = compile(r'"prev">Previous Strip') help = 'Index format: nnn' class FeyWinds(_BasicScraper): - imageUrl = 'http://kitsune.rydia.net/comic/page.php?id=%s' + stripUrl = 'http://kitsune.rydia.net/comic/page.php?id=%s' imageSearch = compile(r"(../comic/pages//.+?)'") prevSearch = compile(r"(page.php\?id=.+?)'.+?navprevious.png") help = 'Index format: n (unpadded)' @@ -35,7 +35,7 @@ class FeyWinds(_BasicScraper): class FightCastOrEvade(_BasicScraper): latestUrl = 'http://www.fightcastorevade.net/' - imageUrl = 'http://www.fightcastorevade.net/d/%s' + stripUrl = 'http://www.fightcastorevade.net/d/%s' imageSearch = compile(r'<') help = 'Index format: nnnn' @@ -69,7 +69,7 @@ class Flipside(_BasicScraper): class Footloose(_BasicScraper): latestUrl = 'http://footloosecomic.com/footloose/today.php' - imageUrl = 'http://footloosecomic.com/footloose/pages.php?page=%s' + stripUrl = 'http://footloosecomic.com/footloose/pages.php?page=%s' imageSearch = compile(r']).+?(/footloose/.+?)".+?(?:prev)') # prevSearch = compile(r'(?:first.+?[^>]).+?(/footloose/.+?html).+?(?:prev|Prev)') @@ -79,7 +79,7 @@ class Footloose(_BasicScraper): class FragileGravity(_BasicScraper): latestUrl = 'http://www.fragilegravity.com/' - imageUrl = 'http://www.fragilegravity.com/core.php?archive=%s' + stripUrl = 'http://www.fragilegravity.com/core.php?archive=%s' imageSearch = compile(r'Previous') help = 'Index format: nnnn/nnnnn' @@ -96,7 +96,7 @@ class Freefall(_BasicScraper): class FantasyRealms(_BasicScraper): - imageUrl = 'http://www.fantasyrealmsonline.com/manga/%s.php' + stripUrl = 'http://www.fantasyrealmsonline.com/manga/%s.php' imageSearch = compile(r'Back', IGNORECASE) help = 'Index format: nn-m (comicNumber-partNumber)' @@ -137,13 +137,13 @@ class Fallen(_BasicScraper): def setStrip(self, index): index, part = index.split('-') - self.currentUrl = self.imageUrl % (part, index, part) + self.currentUrl = self.stripUrl % (part, index, part) class FoxTails(_BasicScraper): latestUrl = 'http://www.magickitsune.com/strips/current.html' - imageUrl = 'http://www.magickitsune.com/strips/%s' + stripUrl = 'http://www.magickitsune.com/strips/%s' imageSearch = compile(r']', IGNORECASE) prevSearch = compile(r'(?<=first.gif)*(?<=)*', IGNORECASE) help = 'Index format: yyyymmdd' diff --git a/dosagelib/plugins/g.py b/dosagelib/plugins/g.py index fcbc13f9f..7e9cd40a6 100644 --- a/dosagelib/plugins/g.py +++ b/dosagelib/plugins/g.py @@ -8,7 +8,7 @@ from ..helpers import indirectStarter class Galaxion(_BasicScraper): latestUrl = 'http://galaxioncomics.com/' - imageUrl = 'http://galaxioncomics.com/?p=%s' + stripUrl = 'http://galaxioncomics.com/?p=%s' imageSearch = compile(r'(wordpress/comics/.+?)"') prevSearch = compile(r'\| ◄ Previous<') help = 'Index format: n (unpadded)' @@ -24,7 +24,7 @@ class Garanos(_BasicScraper): class GUComics(_BasicScraper): latestUrl = 'http://www.gucomics.com/comic/' - imageUrl = 'http://www.gucomics.com/comic/?cdate=%s' + stripUrl = 'http://www.gucomics.com/comic/?cdate=%s' imageSearch = compile(r'PREVIOUS') help = 'Index format: nnn' @@ -42,7 +42,7 @@ class GenrezvousPoint(_BasicScraper): class GirlGenius(_BasicScraper): latestUrl = 'http://girlgeniusonline.com/comic.php' - imageUrl = 'http://www.girlgeniusonline.com/comic.php\?date=%s' + stripUrl = 'http://www.girlgeniusonline.com/comic.php\?date=%s' imageSearch = compile(r"(/ggmain/strips/.+?)'") prevSearch = compile(r" ]*>]+src="images/gwsmenu/back_off.jpg"') help = 'Index format: nnn' @@ -60,7 +60,7 @@ class GirlsWithSlingshots(_BasicScraper): class Girly(_BasicScraper): latestUrl = 'http://girlyyy.com/' - imageUrl = 'http://girlyyy.com/go/%s' + stripUrl = 'http://girlyyy.com/go/%s' imageSearch = compile(r'  < prev') help = 'Index format: nnn' @@ -69,7 +69,7 @@ class Girly(_BasicScraper): class Goats(_BasicScraper): latestUrl = 'http://www.goats.com/' - imageUrl = 'http://www.goats.com/archive/%s.html' + stripUrl = 'http://www.goats.com/archive/%s.html' imageSearch = compile(r'') help = 'Index format: yymmdd' @@ -79,7 +79,7 @@ class Goats(_BasicScraper): class GoneWithTheBlastwave(_BasicScraper): starter = indirectStarter('http://www.blastwave-comic.com/index.php?p=comic&nro=1', compile(r'href="(index.php\?p=comic&nro=\d+)">]+?src="/images/previous_day') help = 'Index format: yyyy/mm/dd' @@ -110,7 +110,7 @@ class Gunshow(_BasicScraper): class GleefulNihilism(_BasicScraper): latestUrl = 'http://gleefulnihilism.com/' - imageUrl = 'http://gleefulnihilism.com/comics/2009/12/01/just-one-of-the-perks/%s' + stripUrl = 'http://gleefulnihilism.com/comics/2009/12/01/just-one-of-the-perks/%s' imageSearch = compile(r']+?>Previous') help = 'Index format: yyyy/mm/dd/strip-name' @@ -119,7 +119,7 @@ class GleefulNihilism(_BasicScraper): class GastroPhobia(_BasicScraper): latestUrl = 'http://www.gastrophobia.com/' - imageUrl = 'http://www.gastrophobia.com/index.php?date=%s' + stripUrl = 'http://www.gastrophobia.com/index.php?date=%s' imageSearch = compile(r']*>(?!
    )') prevSearch = compile(r'« Previous') help = 'Index format: nnn' @@ -137,7 +137,7 @@ class Geeks(_BasicScraper): class GlassHalfEmpty(_BasicScraper): latestUrl = 'http://www.defectivity.com/ghe/index.php' - imageUrl = 'http://www.defectivity.com/ghe/index.php?strip_id=%s' + stripUrl = 'http://www.defectivity.com/ghe/index.php?strip_id=%s' imageSearch = compile(r'src="(comics/.+?)"') prevSearch = compile(r'◄') help = 'Index format: yyyy/mm/chapter-n-page-n' @@ -16,7 +16,7 @@ class HappyMedium(_BasicScraper): class Heliothaumic(_BasicScraper): latestUrl = 'http://thaumic.net/' - imageUrl = 'http://thaumic.net/%s' + stripUrl = 'http://thaumic.net/%s' imageSearch = compile(r'') help = 'Index format: yyyy/mm/dd/n(unpadded)-comicname' @@ -25,7 +25,7 @@ class Heliothaumic(_BasicScraper): class Housd(_BasicScraper): latestUrl = 'http://housd.net/archive_page.php?comicID=1284' - imageUrl = 'http://housd.net/archive_page.php?comicID=%s' + stripUrl = 'http://housd.net/archive_page.php?comicID=%s' imageSearch = compile(r'"(.+?/comics/.+?)"') prevSearch = compile(r'"(h.+?comicID=.+?)".+?prev') help = 'Index format: nnnn' @@ -34,7 +34,7 @@ class Housd(_BasicScraper): class HateSong(_BasicScraper): latestUrl = 'http://hatesong.com/' - imageUrl = 'http://hatesong.com/%s/' + stripUrl = 'http://hatesong.com/%s/' imageSearch = compile(r'src="(http://www.hatesong.com/strips/.+?)"') prevSearch = compile(r'
    ]+?src="/images/previous_day.png"') help = 'Index format: yyyy/mm/dd' @@ -52,7 +52,7 @@ class HorribleVille(_BasicScraper): class HelpDesk(_BasicScraper): latestUrl = 'http://www.ubersoft.net/' - imageUrl = 'http://www.ubersoft.net/comic/hd/%s/%s/%s' + stripUrl = 'http://www.ubersoft.net/comic/hd/%s/%s/%s' imageSearch = compile(r'src="(http://www.ubersoft.net/files/comics/hd/hd\d{8}.png)') prevSearch = compile(r'(.+?)previous') help = 'Index format: yyyy/mm/name' @@ -61,7 +61,7 @@ class HelpDesk(_BasicScraper): class HardGraft(_BasicScraper): latestUrl = 'http://hard-graft.net/' - imageUrl = 'http://hard-graft.net/?p=%s' + stripUrl = 'http://hard-graft.net/?p=%s' imageSearch = compile(r'') prevSearch = compile(r'Previous ') help = 'Index format: nnn' @@ -23,7 +23,7 @@ class IrregularWebcomic(_BasicScraper): class InsideOut(_BasicScraper): latestUrl = 'http://www.insideoutcomic.com/' - imageUrl = 'http://www.insideoutcomic.com/html/%s.html' + stripUrl = 'http://www.insideoutcomic.com/html/%s.html' imageSearch = compile(r'Picture12LYR.+?C="(.+?/assets/images/.+?)"') prevSearch = compile(r'Picture7LYR.+?F="(.+?/html/.+?)"') help = 'Index format: n_comic_name' @@ -48,7 +48,7 @@ def inkTank(name, shortName): dict( name='InkTank/' + name, latestUrl=baseUrl, - imageUrl=baseUrl + 'd/%s.html', + stripUrl=baseUrl + 'd/%s.html', imageSearch=compile(r'Edellinen') @@ -71,7 +71,7 @@ class IlmanNaista(_BasicScraper): class ICantDrawFeet(_BasicScraper): latestUrl = 'http://icantdrawfeet.com/' - imageUrl = 'http://icantdrawfeet.com/%s' + stripUrl = 'http://icantdrawfeet.com/%s' imageSearch = compile(r'src="(http://icantdrawfeet.com/comics/.+?)"') prevSearch = compile(r'Previous Strip') help = 'Index format: n (unpadded)' @@ -16,7 +16,7 @@ class Jack(_BasicScraper): class JerkCity(_BasicScraper): latestUrl = 'http://www.jerkcity.com/' - imageUrl = 'http://www.jerkcity.com/jerkcity%s' + stripUrl = 'http://www.jerkcity.com/jerkcity%s' imageSearch = compile(r'"jerkcity.+?">.+?"(/jerkcity.+?)"') prevSearch = compile(r'"(jerkcity.+?)">.+?"/jerkcity.+?"') help = 'Index format: unknown' @@ -25,7 +25,7 @@ class JerkCity(_BasicScraper): class JoeAndMonkey(_BasicScraper): latestUrl = 'http://www.joeandmonkey.com/' - imageUrl = 'http://www.joeandmonkey.com/%s' + stripUrl = 'http://www.joeandmonkey.com/%s' imageSearch = compile(r'"(/comic/[^"]+)"') prevSearch = compile(r"Previous") help = 'Index format: nnn' @@ -34,7 +34,7 @@ class JoeAndMonkey(_BasicScraper): class JoyOfTech(_BasicScraper): latestUrl = 'http://www.geekculture.com/joyoftech/index.html' - imageUrl = 'http://www.geekculture.com/joyoftech/joyarchives/%s.html' + stripUrl = 'http://www.geekculture.com/joyoftech/joyarchives/%s.html' imageSearch = compile(r'The Joy') prevSearch = compile(r'<a href=(?:]*>)?]*>
    [\s\n]*Previous Joy', MULTILINE) help = 'Index format: nnn' diff --git a/dosagelib/plugins/k.py b/dosagelib/plugins/k.py index 9572532df..d87770f93 100644 --- a/dosagelib/plugins/k.py +++ b/dosagelib/plugins/k.py @@ -7,7 +7,7 @@ from ..scraper import _BasicScraper class KernelPanic(_BasicScraper): latestUrl = 'http://www.ubersoft.net/kpanic/' - imageUrl = 'http://www.ubersoft.net/kpanic/d/%s' + stripUrl = 'http://www.ubersoft.net/kpanic/d/%s' imageSearch = compile(r'src="(.+?/kp/kp.+?)" ') prevSearch = compile(r'