Merge lp:~dosage-dev/dosage/bunch-of-comics-2 into lp:~dosage-dev/dosage/old

[Tristan Seligmann]

[lp:~dosage-dev/dosage/bunch-of-comics-2]

647. By Tristan Seligmann on 2010-01-07

Use inheritance instead of make for static variations.

[Jonathan Jacobs (jjacobs)]

review: Approve

=== modified file 'dosage/comic.py'
--- dosage/comic.py	2009-12-15 06:55:27 +0000
+++ dosage/comic.py	2010-01-07 02:09:17 +0000
@@ -7,15 +7,20 @@
 locale.setlocale(locale.LC_ALL, '')
 
 from dosage.output import out
-from dosage.util import urlopen, saneDataSize
+from dosage.util import urlopen, saneDataSize, normaliseURL
 from dosage.progress import progressBar, OperationComplete
 from dosage.events import handler
 
+
+
 class FetchComicError(IOError): pass
 
+
+
 class Comic(object):
     def __init__(self, moduleName, url, referrer=None, filename=None):
         self.moduleName = moduleName
+        url = normaliseURL(url)
 
         out.write('Getting headers for %s...' % (url,), 2)
         try:
@@ -86,7 +91,7 @@
                 speed = saneDataSize(size / (endTime - startTime))
             else:
                 speed = '???'
-            out.write('Saved "%(fn)s" (%(bytes)s bytes, %(speed)s/sec).' % locals(), 1)
+            out.write('Saved "%s" (%s bytes, %s/sec).' % (fn, bytes, speed), 1)
             handler.comicDownloaded(self.moduleName, fn)
             self.urlobj.close()
         finally:

=== modified file 'dosage/mainline.py'
--- dosage/mainline.py	2009-12-15 06:55:27 +0000
+++ dosage/mainline.py	2010-01-07 02:09:17 +0000
@@ -55,6 +55,8 @@
     def safeOp(self, fp, *args, **kwargs):
         try:
             fp(*args, **kwargs)
+        except KeyboardInterrupt:
+            raise
         except:
             type, value, tb = sys.exc_info()
             out.write('Traceback (most recent call last):', 1)
@@ -209,7 +211,10 @@
     parser = setupOptions()
     options, args = parser.parse_args()
     d = Dosage()
-    d.run(options.__dict__, args)
+    try:
+        d.run(options.__dict__, args)
+    except KeyboardInterrupt:
+        pass
 
 if __name__ == '__main__':
     main()

=== modified file 'dosage/plugins/a.py'
--- dosage/plugins/a.py	2010-01-04 20:12:43 +0000
+++ dosage/plugins/a.py	2010-01-07 02:09:17 +0000
@@ -15,8 +15,8 @@
 class ASofterWorld(BasicScraper):
     latestUrl = 'http://www.asofterworld.com/'
     imageUrl = 'http://www.asofterworld.com/index.php?id=%s'
-    imageSearch = compile(r'<img src="(http://www.asofterworld.com/clean/.*?)"')
-    prevSearch = compile(r'"(.*?)">.*?back')
+    imageSearch = compile(r'<img src="(http://www.asofterworld.com/clean/[^"]+)"')
+    prevSearch = compile(r'"([^"]+)">back')
     help = 'Index format: n (unpadded)'
 
 
@@ -45,11 +45,27 @@
 
 
 class AbsurdNotions(BasicScraper):
-    latestUrl = 'http://www.absurdnotions.org/'
+    latestUrl = 'http://www.absurdnotions.org/page129.html'
     imageUrl = 'http://www.absurdnotions.org/page%s.html'
-    imageSearch = compile(r'<IMG SRC="(an\d+.?\..+?)"')
-    prevSearch = compile(r'<A.*?HREF="(page\d+\.html)"><img SRC="nprev\.gif"')
-    help = 'Index format: n (unpadded)'
+    imageSearch = compile(r'<IMG SRC="(an[^"]+)"')
+    prevSearch = compile(r'HREF="([^"]+)"><IMG SRC="nprev\.gif"')
+    help = 'Index format: n (unpadded)'
+
+
+
+class AbstruseGoose(BasicScraper):
+    starter = bounceStarter('http://abstrusegoose.com/',
+                            compile(r'<a href = "(http://abstrusegoose.com/\d+)">Next &raquo;</a>'))
+    imageUrl = 'http://abstrusegoose.com/c%s.html'
+    imageSearch = compile(r'<img[^<]+src="(http://abstrusegoose.com/strips/[^<>"]+)"')
+    prevSearch = compile(r'<a href = "(http://abstrusegoose.com/\d+)">&laquo; Previous</a>')
+    help = 'Index format: n (unpadded)'
+
+    def namer(cls, imageUrl, pageUrl):
+        index = int(pageUrl.rstrip('/').split('/')[-1])
+        name = imageUrl.split('/')[-1].split('.')[0]
+        return 'c%03d-%s' % (index, name)
+
 
 
 class AcademyVale(BasicScraper):
@@ -81,19 +97,27 @@
 
 
 class Altermeta(BasicScraper):
-    latestUrl = 'http://www.altermeta.com/'
-    imageUrl = 'http://www.altermeta.com/index.php?PS=viewComic.php&comic=%s'
-    imageSearch = compile(r'<img.+?src="(comics/\d+_\d+\..+?)"')
-    prevSearch = compile(r'<a href="(index\.php\?PS=viewComic\.php&comic=\d+)">Previous')
+    latestUrl = 'http://altermeta.net/'
+    imageUrl = 'http://altermeta.net/archive.php?comic=%s&view=showfiller'
+    imageSearch = compile(r'<img src="(comics/[^"]+)" />')
+    prevSearch = compile(r'<a href="([^"]+)"><img src="http://altermeta\.net/template/default/images/sasha/back\.png')
     help = 'Index format: n (unpadded)'
 
 
+
+class AltermetaOld(Altermeta):
+    name = 'Altermeta/Old'
+    latestUrl = 'http://altermeta.net/oldarchive/index.php'
+    imageUrl = 'http://altermeta.net/oldarchive/archive.php?comic=%s'
+    prevSearch = compile(r'<a href="([^"]+)">Back')
+
+
+
 class Angels2200(BasicScraper):
