Fix some comics

doc/changelog.txt

@@ -6,7 +6,8 @@ Changes:
 - documentation: Added install instructions at doc/install.txt
 
 Fixes:
-- comics: Fix DemolitionSquad.
+- comics: Fix AbstruseGoose, AxeCop, BardsWorth, DemolitionSquad.
+- comics: Remove broken ChugWorth.
 
 
 Dosage 2.11 (released 15.1.2014)

dosagelib/plugins/a.py

@@ -30,7 +30,7 @@ class AbsurdNotions(_BasicScraper):
 
 
 class AbstruseGoose(_BasicScraper):
-    url = 'http://www.abstrusegoose.com/'
+    url = 'http://abstrusegoose.com/'
     rurl = escape(url)
     starter = bounceStarter(url, compile(tagre('a', 'href', r'(%s\d+)' % rurl)+"Next »"))
     stripUrl = url + '%s'
@@ -356,12 +356,12 @@ class AxeCop(_BasicScraper):
     rurl = escape(url)
     starter = bounceStarter(url,
         (
-          compile(tagre("a", "href", r'(%scomic/page-\d+-[^"]+/)' % rurl, after="nav-next")),
-          compile(tagre("a", "href", r'(%scomic/[^"]+/)' % rurl, after="nav-next")),
+          compile(tagre("a", "href", r'(%scomic/page-\d+-[^"]+/)' % rurl, after="navi-next")),
+          compile(tagre("a", "href", r'(%scomic/[^"]+/)' % rurl, after="navi-next")),
         )
     )
     stripUrl = url + 'comic/%s/'
     firstStripUrl = stripUrl % '0'
     imageSearch = compile(tagre("img", "src", r'(http://mainsite\.axecop\.wpengine\.com/wp-content/uploads/sites/\d+/\d+/\d+/[^"]+)'))
-    prevSearch = compile(tagre("a", "href", r'(%scomic/[^"]+/)' % rurl, after="nav-prev"))
+    prevSearch = compile(tagre("a", "href", r'(%scomic/[^"]+/)' % rurl, after="navi-prev"))
     help = 'Index format: usually stripname'

dosagelib/plugins/b.py

@@ -40,11 +40,11 @@ class Bardsworth(_BasicScraper):
     description = u'Bardsworth - Magic, Mischief, and Cookies'
     url = 'http://www.bardsworth.com/'
     rurl = escape(url)
-    stripUrl = url + '?p=%s'
+    stripUrl = url + '?comic=%s'
     firstStripUrl = stripUrl % '750'
-    imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
+    imageSearch = compile(tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/[^"]+)' % rurl))
     prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl, after="prev"))
-    help = 'Index format: nnn'
+    help = 'Index format: stripname'
 
 
 class Baroquen(_BasicScraper):

dosagelib/plugins/c.py

@@ -200,24 +200,6 @@ class Chisuji(_BasicScraper):
     help = 'Index format: yyyy/mm/dd/strip-name'
 
 
-class ChugworthAcademy(_BasicScraper):
-    url = 'http://chugworth.com/'
-    stripUrl = url + '?p=%s'
-    firstStripUrl = stripUrl % '12'
-    imageSearch = compile(r'<img src="(.+?)" alt="Comic')
-    prevSearch = compile(r'<a href="(http://chugworth.com/\?p=\d{1,4})"[^>]+?title="Previous">')
-    help = 'Index format: n (unpadded)'
-
-
-class ChugworthAcademyArchive(_BasicScraper):
-    url = 'http://chugworth.com/archive/?strip_id=422'
-    stripUrl = 'http://chugworth.com/archive/?strip_id=%s'
-    firstStripUrl = stripUrl % '0'
-    imageSearch = compile(r'<img src=(comics/\d+.+?.\w{1,4})')
-    prevSearch = compile(r'<a href=\'(.+?)\'><img src=\'images/previous.gif')
-    help = 'Index format: nnn'
-
-
 class CigarroAndCerveja(_BasicScraper):
     description = u'Cigarro & Cerveja'
     url = 'http://www.cigarro.ca/'