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

dosagelib/comic.py

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

dosagelib/plugins/f.py

@@ -147,7 +147,7 @@ class FoulLanguage(_BasicScraper):
     url = 'http://www.fowllanguagecomics.com/'
     stripUrl = url + 'comic/%s'
     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"))
     help = 'Index format: yyyy/mm/stripname'
 

dosagelib/plugins/s.py

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