-    latestUrl = 'http://peter.haynes.iconz.co.nz/'
-    imageUrl = 'http://peter.haynes.iconz.co.nz/Default.asp?ID=%s'
-    imageSearch = compile(r'(/archives/.+?)"')
-    prevSearch = compile(r'(/Default.asp\?ID=\d+?)".+previous.jpg')
-    help = 'Index format: nnn'
+    latestUrl = 'http://www.janahoffmann.com/angels/'
+    imageSearch = compile(r"<img src='(http://www.janahoffmann.com/angels/comics/[^']+)'>")
+    prevSearch = compile(r'<a href="([^"]+)">&laquo; Previous</a>')
+
 
 
 class AnimeArcadia(BasicScraper):
@@ -149,3 +173,12 @@
     def namer(cls, imageUrl, pageUrl):
         return '%s-%s' % (pageUrl.split('/')[-1].split('.')[0][2:],
                           imageUrl.split('/')[-1].split('.')[0])
+
+
+
+class AfterStrife(BasicScraper):
+    latestUrl = 'http://afterstrife.com/?p=262'
+    imageUrl = 'http://afterstrife.com/?p=%s'
+    imageSearch = compile(r'<img src="(http://afterstrife.com/strips/.+?)"')
+    prevSearch = compile(r'<a href="(.+?)" class="navi navi-prev"')
+    help = 'Index format: nnn'

=== modified file 'dosage/plugins/b.py'
--- dosage/plugins/b.py	2010-01-04 20:12:43 +0000
+++ dosage/plugins/b.py	2010-01-07 02:09:17 +0000
@@ -119,14 +119,16 @@
     help = 'Index format: yyyy-mm-dd'
 
 
+
 class BoyOnAStickAndSlither(BasicScraper):
     latestUrl = 'http://www.boasas.com/'
     imageUrl = 'http://www.boasas.com/?c=%s'
     imageSearch = compile(r'"(boasas/\d+\..+?)"')
-    prevSearch = compile(r'<a href="(.*?)">.*?arrow_left')
+    prevSearch = compile(r'<a href="(.+?)"><img src="images/left_20.png"')
     help = 'Index format: n (unpadded)'
 
 
+
 class ButternutSquash(BasicScraper):
     latestUrl = 'http://www.butternutsquash.net/assets/pages/bns-current.html'
     imageUrl = 'http://www.butternutsquash.net/assets/pages/bns-comic%s.html'

=== modified file 'dosage/plugins/c.py'
--- dosage/plugins/c.py	2010-01-05 23:26:58 +0000
+++ dosage/plugins/c.py	2010-01-07 02:09:17 +0000
@@ -13,22 +13,25 @@
     help = 'Index format: nnnnnn'
 
 
+
 class CaptainSNES(BasicScraper):
     latestUrl = 'http://captainsnes.com/'
     imageUrl = 'http://captainsnes.com/?date=%s'
-    imageSearch = compile(r'<img src="(Archive/.+?)"')
-    prevSearch = compile(r'<a href="(\?date=\d+?)"><img border="0" src="images/previous_day.gif"')
+    imageSearch = compile(r'<img src=\'(http://www.captainsnes.com/comics/.+?)\'')
+    prevSearch = compile(r'<a href="http://www.captainsnes.com/(.+?)"><span class="prev">')
     help = 'Index format: yyyymmdd'
 
 
+
 class CaribbeanBlue(BasicScraper):
-    latestUrl = 'http://www.katbox.net/cblueen/'
-    imageUrl = 'http://www.katbox.net/cblueen/index.php?strip_id=%s'
+    latestUrl = 'http://cblue.katbox.net/'
+    imageUrl = 'http://cblue.katbox.net/index.php?strip_id=%s'
     imageSearch = compile(r'="(.+?strips/.+?)"')
-    prevSearch = compile(r'(index.php\?strip_id=.+?)".+?navigation_back')
+    prevSearch = compile(r'<a href="(.+?)"><img src="images/navigation_back.png"')
     help = 'Index format: n (unpadded)'
 
 
+
 class Catena(BasicScraper):
     latestUrl = 'http://catenamanor.com/'
     imageUrl = 'http://catenamanor.com/index.php?comic=%s'
@@ -45,14 +48,16 @@
     help = 'Index format: yymmdd-<your guess>.html'
 
 
+
 class ChasingTheSunset(BasicScraper):
     latestUrl = 'http://www.fantasycomic.com/'
     imageUrl = 'http://www.fantasycomic.com/index.php?p=c%s'
     imageSearch = compile(r'(/cmsimg/.+?)".+?comic-img')
-    prevSearch = compile(r'(/index.php\?p=.+?)".+?cn-prev')
+    prevSearch = compile(r'<a href="(.+?)" title="" ><img src="(images/eye-prev.png|images/cn-prev.png)"')
     help = 'Index format: n'
 
 
+
 class Chisuji(BasicScraper):
     latestUrl = 'http://www.chisuji.com/'
     imageUrl = 'http://www.chisuji.com/index.php?id=%s'
@@ -69,22 +74,34 @@
     help = 'Index format: n (unpadded)'
 
 
+
 class ChugworthAcademy(BasicScraper):
     latestUrl = 'http://chugworth.com/'
-    imageUrl = 'http://chugworth.com/?strip_id=%s'
-    imageSearch = compile(r"<img src=(comics/\d+\..+?) width=\"700\" height=\"350\">")
-    prevSearch = compile(r"<a href=\'(\?strip_id=\d+)\'><img src=\'images/previous\.gif\'")
+    imageUrl = 'http://chugworth.com/?p=%s'
+    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):
+    latestUrl = 'http://chugworth.com/archive/?strip_id=422'
+    imageUrl = 'http://chugworth.com/archive/?strip_id=%s'
+    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 CombustibleOrange(BasicScraper):
     latestUrl = 'http://www.combustibleorange.com/'
     imageUrl = 'http://www.combustibleorange.com/index.php?current=%s'
     imageSearch = compile(r'<img src="(/images/comics/\d+?\.gif)"')
