Fix another set of modules (e, k).

This commit is contained in:
Tobias Gruetzmacher 2017-05-17 00:11:29 +02:00
parent 4ee99eb196
commit 1400879dc8
3 changed files with 16 additions and 48 deletions

View file

@ -15,16 +15,10 @@ from .common import _WordPressScraper, WP_LATEST_SEARCH
class EarthsongSaga(_ParserScraper):
url = 'http://earthsongsaga.com/index.php'
starter = indirectStarter
url = 'http://earthsongsaga.com/vol5/epilogue5.php'
imageSearch = '//div[@id="comic"]//img'
prevSearch = '//a[@title="Previous"]'
latestSearch = '//div[@id="leftmenu"]/span[1]/a[1]'
def fetchUrls(self, url, data, urlSearch):
urls = super(EarthsongSaga, self).fetchUrls(url, data, urlSearch)
return [x.replace('earthsongsaga.com/../',
'earthsongsaga.com/') for x in urls]
endOfLife = True
def namer(self, image_url, page_url):
imgmatch = compile(r'images/vol(\d+)/ch(\d+)/(.*)\.\w+$',
@ -71,14 +65,6 @@ class EdmundFinney(_WordPressScraper):
prevSearch = '//a[%s]' % xpath_class('navi-prev')
class EerieCuties(_BasicScraper):
url = 'http://www.eeriecuties.com/'
stripUrl = url + 'strips-ec/%s'
imageSearch = compile(tagre("img", "src", r'(http://ace\.eeriecuties\.com/comics/[^"]+)'))
prevSearch = compile(tagre("a", "href", r'([^"]+)', before="prev"))
help = 'Index format: stripname'
class ElfOnlyInn(_BasicScraper):
url = 'http://www.elfonlyinn.net/'
stripUrl = url + 'd/%s.html'
@ -139,23 +125,17 @@ class Eryl(_WordPressScraper):
starter = indirectStarter
class EverybodyLovesEricRaymond(_BasicScraper):
class EverybodyLovesEricRaymond(_ParserScraper):
url = 'http://geekz.co.uk/lovesraymond/'
stripUrl = url + 'archive/%s'
firstStripUrl = stripUrl % 'slashdotted'
imageSearch = compile(r'<img src="((?:http://geekz.co.uk)?/lovesraymond/wp-content(?:/images)/ep\d+\w?\.jpg)"', IGNORECASE)
prevSearch = compile(r'&laquo; <a href="(http://geekz.co.uk/lovesraymond/archive/[^/"]*)">')
help = 'Index format: name-of-old-comic'
firstStripUrl = url + 'archive/slashdotted'
imageSearch = '//div[%s]//img' % xpath_class('entry-content')
prevSearch = '//a[@rel="prev"]'
# Seems to be GeoBlocked from Europe?
class EvilDiva(_BasicScraper):
# Seems to be GeoBlocked from Germany?
class EvilDiva(_WordPressScraper):
url = 'http://www.evildivacomics.com/'
stripUrl = url + '?p=%s'
firstStripUrl = stripUrl % '145'
imageSearch = compile(r'(/comics/.+?)"')
prevSearch = compile(r'http.+?com/(.+?)".+?"prev')
help = 'Index format: n (unpadded)'
firstStripUrl = url + 'comic/evil-diva-issue-1-cover/'
class EvilInc(_WordPressScraper):
@ -173,14 +153,12 @@ class Evilish(_ParserScraper):
help = 'Index format: yyyymmdd'
class Exiern(_BasicScraper):
class Exiern(_WordPressScraper):
url = 'http://www.exiern.com/'
rurl = escape(url)
stripUrl = url + '%s/'
firstStripUrl = stripUrl % '2005/09/06/so-far'
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 + '2005/09/06/so-far/'
imageSearch = ('//div[@id="comic"]//img',
'//div[%s]//img' % xpath_class('entry'))
prevSearch = '//a[%s]' % xpath_class('navi-prev')
class ExploitationNow(_WordPressScraper):

View file

@ -56,18 +56,6 @@ class Krakow(_BasicScraper):
help = 'Index format: yyyymmdd'
class Kukuburi(_BasicScraper):
baseUrl = 'http://www.kukuburi.com/'
url = baseUrl + 'current/'
stripUrl = baseUrl + 'v2/%s/'
firstStripUrl = stripUrl % '2007/08/09/one'
imageSearch = compile(
tagre("img", "src", r'(http://www\.kukuburi\.com/v2/comics/[^"]+)',
after='alt="[^"]'))
prevSearch = compile(r'nav-previous.+?"(http.+?)"')
help = 'Index format: yyyy/mm/dd/stripname'
class KuroShouri(_BasicScraper):
url = 'http://kuroshouri.com/'
rurl = escape(url)

View file

@ -205,6 +205,7 @@ class Removed(Scraper):
cls('DeathToTheExtremist'),
cls('DoctorCat', 'brk'),
cls('DungeonsAndDenizens'),
cls('EerieCuties'),
cls('Ellerbisms'),
cls('Eriadan'),
cls('EverydayBlues'),
@ -378,6 +379,7 @@ class Removed(Scraper):
cls('KeenSpot/AntiheroForHire', 'mov'),
cls('Key'),
cls('KillerKomics'),
cls('Kukuburi'),
cls('Lint'),
cls('LinuxComFridayFunnies'),
cls('NekkoAndJoruba'),