Merge branch 'master' of github.com:wummel/dosage

This commit is contained in:
Bastian Kleineidam 2014-06-08 10:07:36 +02:00
commit c528fd1822
3 changed files with 4 additions and 4 deletions

2
dosagelib/comic.py Normal file → Executable file
View file

@ -42,7 +42,7 @@ class ComicImage(object):
"""Set URL and filename.""" """Set URL and filename."""
self.name = name self.name = name
self.referrer = referrer self.referrer = referrer
self.url = url self.url = url.strip()
self.dirname = dirname self.dirname = dirname
filename = getFilename(filename) filename = getFilename(filename)
self.filename, self.ext = os.path.splitext(filename) self.filename, self.ext = os.path.splitext(filename)

View file

@ -147,7 +147,7 @@ class FoulLanguage(_BasicScraper):
url = 'http://www.fowllanguagecomics.com/' url = 'http://www.fowllanguagecomics.com/'
stripUrl = url + 'comic/%s' stripUrl = url + 'comic/%s'
firstStripUrl = stripUrl % 'part-of-the-process' firstStripUrl = stripUrl % 'part-of-the-process'
imageSearch = compile(tagre("img", "src", r'(http://i\d\.wp\.com/www\.fowllanguagecomics\.com/wp-content/uploads/\d+/\d+/[^"]+\.[a-z]+)', after="comic")) imageSearch = compile(tagre("img", "src", r'(http://i\d\.wp\.com/www\.fowllanguagecomics\.com/wp-content/uploads/\d+/\d+/[^"]+\.[a-z]+).*'))
prevSearch = compile(tagre("a", "href", r'([^"]+)', after="comic-nav-previous")) prevSearch = compile(tagre("a", "href", r'([^"]+)', after="comic-nav-previous"))
help = 'Index format: yyyy/mm/stripname' help = 'Index format: yyyy/mm/stripname'

View file

@ -465,8 +465,8 @@ class StandStillStaySilent(_BasicScraper):
rurl = escape(url) rurl = escape(url)
stripUrl = url + '?page=%s' stripUrl = url + '?page=%s'
firstStripUrl = stripUrl % '1' firstStripUrl = stripUrl % '1'
imageSearch = compile(tagre("img", "src", r"(comicpages/[^']+)", before="comicnormal", quote="'")) imageSearch = compile(tagre("img", "src", r'(comicpages/[^"]+)', before="comicnormal"))
prevSearch = compile(tagre("a", "href", r"([^']+)", quote="'") + tagre("div", "id", r'navprev', quote="'")) prevSearch = compile(tagre("a", "href", r"([^']+)", quote="'") + tagre("div", "id", r'navprev'))
help = 'Index Format: number' help = 'Index Format: number'
description = u'"Stand Still. Stay Silent" is a post-apocalyptic adventure story with a rather light tone and careless pace.' description = u'"Stand Still. Stay Silent" is a post-apocalyptic adventure story with a rather light tone and careless pace.'