-    prevSearch = compile(r'<a href="(index.php\?current=\d+?)"><img src="images/button_toplast.gif" border="0">')
+    prevSearch = compile(r'><a href="(.+?)"><img src="images/button-last.gif" border="0">')
     help = 'Index format: n (unpadded)'
 
 
+
 class Comedity(BasicScraper):
     latestUrl = 'http://www.comedity.com/'
     imageUrl = 'http://www.comedity.com/index.php?strip_id=%s'
@@ -101,14 +118,16 @@
     help = 'Index format: n (unpadded)'
 
 
+
 class Commissioned(BasicScraper):
     latestUrl = 'http://www.commissionedcomic.com/'
     imageUrl = 'http://www.commissionedcomic.com/index.php?strip=%s'
-    imageSearch = compile(r'<img src="(strips/.+?)">')
-    prevSearch = compile(r'<a href="(index.php\?strip=.+?)".+?arr-prev')
+    imageSearch = compile(r'<img src="(http://www.commissionedcomic.com/comics/.+?)"')
+    prevSearch = compile(r'<a href="(.+?)">&lsaquo;</a>')
     help = 'Index format: n'
 
 
+
 class CoolCatStudio(BasicScraper):
     latestUrl = 'http://www.coolcatstudio.com/'
     imageUrl = 'http://www.coolcatstudio.com/index.php?p=%s'
@@ -117,29 +136,42 @@
     help = 'Index format: n'
 
 
+
 class CourtingDisaster(BasicScraper):
     latestUrl = 'http://www.courting-disaster.com/'
-    imageUrl = 'http://www.courting-disaster.com/d/%s'
+    imageUrl = 'http://www.courting-disaster.com/archive/%s.html'
     imageSearch = compile(r'(/comics/.+?)"')
-    prevSearch = compile(r'first_day.gif"></a> <a href="(.+?)"')
-    help = 'Index format: yyyymmdd.html'
+    prevSearch = compile(r'</a><a href="(.+?)"><img src="/images/previous.gif"[^>]+?>')
+    help = 'Index format: yyyymmdd'
+
 
 
 class CrapIDrewOnMyLunchBreak(BasicScraper):
     latestUrl = 'http://crap.jinwicked.com/'
-    imageUrl = 'http://crap.jinwicked.com/imgs/comics/%s'
-    imageSearch = compile(r'<img src="(imgs/comics/.+?)"')
-    prevSearch = compile(r'<a href=\'(\?comic\=.*?)\'><img src="imgs/oldercrap.jpg"')
-    help = 'Index format: yyyymmdd'
+    imageUrl = 'http://crap.jinwicked.com/%s'
+    imageSearch = compile(r'<img src="(http://crap.jinwicked.com/comics/.+?)"')
+    prevSearch = compile(r'<a href="(.+?)"><img src="http://comics.jinwicked.com/images/navigation_back.png"')
+    help = 'Index format: yyyy/mm/dd/name'
+
 
 
 class CtrlAltDel(BasicScraper):
-    latestUrl = 'http://www.ctrlaltdel-online.com/comic.php'
-    imageUrl = 'http://www.ctrlaltdel-online.com/comic.php?d=%s'
-    imageSearch = compile(r'<img src="(/comics/\d{8}\..+?)"')
-    prevSearch = compile(r'<a href="(/comic.php\?d=\d{8})"><img src="/_common/images/comicnav/back1.jpg"')
+    latestUrl = 'http://www.cad-comic.com/cad/'
+    imageSearch = compile(r'<img src="(/comics/\w+/\d{8}\..+?)"')
+    prevSearch = compile(r'<a href="(/\w+/\d{8})" class="nav-back')
     help = 'Index format: yyyymmdd'
 
+    @property
+    def imageUrl(self):
+        return self.latestUrl + '%s'
+
+
+
+class CtrlAltDelSillies(CtrlAltDel):
+    name = 'CtrlAltDel/Sillies'
+    latestUrl = 'http://www.cad-comic.com/sillies/'
+
+
 
 def cloneManga(name, shortName, lastStrip=None):
     baseUrl = 'http://manga.clone-army.org/%s.php' % (shortName,)
@@ -173,16 +205,10 @@
 
 class CatAndGirl(BasicScraper):
     latestUrl = 'http://catandgirl.com/'
-    imageUrl = 'http://catandgirl.com/view.php?loc=%s'
-    imageSearch = compile(r'<img src="((?:http://catandgirl.com/)?archive/[^"\n]+)')
-    prevSearch = compile(r'<a href="(view.php\?loc=\d+)"><img src="arrow_left.gif"')
-    help = 'Index format: n'
-
-    def namer(cls, imageUrl, pageUrl):
-        filename = imageUrl.split('/')[-1].split('.')[0]
-        assert filename.startswith('cg')
-        index = int(filename[2:6])
-        return '%03d-%s' % (index, filename[6:])
+    imageUrl = 'http://catandgirl.com/?p=%s'
+    imageSearch = compile(r'<img src="(http://catandgirl.com/archive/.+?)"')
+    prevSearch = compile(r'\s+<a href="(.+?)">&#9668; Previous</a>')
+    help = 'Index format: n (unpadded)'
 
 
 def comicsDotCom(name, section):

=== modified file 'dosage/plugins/d.py'
--- dosage/plugins/d.py	2009-12-15 06:55:27 +0000
+++ dosage/plugins/d.py	2010-01-07 02:09:17 +0000
@@ -52,22 +52,25 @@
     help = 'Index format: yyyy-mm-dd'
 
 
+
 class DrFun(BasicScraper):
-    latestUrl = 'http://www.ibiblio.org/Dave/this-week.html'
-    imageUrl = 'http://www.ibiblio.org/Dave/this-week.html'
-    imageSearch = compile(r'<A HREF=\s?"(Dr-Fun/df\d{6}/df\d{8}\.jpg)">')
-    prevSearch = compile(r'<a href="(ar\d+.htm)#banner">Previous Week,\s?<\/A>')
-    help = 'Index format: yyyymmdd'
+    latestUrl = 'http://www.ibiblio.org/Dave/ar00502.htm'
+    imageUrl = 'http://www.ibiblio.org/Dave/ar%s.htm'
+    imageSearch = compile(r'<A HREF= "(Dr-Fun/df\d{6}/df.+?)">')
+    prevSearch = compile(r'<A HREF="(.+?)">Previous Week,')
+    help = 'Index format: nnnnn'
+
 
 
 class Dracula(BasicScraper):
