\s*" +
+ tagre("img", "src", r'(%sfiles/[0-9]+/[0-9]+/[^"]*Dork[^"]+\.(?:gif|jpg))' % rurl,
+ after=' alt'))
+ prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl) + "Previous")
help = 'Index format: yyyy/mm/dd/stripname-dd-mm-yy'
@@ -250,9 +252,11 @@ class DresdenCodak(_BasicScraper):
firstStripUrl = url + '2007/02/08/pom/'
imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl) +
- tagre("img", "src", r"%sm_prev2?\.png" % rurl, quote=""))
- starter = indirectStarter(url, compile(tagre("div", "id", "preview") +
- tagre("a", "href", r'(%s\d+/\d+/\d+/[^"]+)' % rurl)))
+ tagre("img", "src", r"%sm_prev2?\.png" % rurl,
+ quote=""))
+ starter = indirectStarter(
+ url, compile(tagre("div", "id", "preview") +
+ tagre("a", "href", r'(%s\d+/\d+/\d+/[^"]+)' % rurl)))
class DrFun(_BasicScraper):
@@ -309,6 +313,7 @@ class DumbingOfAge(_BasicScraper):
imageSearch = compile(tagre("img", "src", r'(%scomics/\d+-\d+-\d+[^"]+)' % rurl))
help = 'Index format: yyyy/comic/book-num/seriesname/stripname'
+
class DungeonsAndDenizens(_BasicScraper):
url = 'http://dungeond.com/'
stripUrl = url + r'\d+/\d+/\d+/%s/'
diff --git a/dosagelib/plugins/e.py b/dosagelib/plugins/e.py
index edcce70b4..d0c1ecd58 100755
--- a/dosagelib/plugins/e.py
+++ b/dosagelib/plugins/e.py
@@ -10,7 +10,7 @@ from re import compile, escape, IGNORECASE
from ..helpers import indirectStarter
from ..scraper import _BasicScraper, _ParserScraper
from ..util import tagre
-from .common import _WordPressScraper, WP_LATEST_SEARCH
+from .common import _WordPressScraper, WP_LATEST_SEARCH, xpath_class
class EarthsongSaga(_ParserScraper):
@@ -83,12 +83,10 @@ class EdibleDirt(_BasicScraper):
help = 'Index format: number'
-class EdmundFinney(_ParserScraper):
+class EdmundFinney(_WordPressScraper):
url = 'http://eqcomics.com/'
firstStripUrl = url + '2009/03/08/sunday-aliens/'
- imageSearch = '//div[@id="comic"]//img'
- prevSearch = '//a[@class="navi navi-prev"]'
- help = 'Index format: yyyy/mm/dd/stripname'
+ prevSearch = '//a[%s]' % xpath_class('navi-prev')
class EerieCuties(_BasicScraper):
@@ -174,13 +172,10 @@ class ErrantStory(_BasicScraper):
help = 'Index format: yyyy-mm-dd/num'
-class Erstwhile(_ParserScraper):
+class Erstwhile(_WordPressScraper):
url = 'http://www.erstwhiletales.com/'
- stripUrl = url + '%s/'
- css = True
- imageSearch = 'div.comicpane a img'
- prevSearch = 'a.navi-prev'
- help = 'Index format: title-nn'
+ prevSearch = '//a[%s]' % xpath_class('navi-prev')
+ endOfLife = True
class Eryl(_WordPressScraper):
@@ -199,14 +194,10 @@ class EverybodyLovesEricRaymond(_BasicScraper):
help = 'Index format: name-of-old-comic'
-class EverydayBlues(_BasicScraper):
+class EverydayBlues(_WordPressScraper):
url = 'http://everydayblues.everydayblues.net/'
- rurl = escape(url)
- stripUrl = url + '%s/'
- firstStripUrl = stripUrl % '2010/02/11/sometimes'
- prevSearch = compile(tagre("a", "href", r'(%s\d+/\d+/\d+/[^"]+/)' % rurl, after="navi-prev"))
- imageSearch = compile(tagre("img", "src", r'(%scomics/\d+-\d+-\d+-[^"]+)' % rurl))
- help = 'Index format: yyyy/mm/dd/stripname'
+ firstStripUrl = url + '2010/02/11/sometimes/'
+ prevSearch = '//a[%s]' % xpath_class('navi-prev')
class EvilDiva(_BasicScraper):
@@ -242,15 +233,11 @@ class Exiern(_BasicScraper):
help = 'Index format: yyyy/mm/dd/stripname'
-class ExploitationNow(_BasicScraper):
+class ExploitationNow(_WordPressScraper):
url = 'http://www.exploitationnow.com/'
- rurl = escape(url)
- stripUrl = url + '%s'
- firstStripUrl = stripUrl % '2000-07-07/9'
- imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
- prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl,
- after="navi-prev"))
- help = 'Index format: yyyy-mm-dd/num'
+ firstStripUrl = url + '2000-07-07/9'
+ prevSearch = '//a[%s]' % xpath_class('navi-prev')
+ endOfLife = True
class ExtraLife(_BasicScraper):
diff --git a/dosagelib/plugins/g.py b/dosagelib/plugins/g.py
index 4b058a787..675320db2 100644
--- a/dosagelib/plugins/g.py
+++ b/dosagelib/plugins/g.py
@@ -4,12 +4,13 @@
# Copyright (C) 2015-2016 Tobias Gruetzmacher
from __future__ import absolute_import, division, print_function
+
from re import compile, escape
from ..scraper import _BasicScraper, _ParserScraper
from ..helpers import indirectStarter
from ..util import tagre
-from .common import _ComicControlScraper
+from .common import _ComicControlScraper, _WordPressScraper, xpath_class
class Galaxion(_BasicScraper):
@@ -150,15 +151,10 @@ class GoneWithTheBlastwave(_BasicScraper):
return '%02d' % int(compile(r'nro=(\d+)').search(pageUrl).group(1))
-class GrrlPower(_BasicScraper):
+class GrrlPower(_WordPressScraper):
url = 'http://grrlpowercomic.com/'
- rurl = escape(url)
- stripUrl = url + 'archives/%s'
- firstStripUrl = stripUrl % '48'
- imageSearch = compile(tagre("img", "src", r'(.*/comics/[^"]+)'))
- prevSearch = compile(tagre("a", "href", r'(.*/archives/\d+)',
- after="navi-prev"))
- help = 'Index format: number'
+ firstStripUrl = url + 'archives/48'
+ prevSearch = '//a[%s]' % xpath_class('navi-prev')
class GUComics(_BasicScraper):
diff --git a/dosagelib/plugins/i.py b/dosagelib/plugins/i.py
index 99e7171ec..5a78cec4e 100644
--- a/dosagelib/plugins/i.py
+++ b/dosagelib/plugins/i.py
@@ -4,10 +4,12 @@
# Copyright (C) 2015-2016 Tobias Gruetzmacher
from __future__ import absolute_import, division, print_function
+
from re import compile, escape
+
from ..scraper import _BasicScraper
from ..util import tagre
-from .common import _WordPressScraper
+from .common import _WordPressScraper, xpath_class
class IAmArg(_BasicScraper):
@@ -34,13 +36,11 @@ class IDreamOfAJeanieBottle(_WordPressScraper):
url = 'http://jeaniebottle.com/'
-class InternetWebcomic(_BasicScraper):
+class InternetWebcomic(_WordPressScraper):
url = 'http://www.internet-webcomic.com/'
- rurl = escape(url)
stripUrl = url + '?p=%s'
firstStripUrl = stripUrl % '30'
- imageSearch = compile(tagre("img", "src", r'(%scomics/[^"/]+)' % rurl))
- prevSearch = compile(tagre("a", "href", r'(%s\?p=\d+)' % rurl, after="navi navi-prev"))
+ prevSearch = '//a[%s]' % xpath_class('navi-prev')
help = 'Index format: n'
diff --git a/dosagelib/plugins/k.py b/dosagelib/plugins/k.py
index 13380101d..6f8ce9d94 100644
--- a/dosagelib/plugins/k.py
+++ b/dosagelib/plugins/k.py
@@ -10,7 +10,7 @@ from re import compile, escape, IGNORECASE
from ..scraper import _BasicScraper
from ..util import tagre
from ..helpers import indirectStarter
-from .common import _ComicControlScraper
+from .common import _ComicControlScraper, _WordPressScraper, xpath_class
class KevinAndKell(_BasicScraper):
@@ -37,17 +37,10 @@ class Key(_BasicScraper):
help = 'Index format: nnn'
-class KickInTheHead(_BasicScraper):
+class KickInTheHead(_WordPressScraper):
url = 'http://www.kickinthehead.org/'
- rurl = escape(url)
- stripUrl = url + '%s/'
- firstStripUrl = stripUrl % '2003/03/20/ipod-envy'
- imageSearch = compile(
- tagre("img", "src",
- r'(%skickinthehead3/comics/\d+-\d+-\d+[^"]+)' % rurl))
- prevSearch = compile(tagre("a", "href", r'(%s\d+/\d+/\d+/[^"]+)' % rurl,
- after="navi-prev"))
- help = 'Index format: yyyy/mm/dd/stripname'
+ firstStripUrl = url + '2003/03/20/ipod-envy/'
+ prevSearch = '//a[%s]' % xpath_class('navi-prev')
class KiwiBlitz(_ComicControlScraper):
diff --git a/dosagelib/plugins/n.py b/dosagelib/plugins/n.py
index 325ee9f26..e1b4bef97 100644
--- a/dosagelib/plugins/n.py
+++ b/dosagelib/plugins/n.py
@@ -10,7 +10,8 @@ from re import compile, escape
from ..scraper import _BasicScraper, _ParserScraper
from ..helpers import indirectStarter
from ..util import tagre
-from .common import _ComicControlScraper, _WordPressScraper, WP_LATEST_SEARCH
+from .common import (_ComicControlScraper, _WordPressScraper, WP_LATEST_SEARCH,
+ xpath_class)
class Namesake(_ComicControlScraper):
@@ -108,7 +109,7 @@ class NichtLustig(_BasicScraper):
class Nicky510(_WordPressScraper):
url = 'http://www.nickyitis.com/'
- prevSearch = "//a[contains(concat(' ', @class, ' '), ' navi-prev ')]"
+ prevSearch = '//a[%s]' % xpath_class('navi-prev')
class Nimona(_BasicScraper):
diff --git a/dosagelib/plugins/o.py b/dosagelib/plugins/o.py
index 4f76ad230..2dc5ca973 100644
--- a/dosagelib/plugins/o.py
+++ b/dosagelib/plugins/o.py
@@ -10,7 +10,7 @@ from re import compile, escape
from ..scraper import _BasicScraper, _ParserScraper
from ..helpers import indirectStarter
from ..util import tagre
-from .common import _WordPressScraper
+from .common import _WordPressScraper, xpath_class
class OctopusPie(_ParserScraper):
@@ -23,17 +23,6 @@ class OctopusPie(_ParserScraper):
help = 'Index format: yyyy-mm-dd/nnn-strip-name'
-class OddFish(_BasicScraper):
- url = 'http://www.odd-fish.net/'
- rurl = escape(url)
- stripUrl = url + '%s/'
- firstStripUrl = stripUrl % 'tv-tentacles'
- imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
- prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl,
- after="navi-prev"))
- help = 'Index format: stripname'
-
-
class Oglaf(_BasicScraper):
url = 'http://oglaf.com/'
stripUrl = url + '%s/'
@@ -48,18 +37,11 @@ class Oglaf(_BasicScraper):
adult = True
-class OhJoySexToy(_BasicScraper):
+class OhJoySexToy(_WordPressScraper):
url = 'http://www.ohjoysextoy.com/'
- rurl = escape(url)
- stripUrl = url + '%s/'
- firstStripUrl = stripUrl % 'introduction'
- imageSearch = compile(tagre("div", "class", r'comicpane') + "\s*.*\s*" +
- tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
- prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl,
- after='navi navi-prev'))
- textSearch = compile(tagre("div", "class", r'comicpane') + "\s*.*\s*" +
- tagre("img", "alt", r'([^"]+)'))
- help = 'Index Format: name'
+ firstStripUrl = url + 'introduction/'
+ prevSearch = '//a[%s]' % xpath_class('navi-prev')
+ textSearch = '//div[@id="comic"]//img/@alt'
adult = True
@@ -119,16 +101,11 @@ class OnTheFastrack(_BasicScraper):
return "%s.gif" % name.title()
-class Optipess(_BasicScraper):
+class Optipess(_WordPressScraper):
url = 'http://www.optipess.com/'
- stripUrl = url + '%s'
firstStripUrl = url + '2008/12/01/jason-friend-of-the-butterflies/'
- imageSearch = compile(tagre("img", "src",
- r'(%scomics/[x|\d]+[^"]+\.[^"]+)' % url))
- prevSearch = compile(tagre("a", "href", r'([^"]+)',
- after="navi navi-prev"))
- textSearch = compile(tagre("img", "alt", r'([^"]+)', before=url))
- help = 'Index format: yyyy/mm/dd/stripname'
+ prevSearch = '//a[%s]' % xpath_class('navi-prev')
+ textSearch = '//div[@id="comic"]//img/@alt'
class OrnerBoy(_BasicScraper):
diff --git a/dosagelib/plugins/p.py b/dosagelib/plugins/p.py
index 0b3eb38fa..7d3ac392e 100755
--- a/dosagelib/plugins/p.py
+++ b/dosagelib/plugins/p.py
@@ -4,11 +4,13 @@
# Copyright (C) 2015-2016 Tobias Gruetzmacher
from __future__ import absolute_import, division, print_function
+
from re import compile, escape
+
from ..scraper import _BasicScraper, _ParserScraper
from ..helpers import bounceStarter, queryNamer, indirectStarter
from ..util import tagre
-from .common import _ComicControlScraper, _WordPressScraper
+from .common import _ComicControlScraper, _WordPressScraper, xpath_class
class PandyLand(_WordPressScraper):
@@ -40,14 +42,9 @@ class ParallelUniversum(_BasicScraper):
lang = 'de'
-class PartiallyClips(_BasicScraper):
+class PartiallyClips(_WordPressScraper):
url = 'http://partiallyclips.com/'
- rurl = escape(url)
- stripUrl = url + '%s/'
- firstStripUrl = stripUrl % '2001/10/28/screaming-woman'
- imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
- prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl, after="prev"))
- help = 'Index format: yyyy/mm/dd/stripname'
+ firstStripUrl = url + 'comic/screaming-woman/'
class PastelDefender(_BasicScraper):
@@ -252,25 +249,14 @@ class PS238(_ParserScraper):
help = 'Index format: yyyy-mm-dd'
-class PunksAndNerds(_BasicScraper):
+class PunksAndNerds(_WordPressScraper):
url = 'http://www.punksandnerds.com/'
- rurl = escape(url)
stripUrl = url + '?p=%s'
firstStripUrl = stripUrl % '15'
- imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
- prevSearch = compile(tagre("a", "href", r'(%s\?p=\d+)' % rurl,
- after="navi-prev"))
+ prevSearch = '//a[%s]' % xpath_class('navi-prev')
help = 'Index format: nnn'
-class PunksAndNerdsOld(_BasicScraper):
- url = 'http://original.punksandnerds.com/'
- stripUrl = url + 'd/%s.html'
- imageSearch = compile(r' src="(/comics/.+?)"')
- prevSearch = compile(r'>]+?>