From f15f993851fca929a5b16b3fa974e44edd4525b4 Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Sat, 13 Apr 2013 20:58:00 +0200 Subject: [PATCH] s/baseurl/baseUrl/g --- dosagelib/plugins/a.py | 32 ++++++++++----------- dosagelib/plugins/c.py | 14 +++++----- dosagelib/plugins/creators.py | 6 ++-- dosagelib/plugins/d.py | 12 ++++---- dosagelib/plugins/f.py | 18 ++++++------ dosagelib/plugins/g.py | 8 +++--- dosagelib/plugins/k.py | 18 ++++++------ dosagelib/plugins/n.py | 8 +++--- dosagelib/plugins/p.py | 18 ++++++------ dosagelib/plugins/q.py | 6 ++-- dosagelib/plugins/r.py | 6 ++-- dosagelib/plugins/s.py | 14 +++++----- dosagelib/plugins/t.py | 20 +++++++------- dosagelib/plugins/u.py | 6 ++-- dosagelib/plugins/w.py | 52 +++++++++++++++++------------------ 15 files changed, 119 insertions(+), 119 deletions(-) diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py index 1404871bc..82e3d18d0 100644 --- a/dosagelib/plugins/a.py +++ b/dosagelib/plugins/a.py @@ -18,9 +18,9 @@ class AbleAndBaker(_BasicScraper): class AbsurdNotions(_BasicScraper): - baseurl = 'http://www.absurdnotions.org/' - url = baseurl + 'page129.html' - stripUrl = baseurl + 'page%s.html' + baseUrl = 'http://www.absurdnotions.org/' + url = baseUrl + 'page129.html' + stripUrl = baseUrl + 'page%s.html' firstStripUrl = stripUrl % '1' imageSearch = compile(tagre('img', 'src', r'(an[^"]+)')) multipleImagesPerStrip = True @@ -74,9 +74,9 @@ class AetheriaEpics(_BasicScraper): class AfterStrife(_BasicScraper): - baseurl = 'http://afterstrife.com/' - rurl = escape(baseurl) - stripUrl = baseurl + '?p=%s' + baseUrl = 'http://afterstrife.com/' + rurl = escape(baseUrl) + stripUrl = baseUrl + '?p=%s' url = stripUrl % '262' firstStripUrl = stripUrl % '1' imageSearch = compile(r'")) - stripUrl = baseurl + 'ap%s.html' + stripUrl = baseUrl + 'ap%s.html' firstStripUrl = stripUrl % '061012' imageSearch = compile(tagre("a", "href", r'(image/\d{4}/[^"]+)')) multipleImagesPerStrip = True diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py index cb836eb01..07f5568a3 100644 --- a/dosagelib/plugins/c.py +++ b/dosagelib/plugins/c.py @@ -101,11 +101,11 @@ class ChainsawSuit(_BasicScraper): class Champ2010(_BasicScraper): - baseurl = 'http://jedcollins.com/champ2010/' - rurl = escape(baseurl) + baseUrl = 'http://jedcollins.com/champ2010/' + rurl = escape(baseUrl) # the latest URL is hard coded since the comic is discontinued - url = baseurl + 'champ-12-30-10.html' - stripUrl = baseurl + '%s.html' + url = baseUrl + 'champ-12-30-10.html' + stripUrl = baseUrl + '%s.html' firstStripUrl = stripUrl % 'champ1-1-10-fuck' imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl)) prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl, after="Previous")) @@ -323,9 +323,9 @@ class CrimsonDark(_BasicScraper): class CraftedFables(_BasicScraper): url = 'http://www.craftedfables.com/' - baseurl = 'http://www.caf-fiends.net/' - rurl = escape(baseurl) - stripUrl = baseurl + 'craftedfables/?p=%s' + baseUrl = 'http://www.caf-fiends.net/' + rurl = escape(baseUrl) + stripUrl = baseUrl + 'craftedfables/?p=%s' imageSearch = compile(tagre("img", "src", r'(%scraftedfables/comics/[^"]+)' % rurl)) prevSearch = compile(tagre("a", "href", r'(%scraftedfables/[^"]+)' % rurl) + tagre("span", "class", r"prev")) diff --git a/dosagelib/plugins/creators.py b/dosagelib/plugins/creators.py index 057b14bd7..17de2d5ca 100644 --- a/dosagelib/plugins/creators.py +++ b/dosagelib/plugins/creators.py @@ -9,12 +9,12 @@ from ..util import tagre _imageSearch = compile(tagre("a", "href", r'(/comics/\d+/[^"]+)')) def add(name, path): - baseurl = 'http://www.creators.com' + baseUrl = 'http://www.creators.com' classname = 'Creators_%s' % name globals()[classname] = make_scraper(classname, name = 'Creators/' + name, - url = baseurl + path + '.html', - stripUrl = baseurl + path + '/%s.html', + url = baseUrl + path + '.html', + stripUrl = baseUrl + path + '/%s.html', lang = 'es' if name.lower().endswith('spanish') else 'en', imageSearch = _imageSearch, prevSearch = compile(tagre("a", "href", r'(%s/\d+\.html)' % path) + diff --git a/dosagelib/plugins/d.py b/dosagelib/plugins/d.py index c0b54d176..1c591ce35 100644 --- a/dosagelib/plugins/d.py +++ b/dosagelib/plugins/d.py @@ -258,9 +258,9 @@ class DresdenCodak(_BasicScraper): class DrFun(_BasicScraper): - baseurl = 'http://www.ibiblio.org/Dave/' - url = baseurl + 'ar00502.htm' - stripUrl = baseurl + 'ar%s.htm' + baseUrl = 'http://www.ibiblio.org/Dave/' + url = baseUrl + 'ar00502.htm' + stripUrl = baseUrl + 'ar%s.htm' firstStripUrl = stripUrl % '00001' imageSearch = compile(tagre("a", "href", r'(Dr-Fun/df\d+/df[^"]+)')) multipleImagesPerStrip = True @@ -280,9 +280,9 @@ class DrMcNinja(_BasicScraper): class Drowtales(_BasicScraper): - baseurl = 'http://www.drowtales.com/' - rurl = escape(baseurl) - url = baseurl + 'mainarchive.php' + baseUrl = 'http://www.drowtales.com/' + rurl = escape(baseUrl) + url = baseUrl + 'mainarchive.php' stripUrl = url + '?sid=%s' firstStripUrl = stripUrl % '4192' imageSearch = ( diff --git a/dosagelib/plugins/f.py b/dosagelib/plugins/f.py index 6123ff874..e3eee21c0 100644 --- a/dosagelib/plugins/f.py +++ b/dosagelib/plugins/f.py @@ -19,9 +19,9 @@ class FalconTwin(_BasicScraper): class Fallen(_BasicScraper): - baseurl = 'http://www.fallencomic.com/' - url = baseurl + 'fal-page.htm' - stripUrl = baseurl + 'pages/part%s/%s-p%s.htm' + baseUrl = 'http://www.fallencomic.com/' + url = baseUrl + 'fal-page.htm' + stripUrl = baseUrl + 'pages/part%s/%s-p%s.htm' imageSearch = compile(r'Back', IGNORECASE) help = 'Index format: nn-m (comicNumber-partNumber)' @@ -59,9 +59,9 @@ class FauxPas(_BasicScraper): class FeyWinds(_BasicScraper): - baseurl = 'http://kitsune.rydia.net/' - url = baseurl + 'index.html' - stripUrl = baseurl + 'comic/page.php?id=%s' + baseUrl = 'http://kitsune.rydia.net/' + url = baseUrl + 'index.html' + stripUrl = baseUrl + 'comic/page.php?id=%s' imageSearch = compile(r"(../comic/pages//.+?)'") prevSearch = compile(r"(page.php\?id=.+?)'.+?navprevious.png") help = 'Index format: n (unpadded)' @@ -89,9 +89,9 @@ class FirstWorldProblems(_BasicScraper): class FlakyPastry(_BasicScraper): - baseurl = 'http://flakypastry.runningwithpencils.com/' - url = baseurl + 'index.php' - stripUrl = baseurl + 'comic.php?strip_id=%s' + baseUrl = 'http://flakypastry.runningwithpencils.com/' + url = baseUrl + 'index.php' + stripUrl = baseUrl + 'comic.php?strip_id=%s' firstStripUrl = stripUrl % '0' imageSearch = compile(r'next')) - stripUrl = baseurl + '%s/index.html' + stripUrl = baseUrl + '%s/index.html' firstStripUrl = stripUrl % '1996-06-10' imageSearch = compile(r']*>') prevSearch = compile(r'previous') diff --git a/dosagelib/plugins/s.py b/dosagelib/plugins/s.py index 972ac399f..00130e206 100644 --- a/dosagelib/plugins/s.py +++ b/dosagelib/plugins/s.py @@ -316,9 +316,9 @@ class SodiumEyes(_BasicScraper): class Sorcery101(_BasicScraper): description = u'Welcome to the site of Kel McDonald, professional comic illustrator and writer.' - baseurl = 'http://www.sorcery101.net/' - url = baseurl + 'sorcery-101/' - rurl = escape(baseurl) + baseUrl = 'http://www.sorcery101.net/' + url = baseUrl + 'sorcery-101/' + rurl = escape(baseUrl) stripUrl = url + '%s/' imageSearch = compile(tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/[^"]+)' % rurl)) prevSearch = compile(tagre("a", "href", r'(%ssorcery-101/[^"]+)' % rurl, after="previous-")) @@ -475,10 +475,10 @@ class SomethingPositive(_BasicScraper): class StarCrossdDestiny(_BasicScraper): description = u'Furturistic fantasy. A group of outcasts fight to survive in a world that shuns them as freaks.' - baseurl = 'http://www.starcrossd.net/' - rurl = escape(baseurl) - url = baseurl + 'comic.html' - stripUrl = baseurl + 'archives/%s.html' + baseUrl = 'http://www.starcrossd.net/' + rurl = escape(baseUrl) + url = baseUrl + 'comic.html' + stripUrl = baseUrl + 'archives/%s.html' firstStripUrl = stripUrl % '00000001' imageSearch = compile(tagre("img", "src", r'(%s(?:ch1|strips|book2)/[^"]+)' % rurl)) prevSearch = compile(r']*"[^"]*"[^>]*>prev' % rurl, IGNORECASE) diff --git a/dosagelib/plugins/t.py b/dosagelib/plugins/t.py index 2bfce060a..fb85f0383 100644 --- a/dosagelib/plugins/t.py +++ b/dosagelib/plugins/t.py @@ -37,14 +37,14 @@ class TheNoob(_BasicScraper): class TheOrderOfTheStick(_BasicScraper): - baseurl = 'http://www.giantitp.com/' - url = baseurl + 'comics/oots0863.html' - stripUrl = baseurl + 'comics/oots%s.html' + baseUrl = 'http://www.giantitp.com/' + url = baseUrl + 'comics/oots0863.html' + stripUrl = baseUrl + 'comics/oots%s.html' firstStripUrl = stripUrl % '0001' imageSearch = compile(r'') prevSearch = compile(r'') multipleImagesPerStrip = True @@ -147,9 +147,9 @@ class TheWhiteboard(_BasicScraper): class HMHigh(_BasicScraper): name = 'TheFallenAngel/HMHigh' - baseurl = 'http://www.thefallenangel.co.uk/' - url = baseurl + 'hmhigh/' - rurl = escape(baseurl) + baseUrl = 'http://www.thefallenangel.co.uk/' + url = baseUrl + 'hmhigh/' + rurl = escape(baseUrl) stripUrl = url + '?id=%s' imageSearch = compile(r'Prev' % rurl) diff --git a/dosagelib/plugins/u.py b/dosagelib/plugins/u.py index dc3271a0b..d05cbf974 100644 --- a/dosagelib/plugins/u.py +++ b/dosagelib/plugins/u.py @@ -20,9 +20,9 @@ class Undertow(_BasicScraper): class UnicornJelly(_BasicScraper): - baseurl = 'http://unicornjelly.com/' - url = baseurl + 'uni666.html' - stripUrl = baseurl + 'uni%s.html' + baseUrl = 'http://unicornjelly.com/' + url = baseUrl + 'uni666.html' + stripUrl = baseUrl + 'uni%s.html' firstStripUrl = stripUrl % '001' imageSearch = compile(r'(?:)?()?