-    latestUrl = 'http://www.coyotepuck.dragoncity.net/dracula/index.php'
-    imageUrl = 'http://www.coyotepuck.dragoncity.net/dracula/index.php?p=%s'
-    imageSearch = compile(r'"(story/.+?)"')
-    prevSearch = compile(r'(index.php\?p=.+?)">.+?back')
+    latestUrl = 'http://draculacomic.net/'
+    imageUrl = 'http://draculacomic.net/comic.php?comicID=%s'
+    imageSearch = compile(r'<img src="(comics/.+?)"')
+    prevSearch = compile(r'&nbsp;<a class="archivelink" href="(.+?)">&laquo; Prev</a>')
     help = 'Index format: nnn'
 
 
+
 class DragonTails(BasicScraper):
     latestUrl = 'http://www.dragon-tails.com/'
     imageUrl = 'http://www.dragon-tails.com/archive.php?date=%s'

=== modified file 'dosage/plugins/e.py'
--- dosage/plugins/e.py	2009-12-15 06:55:27 +0000
+++ dosage/plugins/e.py	2010-01-07 02:09:17 +0000
@@ -20,6 +20,7 @@
     help = 'Index format: mmddyyyy or name'
 
 
+
 class ElGoonishShive(BasicScraper):
     name = 'KeenSpot/ElGoonishShive'
     latestUrl = 'http://www.egscomics.com/'
@@ -29,14 +30,26 @@
     help = 'Index format: yyyy-mm-dd'
 
 
+
+class ElGoonishShiveNP(BasicScraper):
+    name = 'KeenSpot/ElGoonishShiveNP'
+    latestUrl = 'http://www.egscomics.com/egsnp/'
+    imageUrl = 'http://www.egscomics.com/egsnp/?date=%s'
+    imageSearch = compile(r'<div class=\'comic2\'><img src=\'(comics/\d{4}/\d{2}.+?)\'')
+    prevSearch = compile(r'<a href=\'(.+?)\'[^>]+?onmouseover=\'\$\("navimg(6|2)"\)')
+    help = 'Index format: yyyy-mm-dd'
+
+
+
 class ElsieHooper(BasicScraper):
     latestUrl = 'http://www.elsiehooper.com/todaysserial.htm'
     imageUrl = 'http://www.elsiehooper.com/comics/comic%s.htm'
-    imageSearch = compile(r'<img\s+?src="(/comics/elsieh\d{3}\w+\.\w{3}|/images/.+?_cover.+?)"')
-    prevSearch = compile(r'<a href="(.+?)"><img.+?src="/images/previous.gif"')
+    imageSearch = compile(r'<img src="(/comics_/.+?)">')
+    prevSearch = compile(r'<A href="(.+?)"><IMG (height=27 src="/images/previous.gif"|src="/images/previous.gif")', IGNORECASE)
     help = 'Index format: nnn'
 
 
+
 class EmergencyExit(BasicScraper):
     latestUrl = 'http://www.eecomics.net/'
     imageUrl = ''
@@ -53,14 +66,16 @@
     help = 'Index format: nnn (unpadded)'
 
 
+
 class ErrantStory(BasicScraper):
     latestUrl = 'http://www.errantstory.com/'
     imageUrl = 'http://www.errantstory.com/archive.php?date=%s'
     imageSearch = compile(r'<img[^>]+?src="([^"]*?comics/.+?)"')
-    prevSearch = compile(r'"(comic.php.+?)" title.+?content_button_back.gif')
+    prevSearch = compile(r'><a href="(.+?)">&lt;Previous</a>')
     help = 'Index format: yyyy-mm-dd'
 
 
+
 class EternalVenture(BasicScraper):
     latestUrl = 'http://pulledpunches.com/index2.php'
     imageUrl = 'http://pulledpunches.com/archive.php?date=%s.jpg'

=== modified file 'dosage/plugins/f.py'
--- dosage/plugins/f.py	2009-12-15 06:55:27 +0000
+++ dosage/plugins/f.py	2010-01-07 02:09:17 +0000
@@ -28,20 +28,23 @@
                               compile(r'(comic/page.php\?id.+?)"'))
 
 
+
 class FightCastOrEvade(BasicScraper):
     latestUrl = 'http://www.fightcastorevade.net/'
     imageUrl = 'http://www.fightcastorevade.net/d/%s'
-    imageSearch = compile(r'"(.+?/comics/.+?)"')
+    imageSearch = compile(r'<img src="(http://www.fightcastorevade.net/comics/.+?)"')
     prevSearch = compile(r'"(.+?/d/.+?)".+?previous')
     help = 'Index format: yyyymmdd.html'
 
 
+
 class FilibusterCartoons(BasicScraper):
     latestUrl = 'http://www.filibustercartoons.com/'
-    imageUrl = 'http://www.filibustercartoons.com/archive?id=%s'
-    imageSearch = compile(r'<img src="(comics/\d{8}\..+?)"')
-    prevSearch = compile(r'<a href="(archive.php\?id=\d{8})".+?\'images/comic_nav_prev_2.gif\'')
-    help = 'Index format: n (unpadded)'
+    imageUrl = 'http://www.filibustercartoons.com/index.php/%s'
+    imageSearch = compile(r'<img src="(http://www.filibustercartoons.com/comics/.+?)"')
+    prevSearch = compile(r'<a href="(.+?)"><img src=\'(.+?/arrow-left.gif)\'')
+    help = 'Index format: yyyy/mm/dd/name'
+
 
 
 class FlakyPastry(BasicScraper):
@@ -69,20 +72,23 @@
     help = 'Index format: n (unpadded)'
 
 
+
 class FragileGravity(BasicScraper):
     latestUrl = 'http://www.fragilegravity.com/'
     imageUrl = 'http://www.fragilegravity.com/core.php?archive=%s'
