Fix some comics.

dosagelib/plugins/b.py

@@ -162,15 +162,6 @@ class BloodBound(_BasicScraper):
     help = 'Index format: yyyy/mm/name'
 
 
-class BlueCrashKit(_BasicScraper):
-    url = 'http://robhamm.com/bluecrashkit/'
-    stripUrl = url + 'comics/blue-crash-kit/%s'
-    firstStripUrl = stripUrl % '2005-01-03'
-    imageSearch = compile(tagre("img", "src", r'(http://robhamm\.com/bluecrashkit/sites/default/files/comics/[^"]+)'))
-    prevSearch = compile(r'<li class="previous"><a href="([^"]+)">')
-    help = 'Index format: yyyy-mm-dd'
-
-
 class BMovieComic(_BasicScraper):
     description = u"A group of unlikely heroes tackles monsters, mutants and aliens from Hollywood's past and present. See what happens. Or they'll say you haven't seen it."
     url = 'http://www.bmoviecomic.com/'

dosagelib/plugins/g.py

@@ -130,19 +130,9 @@ class GleefulNihilism(_BasicScraper):
     help = 'Index format: yyyy/mm/dd/stripname'
 
 
-class Goats(_BasicScraper):
-    description = u'goats: the comic strip | by jonathan rosenberg | new comics every mon-wed-fri'
-    url = 'http://www.goats.com/'
-    stripUrl = url + 'archive/%s.html'
-    firstStripUrl = stripUrl % '970401'
-    imageSearch = compile(r'<img.+?src="(/comix/.+?)"')
-    prevSearch = compile(r'<a href="(/archive/\d{6}.html)" class="button" title="go back">')
-    help = 'Index format: yymmdd'
-
-
 class GoblinsComic(_BasicScraper):
     description = u'Goblins'
-    url = 'http://www.goblinscomic.com/'
+    url = 'http://www.goblinscomic.org/'
     rurl = escape(url)
     stripUrl = url + '%s/'
     firstStripUrl = stripUrl % '06252005'

dosagelib/plugins/k.py

@@ -29,7 +29,7 @@ class KevinAndKell(_BasicScraper):
     url = 'http://www.kevinandkell.com/'
     stripUrl = url + '%s/kk%s%s.html'
     firstStripUrl = stripUrl % ('1995', '09', '03')
-    imageSearch = compile(r'<img.+?src="(/?(\d+/)?strips/kk\d+.gif)"', IGNORECASE)
+    imageSearch = compile(r'<img.+?src="(/?(\d+/)?strips/kk\d+.(gif|jpg))"', IGNORECASE)
     prevSearch = compile(r'<a.+?href="(/?(\.\./)?\d+/kk\d+\.html)"[^>]*><span>Previous Strip', IGNORECASE)
     help = 'Index format: yyyy-mm-dd'
 

dosagelib/plugins/o.py

@@ -83,7 +83,7 @@ class OnTheEdge(_BasicScraper):
 class OnTheFasttrack(_BasicScraper):
     url = 'http://www.onthefastrack.com/'
     rurl = escape(url)
-    stripUrl = url + '/?webcomic1=%s'
+    stripUrl = url + '?webcomic1=%s'
     firstStripUrl = stripUrl % '2010-08-09'
     imageSearch = compile(tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/[^"]+-\d+-\d+\.[^"]+)' % rurl))
     prevSearch = compile(tagre("a", "href", r'(%s\?webcomic1=[^"]+)' % rurl, after="prev"))

dosagelib/plugins/r.py

@@ -21,7 +21,7 @@ class RealLife(_BasicScraper):
     stripUrl = url + 'archive/%s.html'
     firstStripUrl = stripUrl % '991115'
     imageSearch = compile(tagre("img", "src", r'(/comics/[^"]+)'))
-    prevSearch = compile(tagre("a", "href", r'(/archive/\d+.html)') + tagre("img", "src", r'/images/nav_prev\.png'))
+    prevSearch = compile(tagre("a", "href", r'(/comic\.php\?[^"]+)', after="nav-previous"))
     help = 'Index format: yymmdd)'
 
 

dosagelib/plugins/s.py

@@ -184,10 +184,11 @@ class _ShadowGirls(_BasicScraper):
 class Sheldon(_BasicScraper):
     description = u'The story of a software company tycoon billionaire ten-year-old, his grampa, his duck, his pug and a lizard.'
     url = 'http://www.sheldoncomics.com/'
+    rurl = escape(url)
     stripUrl = url + 'archive/%s.html'
     firstStripUrl = stripUrl % '011130'
-    imageSearch = compile(tagre("img", "src", r'(/strips/[^"]+)'))
+    imageSearch = compile(tagre("img", "src", r'(http://cdn\.sheldoncomics\.com/strips/[^"]+)'))
-    prevSearch = compile(tagre("a", "href", r'(/archive/\d+\.html)', after="sidenav-prev"))
+    prevSearch = compile(tagre("a", "href", r'(%sarchive/\d+\.html)' % rurl, after="sidenav-prev"))
     help = 'Index format: yymmdd'