diff --git a/doc/changelog.txt b/doc/changelog.txt index ffee51b25..758f322dc 100644 --- a/doc/changelog.txt +++ b/doc/changelog.txt @@ -5,7 +5,8 @@ Features: Closes: GH bug #64 Fixes: -- comics: Fixed GirlGenius, LookingForGroup +- comics: Fixed DungeonsAndDenizens, GirlGenius, GirlsWithSlingshots, + LookingForGroup, ScandinaviaAndTheWorld. Closes: GH bug #63, #66 diff --git a/dosagelib/plugins/d.py b/dosagelib/plugins/d.py index 0afba6954..0368b2d41 100644 --- a/dosagelib/plugins/d.py +++ b/dosagelib/plugins/d.py @@ -328,7 +328,7 @@ class _DumbingOfAge(_BasicScraper): class DungeonsAndDenizens(_BasicScraper): url = 'http://dungeond.com/' - stripUrl = url + '\d/\d/\d/%s/' + stripUrl = url + r'\d+/\d+/\d+/%s/' firstStripUrl = stripUrl % '08232005' imageSearch = compile(tagre("img", "src", r'(%sfiles//comics/[^"]+)' % url)) prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % url) + "Previous") diff --git a/dosagelib/plugins/g.py b/dosagelib/plugins/g.py index 2963f206f..c6ed8f69a 100644 --- a/dosagelib/plugins/g.py +++ b/dosagelib/plugins/g.py @@ -119,14 +119,14 @@ class GirlGenius(_BasicScraper): class GirlsWithSlingshots(_BasicScraper): url = 'http://www.girlswithslingshots.com/' rurl = escape(url) - stripUrl = url + 'comic/gws%s/' - firstStripUrl = stripUrl % '1' + stripUrl = url + 'comic/%s/' + firstStripUrl = stripUrl % 'gws1' imageSearch = ( compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl)), compile(tagre("img", "src", r'(http://cdn\.girlswithslingshots\.com/comics/[^"]+)')), ) prevSearch = compile(tagre("a", "href", r'(%scomic/[^"]+)' % rurl, after="prev")) - help = 'Index format: nnn' + help = 'Index format: stripname' class GlassHalfEmpty(_BasicScraper): diff --git a/dosagelib/plugins/s.py b/dosagelib/plugins/s.py index eb6ae31c7..faeb6199d 100755 --- a/dosagelib/plugins/s.py +++ b/dosagelib/plugins/s.py @@ -92,7 +92,7 @@ class ScandinaviaAndTheWorld(_BasicScraper): description = u'Scandinavia and the World' url = 'http://satwcomic.com/' rurl = escape(url) - stripUrl = url + '%s/' + stripUrl = url + '%s' firstStripUrl = stripUrl % 'sweden-denmark-and-norway' imageSearch = compile(tagre("img", "src", r'(%sart/[^"/]+)' % rurl)) prevSearch = compile(tagre("a", "href", r'(%s[^"/]+)' % rurl)+"\s*"+tagre('span', 'class', 'spritePrevious'))