-    imageSearch = compile(r'<img src="(strips/\d{8}\..+?)"')
-    prevSearch = compile(r'<a href="(core.php\?archive=\d{8})"\nonmouseover="window.status=\'Previous Strip.+?\'; return true"')
+    imageSearch = compile(r'<IMG SRC="(strips/.+?)"')
+    prevSearch = compile(r'<A HREF="(.+?)"\nonMouseover="window.status=\'Previous Strip', MULTILINE | IGNORECASE)
     help = 'Index format: yyyymmdd'
 
 
+
 class Freefall(BasicScraper):
     latestUrl = 'http://freefall.purrsia.com/default.htm'
-    imageUrl = 'http://freefall.purrsia.com/ff1100/fv%s.htm'
-    imageSearch = compile(r'<img src="(/ff\d{3}\d?/fv\d{5}\..+?)"')
-    prevSearch = compile(r'<a href="(/ff\d{3}\d?/fv\d{5}\.htm)">Previous')
-    help = 'Index format: nnnnn'
+    imageUrl = 'http://freefall.purrsia.com/ff%s/fc%s.htm'
+    imageSearch = compile(r'<img src="(/ff\d+/.+?.\w{3,4})"')
+    prevSearch = compile(r'<A HREF="(/ff\d+/.+?.htm)">Previous</A>')
+    help = 'Index format: nnnn/nnnnn'
+
 
 
 class Frump(PHPScraper):
@@ -90,18 +96,15 @@
     prevSearch = compile(r'<a href="(http://thm\.askee\.net/comic/daily\.php\?date=\d{6})">Previous', IGNORECASE)
 
 
+
 class FantasyRealms(BasicScraper):
-    # This module may not get the latest comic, since the front page references to
-    # the first page of the last update. If an update consists of multiple pages,
-    # only the first one is fetched, the others are fetched on the next
-    # update...
-
-    imageUrl = 'http://www.fantasyrealmsonline.com/manga/%s.html'
-    imageSearch = compile(r'<div align="center"><a href="[^"]+\.html"><img src="(\w+\.jpg)"')
-    prevSearch = compile(r'<a href="([^"]+\.html)"><img src="\.\./\.\./images/nav-back')
-    help = 'Index format: ii/pp (issue/page)'
+    imageUrl = 'http://www.fantasyrealmsonline.com/manga/%s.php'
+    imageSearch = compile(r'<img src="(\d{1,4}.\w{3,4})" width="540"', IGNORECASE)
+    prevSearch = compile(r'<a href="(.+?)"><img src="../images/nav-back.gif"', IGNORECASE)
+    help = 'Index format: nnn'
     starter = indirectStarter('http://www.fantasyrealmsonline.com/',
-                              compile(r'<a href = "(manga/\d+/\w+\.html)"><img src="latest\.jpg"'))
+                              compile(r'<a href="(manga/.+?)"><img src="preview.jpg"', IGNORECASE))
+
 
 
 class FullFrontalNerdity(BasicScraper):
@@ -119,17 +122,29 @@
     help = 'Index format: n (unpadded)'
 
 
+
 class Fallen(BasicScraper):
     imageUrl = 'http://www.fallencomic.com/pages/part%s/%s-p%s.htm'
-    imageSearch = compile(r'<IMG SRC="(page/\d+-p\d+\..+?)"', IGNORECASE)
-    prevSearch = compile(r'<A HREF="(\d+-p\d+.htm)"><FONT FACE="Courier">Back', IGNORECASE)
+    imageSearch = compile(r'<IMG SRC="(page/.+?)"', IGNORECASE)
+    prevSearch = compile(r'<A HREF="(.+?)"><FONT FACE="Courier">Back', IGNORECASE)
     help = 'Index format: nn-m (comicNumber-partNumber)'
     starter = indirectStarter('http://www.fallencomic.com/fal-page.htm',
                               compile(r'\(NEW \d{2}/\d{2}/\d{2}\)\s*\n*\s*<a href="(pages/part\d+/\d+-p\d+\.htm)">\d+</a>', MULTILINE))
 
     def namer(cls, imageUrl, pageUrl):
-        return imageUrl.split('/')[-1].split('.')[0]
+        num = pageUrl.split('/')[-1].split('-')[0]
+        part = pageUrl.split('-')[-1].split('.')[0]
+        return '%s-%s' % (part, num)
 
     def setStrip(self, index):
         index, part = index.split('-')
         self.currentUrl = self.imageUrl % (part, index, part)
+
+
+
+class FoxTails(BasicScraper):
+    latestUrl = 'http://www.magickitsune.com/strips/current.html'
+    imageUrl = 'http://www.magickitsune.com/strips/%s'
+    imageSearch = compile(r'<img src=(img/.+?)[ |>]', IGNORECASE)
+    prevSearch = compile(r'(?<=first.gif)*(?<=</td>)*<a.*href=\'(.+?)\'.+?<img.+?src=\'../img/prev.gif\'>', IGNORECASE)
+    help = 'Index format: yyyymmdd'

=== modified file 'dosage/plugins/g.py'
--- dosage/plugins/g.py	2010-01-04 20:12:43 +0000
+++ dosage/plugins/g.py	2010-01-07 02:09:17 +0000
@@ -1,6 +1,6 @@
 from re import compile
 
-from dosage.helpers import BasicScraper
+from dosage.helpers import BasicScraper, indirectStarter
 
 
 class Galaxion(BasicScraper):
@@ -27,12 +27,14 @@
     help = 'Index format: yyyymmdd'
 
 
+
 class GenrezvousPoint(BasicScraper):
-    latestUrl = 'http://www.iccomics.com/chapters/genrezvouspoint/index.php?id=120'
-    imageUrl = 'http://www.iccomics.com/chapters/genrezvouspoint/index.php?id=%s'
-    imageSearch = compile(r'src="(.*?gp-comics/.*?)"')
-    prevSearch = compile(r'</a><a href="(.+?index.php\?id=.*?)".*?navbar_03')
-    help = 'Index format: n (unpadded)'
+    latestUrl = 'http://genrezvouspoint.com/'
+    imageUrl = 'http://genrezvouspoint.com/index.php?comicID=%s'
+    imageSearch = compile(r'<img src=\'(comics/.+?)\'')
+    prevSearch = compile(r' <a[^>]+?href="(.+?)">PREVIOUS</a>')
+    help = 'Index format: nnn'
+
 
 
 class GirlGenius(BasicScraper):
