diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py index 61cb6ccda..cd30d2338 100644 --- a/dosagelib/plugins/a.py +++ b/dosagelib/plugins/a.py @@ -148,6 +148,7 @@ class AstronomyPOTD(_BasicScraper): noImageUrls = set([ 'http://antwrp.gsfc.nasa.gov/apod/ap130217.html', # video 'http://antwrp.gsfc.nasa.gov/apod/ap130218.html', # video + 'http://antwrp.gsfc.nasa.gov/apod/ap130226.html', # video ]) prevSearch = compile(tagre("a", "href", r'(ap\d{6}\.html)') + "<") help = 'Index format: yymmdd' diff --git a/dosagelib/plugins/e.py b/dosagelib/plugins/e.py index 63071eabf..c748d0999 100644 --- a/dosagelib/plugins/e.py +++ b/dosagelib/plugins/e.py @@ -28,7 +28,7 @@ class EerieCuties(_BasicScraper): class Eriadan(_BasicScraper): url = 'http://www.shockdom.com/webcomics/eriadan/' stripUrl = url + '%s' - imageSearch = compile(tagre("img", "src", r'(http://www\.shockdom\.com/webcomics/eriadan/files/[^"]+)', after='width="800"')) + imageSearch = compile(tagre("img", "src", r'(http://www\.shockdom\.com/webcomics/eriadan/files/[^"]+)', after='width="[68]00"')) prevSearch = compile(tagre("a", "href", r'([^"]+)', after="prev")) help = 'Index format: yyyy/mm/dd/nnn (unpadded)' diff --git a/dosagelib/plugins/j.py b/dosagelib/plugins/j.py index 1825d0f5a..491142ceb 100644 --- a/dosagelib/plugins/j.py +++ b/dosagelib/plugins/j.py @@ -34,7 +34,7 @@ class JoeAndMonkey(_BasicScraper): class JohnnyWander(_BasicScraper): url = 'http://www.johnnywander.com/' stripUrl = url + 'comics/%s' - imageSearch = compile(tagre("img", "src", r'(http://www\.johnnywander\.com/files/comics/\d+\.jpg)')) + imageSearch = compile(tagre("img", "src", r'(http://www\.johnnywander\.com/files/comics/[^"]+\.jpg)')) prevSearch = compile(tagre("a", "href", r'(/comics/\d+)') + r'prev') help = 'Index format: nnn' diff --git a/dosagelib/plugins/l.py b/dosagelib/plugins/l.py index b740a785d..027f5e402 100644 --- a/dosagelib/plugins/l.py +++ b/dosagelib/plugins/l.py @@ -46,7 +46,7 @@ class LittleGamers(_BasicScraper): class LeastICouldDo(_BasicScraper): - url = 'http://leasticoulddo.com/' + url = 'http://www.leasticoulddo.com/' stripUrl = url + 'comic/%s' imageSearch = compile(tagre("img", "src", r'(http://cdn\.leasticoulddo\.com/wp-content/uploads/\d+/\d+/\d{8}\.\w{1,4})')) prevSearch = compile(tagre("a", "href", r'(http://www\.leasticoulddo\.com/comic/\d+/)', after="Previous")) diff --git a/dosagelib/plugins/o.py b/dosagelib/plugins/o.py index e34e05aff..96c44e21a 100644 --- a/dosagelib/plugins/o.py +++ b/dosagelib/plugins/o.py @@ -46,7 +46,7 @@ class OnTheEdge(_BasicScraper): class OneQuestion(_BasicScraper): - url = 'http://onequestioncomic.com/' + url = 'http://www.onequestioncomic.com/' stripUrl = url + 'comic.php?strip_id=%s' imageSearch = compile(tagre("img", "src", r'((?:\.\./)?istrip_files/strips/\d+\.jpg)')) prevSearch = compile(tagre("a", "href", r'(comic\.php\?strip_id=\d+)') + tagre("img", "src", r'img/arrow_prev\.jpg')) diff --git a/dosagelib/plugins/s.py b/dosagelib/plugins/s.py index 153b863d4..d7acf98d5 100644 --- a/dosagelib/plugins/s.py +++ b/dosagelib/plugins/s.py @@ -150,11 +150,10 @@ class SodiumEyes(_BasicScraper): class Sorcery101(_BasicScraper): - baseUrl = 'http://www.sorcery101.net/' - url = baseUrl + 'sorcery-101/' - stripUrl = baseUrl + 'sorcery101/%s/' - imageSearch = compile(tagre("img", "src", r'(http://www\.sorcery101\.net/comics/sorcery101/[^"]+)')) - prevSearch = compile(tagre("a", "href", r'(http://www\.sorcery101\.net/sorcery101/[^"]+)', after="previous-comic-link")) + url = 'http://www.sorcery101.net/sorcery-101/' + stripUrl = url + '%s/' + imageSearch = compile(tagre("img", "src", r'(http://www\.sorcery101\.net/wp-content/uploads/\d+/\d+/[^"]+)')) + prevSearch = compile(tagre("a", "href", r'(http://www\.sorcery101\.net/sorcery-101/[^"]+)', after="previous-")) help = 'Index format: stripname'