@@ -43,22 +45,25 @@
     help = 'Index format: yyyymmdd'
 
 
+
 class GirlsWithSlingshots(BasicScraper):
     latestUrl = 'http://www.daniellecorsetto.com/gws.html'
     imageUrl = 'http://www.daniellecorsetto.com/GWS%s.html'
     imageSearch = compile(r'<img src="(images/gws/GWS\d{3}.jpg)"')
-    prevSearch = compile(r'<a href="(GWS\d{3}.html)" onMouseOver="imgOn\(\'img2\'\)"')
+    prevSearch = compile(r'(archive.php\?today=\d{3}&comic=\d{3})"[^>]*><img[^>]+src="images/gwsmenu/back_off.jpg"')
     help = 'Index format: nnn'
 
 
+
 class Girly(BasicScraper):
-    latestUrl = 'http://go-girly.com/'
-    imageUrl = 'http://go-girly.com/go/%s'
-    imageSearch = compile(r'"(http://comics.go-girly.com/.*?)"')
-    prevSearch = compile(r"<a href=\'(/go/.*?)\'.+?nav_girly_prev.gif")
+    latestUrl = 'http://girlyyy.com/'
+    imageUrl = 'http://girlyyy.com/go/%s'
+    imageSearch = compile(r'<img src="(http://girlyyy.com/comics/.+?)"')
+    prevSearch = compile(r'<a href="(.+?)"> &nbsp;&lt;&nbsp;prev')
     help = 'Index format: nnn'
 
 
+
 class GlueMeat(BasicScraper):
     latestUrl = 'http://www.gluemeat.com/'
     imageUrl = 'http://www.gluemeat.com/archives/%s.html'
@@ -75,13 +80,18 @@
     help = 'Index format: yymmdd'
 
 
+
 class GoneWithTheBlastwave(BasicScraper):
-    latestUrl = 'http://www.blastwavecomic.com/'
-    imageUrl = 'http://www.blastwavecomic.com/index.php?strip_id=%s'
-    imageSearch = compile(r'<img.+?src="(istrip_files/strips/\d{8}\..+?)"')
-    prevSearch = compile(r'<a href="/(index.php\?strip_id=\d+)"><img src="images/previous.jpg"')
+    starter = indirectStarter('http://www.blastwave-comic.com/index.php?p=comic&nro=1',
+                              compile(r'href="(index.php\?p=comic&amp;nro=\d+)"><img src="images/page/default/latest'))
+    imageUrl = 'http://www.blastwave-comic.com/index.php?p=comic&nro=%s'
+    imageSearch = compile(r'<img.+src=".+(/comics/.+?)"')
+    prevSearch = compile(r'href="(index.php\?p=comic&amp;nro=\d+)"><img src="images/page/default/previous')
     help = 'Index format: n'
 
+    def namer(cls, imageUrl, pageUrl):
+        return '%02d' % int(compile(r'nro=(\d+)').search(pageUrl).group(1))
+
 
 
 class GunnerkrigCourt(BasicScraper):

=== modified file 'dosage/plugins/h.py'
--- dosage/plugins/h.py	2010-01-04 20:13:22 +0000
+++ dosage/plugins/h.py	2010-01-07 02:09:17 +0000
@@ -46,3 +46,12 @@
     imageSearch = compile(r'src="(/comics/.+?)"')
     prevSearch = compile(r'(\d+\.html)"><img[^>]+?src="/images/previous_day.png"')
     help = 'Index format: yyyy/mm/dd'
+
+
+
+class HelpDesk(BasicScraper):
+    latestUrl = 'http://www.ubersoft.net/'
+    imageUrl = 'http://www.ubersoft.net/comic/hd/%s/%s/%s'
+    imageSearch = compile(r'src="(http://www.ubersoft.net/files/comics/hd/hd\d{8}.png)')
+    prevSearch = compile(r'<a href="(/comic/.+?)">(.+?)previous</a>')
+    help = 'Index format: yyyy/mm/name'

=== modified file 'dosage/plugins/keenspot.py'
--- dosage/plugins/keenspot.py	2010-01-03 17:49:04 +0000
+++ dosage/plugins/keenspot.py	2010-01-07 02:09:17 +0000
@@ -406,7 +406,6 @@
     'ElCieloDeLosEspermatozoides': 'http://fjgarcia.comicgenesis.com/',
     'Eldritch': 'http://eldritch.comicgenesis.com/',
     'ElfOnlyInn': 'http://www.elfonlyinn.net/',
-    'ElGoonishShiveNP': 'http://www.egscomics.com/egsnp/',
     'ElleAndAllTheOthers': 'http://elle.comicgenesis.com/',
     'ElSuenoDeLaRazonProduceMonstruos': 'http://cubanaloca.comicgenesis.com/',
     'ElvenExploration': 'http://www.theelven.com/',

=== modified file 'dosage/plugins/l.py'
--- dosage/plugins/l.py	2010-01-04 20:12:43 +0000
+++ dosage/plugins/l.py	2010-01-07 02:09:17 +0000
@@ -3,12 +3,14 @@
 from dosage.helpers import BasicScraper
 
 
+
 class LasLindas(BasicScraper):
     latestUrl = 'http://www.katbox.net/laslindas/'
     imageUrl = 'http://www.katbox.net/laslindas/index.php?strip_id=%s'
     imageSearch = compile(r'"(istrip_files/strips/.+?)"')
-    prevSearch = compile(r'</a><a href="/laslindas/(.+?)".+?prev')
-    help = 'Index format: nn'
+    prevSearch = compile(r'<a href="(.+?)"><[^>]+?alt="Back"')
+    help = 'Index format: n (unpadded)'
+
 
 
 class LastBlood(BasicScraper):

=== modified file 'dosage/plugins/n.py'
--- dosage/plugins/n.py	2009-12-15 06:55:27 +0000
+++ dosage/plugins/n.py	2010-01-07 02:09:17 +0000
@@ -124,3 +124,12 @@
     prevSearch = compile(r'<a href="(index.php\?date=[0-9-]*)"><img src="back.jpg"', IGNORECASE)
     starter = indirectStarter('http://nodwick.humor.gamespy.com/gamespyarchive/index.php', prevSearch)
     help = 'Index format: None'
+
+
+
+class NekkoAndJoruba(BasicScraper):
+    latestUrl = 'http://www.nekkoandjoruba.com/'
+    imageUrl = 'http://www.nekkoandjoruba.com/?p=%s'
+    imageSearch = compile(r'<img src="(http://www.nekkoandjoruba.com/comics/.+?)"')
+    prevSearch = compile(r'<a href="(.+?)">&lsaquo;</a>')
+    help = 'Index format: nnn'

=== modified file 'dosage/plugins/o.py'
--- dosage/plugins/o.py	2009-12-15 06:55:27 +0000
+++ dosage/plugins/o.py	2010-01-07 02:09:17 +0000
@@ -73,3 +73,13 @@
     prevSearch = compile(r'<div class="previous"><a href="(http://www.ok-cancel.com/comic/\d{1,4}.html)">', IGNORECASE)
     starter = indirectStarter('http://www.ok-cancel.com/', prevSearch)
     help = 'Index format: yyyymmdd'
+
+
+
+class Oglaf(BasicScraper):
+    starter = indirectStarter('http://oglaf.com/',
+                              compile(r'<a href="(.+?)"><img src="over18.gif"', IGNORECASE))
+    imageUrl = 'http://oglaf.com/%s.html'
+    imageSearch = compile(r'/><img src="(.+?)"[^>]+?width="760" height="596"', IGNORECASE)
+    prevSearch = compile(r'<a href="(.+?)"[^>]+?><img src="prev.gif"', IGNORECASE)
+    help = 'Index format: nn'

=== modified file 'dosage/plugins/p.py'
--- dosage/plugins/p.py	2009-12-15 06:55:27 +0000
+++ dosage/plugins/p.py	2010-01-07 02:09:17 +0000
@@ -35,13 +35,20 @@
     help = 'Index format: n (unpadded)'
 
 
+
 class PennyArcade(BasicScraper):
-    latestUrl = 'http://www.penny-arcade.com/comic/'
+    starter = bounceStarter('http://www.penny-arcade.com/comic/',
+                            compile(r'<a href="(/comic/[^"]+)">Next</a>'))
     imageUrl = 'http://www.penny-arcade.com/comic/%s/'
-    imageSearch = compile(r'(?<!<!--)<img src="(/images/\d{4}/\d{8}..+?)"')
-    prevSearch = compile(r'<a href="(/comic/\d{1,4}/\d{1,2}/\d{1,2})/"><img alt="Back"')
+    imageSearch = compile(r'(?<!<!--)<img src="(http://art\.penny-arcade\.com/photos/[^"]+)"')
+    prevSearch = compile(r'<a href="(/comic/[^"]+)">Back</a>')
     help = 'Index format: yyyy/mm/dd'
 
+    def namer(cls, imageUrl, pageUrl):
+        yyyy, mm, dd = pageUrl.split('/')[-4:-1]
+        return '%04d%02d%02d' % (int(yyyy), int(mm), int(dd))
+
+
 
 class PeppermintSaga(BasicScraper):
     latestUrl = 'http://www.pepsaga.com/'
@@ -84,14 +91,16 @@
     namer = queryNamer('comicid', usePageUrl=True)
 
 
+
 class PvPonline(BasicScraper):
     latestUrl = 'http://www.pvponline.com/'
     imageUrl = None
-    imageSearch = compile(r"<img src='(http://www.pvponline.com/comics/pvp\d{8}\..+?)'", IGNORECASE)
-    prevSearch = compile(r'<a href="(http://www.pvponline.com/[^"]+)"[^>]*><img src="http://www.pvponline.com/newsite/images/(?:yesterday|left)_curl.jpg"', IGNORECASE)
+    imageSearch = compile(r'<img src="(http://www.pvponline.com/comics/pvp\d{8}\..+?)"', IGNORECASE)
+    prevSearch = compile(r'<a href="(http://www.pvponline.com/[^"]+)"[^>]*>&lsaquo; Previous', IGNORECASE)
     help = 'Index format: yyyymmdd'
 
 
+
 def pensAndTales(name, baseUrl):
     return BasicScraper.make(
         'PensAndTales/' + name,

=== modified file 'dosage/plugins/s.py'
--- dosage/plugins/s.py	2009-12-15 06:55:27 +0000
+++ dosage/plugins/s.py	2010-01-07 02:09:17 +0000
@@ -250,10 +250,11 @@
     starter = indirectStarter('http://spamusement.com/', prevSearch)
 
 
+
 def snafuComics():
     class SnafuComics(BasicScraper):
-        imageSearch = compile(r'"(comics/.*?)"')
-        prevSearch = compile(r'<a href="(\?strip_id=.*?)".+?[^>].+PREVIOUS')
+        imageSearch = compile(r'<img src=http://\w+\.snafu-comics\.com/(comics/\d{6}_\w*\.\w{3,4})')
+        prevSearch = compile(r'<a href="(\?comic_id=\d+)">Previous</a>')
         help = 'Index format: n (unpadded)'
 
         @property
@@ -261,21 +262,52 @@
             return self.latestUrl + 'index.php?strip_id=%s'
 
     comics = {
-        'Grim': 'http://grim.snafu-comics.com/',
-        'KOF': 'http://kof.snafu-comics.com/',
-        'PowerPuffGirls': 'http://ppg.snafu-comics.com/',
-        'Snafu': 'http://www.snafu-comics.com/',
-        'Tin': 'http://tin.snafu-comics.com/',
-        'TW': 'http://tw.snafu-comics.com/',
+        'Grim': 'grim',
+        'KOF': 'kof',
+        'PowerPuffGirls': 'ppg',
+        'Snafu': 'www',
+        'Tin': 'tin',
+        'TW': 'tw',
+        'Sugar': 'sugar',
+        'SF': 'sf',
+        'Titan': 'titan',
+        'EA': 'ea',
+        'Zim': 'zim',
+        'Soul': 'soul',
+        'FT': 'ft',
+        'Bunnywith': 'bunnywith',
+        'Braindead': 'braindead',
         }
 
-    return dict((name, SnafuComics.make('SnafuComics/' + name, latestUrl=latestUrl)) for name, latestUrl in comics.iteritems())
+    url = 'http://%s.snafu-comics.com/'
+    return dict((name, SnafuComics.make('SnafuComics/' + name,
+                                        latestUrl=url % host))
+                for name, host in comics.iteritems())
 
 globals().update(snafuComics())
 
 
+
 class SosiaalisestiRajoittuneet(BasicScraper):
     latestUrl = 'http://sosiaalisestirajoittuneet.fi/index_nocomment.php'
     imageUrl = 'http://sosiaalisestirajoittuneet.fi/index_nocomment.php?date=%s'
     imageSearch = compile(r'<img src="(strips/web/\d+.jpg)" alt=".*?"   />')
     prevSearch = compile(r'<a href="(index_nocomment\.php\?date=\d+)"><img\s+src="images/active_edellinen\.gif"', MULTILINE)
+
+
+
+class StrangeCandy(BasicScraper):
+    latestUrl = 'http://www.strangecandy.net/'
+    imageUrl = 'http://www.strangecandy.net/d/%s.html'
+    imageSearch = compile(r'src="(http://www.strangecandy.net/comics/\d{8}.\w{1,4})"')
+    prevSearch = compile(r'<a href="(http://www.strangecandy.net/d/\d{8}.html)"><img[^>]+?src="http://www.strangecandy.net/images/previous_day.gif"')
+    help = 'Index format: yyyyddmm'
+
+
+
+class SMBC(BasicScraper):
+    latestUrl = 'http://www.smbc-comics.com/'
+    imageUrl = 'http://www.smbc-comics.com/index.php?db=comics&id=%s'
+    imageSearch = compile(r'<img src=\'(.+?\d{8}.\w{1,4})\'>')
+    prevSearch = compile(r'131,13,216,84"\n\s+href="(.+?)#comic"\n>', MULTILINE)
+    help = 'Index format: nnnn'

=== modified file 'dosage/plugins/u.py'
--- dosage/plugins/u.py	2009-12-15 06:55:27 +0000
+++ dosage/plugins/u.py	2010-01-07 02:09:17 +0000
@@ -1,6 +1,6 @@
 from re import compile, IGNORECASE
 
-from dosage.helpers import BasicScraper, bounceStarter, indirectStarter, regexNamer
+from dosage.helpers import BasicScraper, bounceStarter, indirectStarter
 from dosage.util import getQueryParams
 
 

=== modified file 'dosage/plugins/uc.py'
--- dosage/plugins/uc.py	2009-12-15 06:55:27 +0000
+++ dosage/plugins/uc.py	2010-01-07 02:09:17 +0000
@@ -10,7 +10,7 @@
     homepage = 'http://content.uclick.com/a2z.html'
     baseUrl = 'http://www.uclick.com/client/zzz/%s/'
     imageUrl = property(lambda self: self.latestUrl + '%s/')
-    imageSearch = compile(r'<img.+?src="(/feature/\d{2}/\d{2}/\d{2}/[^"]+\.gif|http://images\.ucomics\.com/comics/\w+/\d{4}/[^"]+\.gif)">', IGNORECASE)
+    imageSearch = compile(r'<img[^>]+src="(http://synd.imgsrv.uclick.com/comics/\w+/\d{4}/[^"]+\.gif)"', IGNORECASE)
     prevSearch = compile(r'<a href="(/client/zzz/\w+/\d{4}/\d{2}/\d{2}/)">Previous date', IGNORECASE)
     help = 'Index format: yyyy/mm/dd'
 

=== modified file 'dosage/plugins/v.py'
--- dosage/plugins/v.py	2009-12-15 06:55:27 +0000
+++ dosage/plugins/v.py	2010-01-07 02:09:17 +0000
@@ -2,13 +2,31 @@
 
 from dosage.helpers import BasicScraper
 
+
+
 class VGCats(BasicScraper):
     latestUrl = 'http://www.vgcats.com/comics/'
-    imageUrl = 'http://www.vgcats.com/comics/?strip_id=%s'
     imageSearch = compile(r'<img src="(images/\d{6}\..+?)"')
     prevSearch = compile(r'<a href="(\?strip_id=\d+)"><img src="back.gif" border="0"')
     help = 'Index format: n (unpadded)'
 
+    @property
+    def imageUrl(self):
+        return self.latestUrl + '?strip_id=%s'
+
+
+
+class Super(VGCats):
+    name = 'VGCats/Super'
+    latestUrl = 'http://www.vgcats.com/super/'
+
+
+
+class Adventure(VGCats):
+    name = 'VGCats/Adventure'
+    latestUrl = 'http://www.vgcats.com/ffxi/'
+
+
 
 class ViiviJaWagner(BasicScraper):
     latestUrl = 'http://www.hs.fi/viivijawagner/'

=== modified file 'dosage/plugins/w.py'
--- dosage/plugins/w.py	2010-01-03 16:02:21 +0000
+++ dosage/plugins/w.py	2010-01-07 02:09:17 +0000
@@ -79,7 +79,7 @@
     latestUrl = 'http://www.wulffmorgenthaler.com/'
     imageUrl = 'http://www.wulffmorgenthaler.com/Default.aspx?id=%s'
     imageSearch = compile(r'img id="ctl00_content_Strip1_imgStrip".+?class="strip" src="(striphandler\.ashx\?stripid=[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})"')
-    prevSearch = compile(r'<a href="(/Default\.aspx\?id=[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})" id="ctl00_content_Strip1_aPrev">')
+    prevSearch = compile(r'<a href="(/default\.aspx\?id=[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})" id="ctl00_content_Strip1_aPrev">')
     help = 'Index format: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx (GUID)'
     namer = queryNamer('stripid')