From 7bf54255f009021b7eb8c0fd0ce00e68fc6f2aaf Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <calvin@debian.org>
Date: Fri, 12 Oct 2012 21:47:57 +0200
Subject: [PATCH] Fix some comics

---
 dosagelib/plugins/a.py |  4 ++--
 dosagelib/plugins/b.py | 19 +------------------
 dosagelib/plugins/c.py | 28 +++++++++++++++++-----------
 3 files changed, 20 insertions(+), 31 deletions(-)

diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py
index 98681fd9a..896889112 100644
--- a/dosagelib/plugins/a.py
+++ b/dosagelib/plugins/a.py
@@ -148,8 +148,8 @@ class AppleGeeksLite(_BasicScraper):
 class Achewood(_BasicScraper):
     latestUrl = 'http://www.achewood.com/'
     imageUrl = 'http://www.achewood.com/index.php?date=%s'
-    imageSearch = compile(r'<img src="(http://m.assetbar.com/achewood/autaux.+?)"')
-    prevSearch = compile(r'<a href="(index\.php\?date=\d{8})" class="dateNav" title="Previous comic"')
+    imageSearch = compile(tagre("img", "src", r'(/comic\.php\?date=\d+)'))
+    prevSearch = compile(tagre("a", "href", r'(index\.php\?date=\d+)', after="Previous"))
     help = 'Index format: mmddyyyy'
     namer = regexNamer(compile(r'date%3D(\d{8})'))
 
diff --git a/dosagelib/plugins/b.py b/dosagelib/plugins/b.py
index abfdcc739..b1fb3b432 100644
--- a/dosagelib/plugins/b.py
+++ b/dosagelib/plugins/b.py
@@ -101,14 +101,6 @@ class Brink(_BasicScraper):
 
 
 
-class BonoboConspiracy(_BasicScraper):
-    latestUrl = 'http://ansuz.sooke.bc.ca/bonobo-conspiracy/'
-    imageUrl = 'http://ansuz.sooke.bc.ca/bonobo-conspiracy/%s'
-    imageSearch = compile(r'<P.+?<IMG SRC="(.+?)" ALT')
-    prevSearch = compile(r'ansuz.+?/(\?i=.+?)".+?Previous')
-    help = 'Index format: nnn'
-
-
 class BoredAndEvil(_BasicScraper):
     latestUrl = 'http://www.boredandevil.com/'
     imageUrl = 'http://www.boredandevil.com/archive.php?date=%s'
@@ -152,7 +144,7 @@ def blankLabel(name, baseUrl):
         latestUrl=baseUrl,
         imageUrl='/d/%s.shtml',
         imageSearch=compile(tagre("img", "src", r'(/comic[s|/][^"]+)')),
-        prevSearch=compile(tagre("a", "href", r'(/d/\d+\.shtml)')+r"[^>]+/images/nav_02\.gif"),
+        prevSearch=compile(tagre("a", "href", r'[^"]*(/d/\d+\.s?html)')+r"[^>]+/images/(?:nav_02|previous_day)\.gif"),
         #prevSearch=compile(r'(?:"([^"]*(?:/d/[^"\r\n]*)|(?:/strip/.+?))")(?:(?:.{43}starshift_back.gif)|(?:.+?cxn_previous)|(?:.{43}previous)|(?:[^<>]*>[^<>]*<[^<>]*previous)|(?:.*?back_button)|(?:.*?comicnav-previous))'),
         help='Index format: yyyymmdd')
     )
@@ -186,15 +178,6 @@ class BeePower(_BasicScraper):
 
 
 
-class Bellen(_BasicScraper):
-    latestUrl = 'http://boxbrown.com/'
-    imageUrl = 'http://boxbrown.com/?p=%s'
-    imageSearch = compile(r'<img src="(http://boxbrown.com/comics/[^"]+)"')
-    prevSearch = compile(r'<a href="(.+?)"><span class="prev">')
-    help = 'Index format: nnn'
-
-
-
 class BlankIt(_BasicScraper):
     latestUrl = 'http://blankitcomics.com/'
     imageUrl = 'http://blankitcomics.com/%s'
diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py
index fd6c03828..30383a574 100644
--- a/dosagelib/plugins/c.py
+++ b/dosagelib/plugins/c.py
@@ -238,26 +238,32 @@ class CatAndGirl(_BasicScraper):
 
 
 def comicsDotCom(name, section):
-    baseUrl = 'http://www.comics.com/%s/%s/archive/' % (section, name)
+    latestUrl = 'http://www.gocomics.com/%s' % name
 
     @classmethod
     def namer(cls, imageUrl, pageUrl):
-        htmlname = pageUrl.split('/')[-1]
-        filename = htmlname.split('.')[0]
-        return filename
+        prefix, year, month, day = pageUrl.split('/', 3)
+        return "%s_%s%s%s.gif" % (name, year, month, day)
 
-    return type('ComicsDotCom_%s' % name,
+    return type('GoComicsDotCom_%s' % name,
         (_BasicScraper,),
         dict(
-        name='ComicsDotCom/' + name,
-        starter=indirectStarter(baseUrl, compile(r'<A HREF="(/[\w/]+?/archive/\w+?-\d{8}\.html)">(?:<IMG SRC="/[\w/]+?/images/arrow_right.gif|(?:<font[^>]*?>)?Next Day)')),
-        imageUrl=baseUrl + 'name-%s.html',
-        imageSearch=compile(r'SRC="(/[\w/]+?/archive/images/\w+?\d+\..+?)"'),
-        prevSearch=compile(r'<A HREF="(/[\w/]+?/archive/\w+?-\d{8}\.html)">(?:<IMG SRC="/[\w/]+?/images/arrow_left.gif|(?:<font[^>]*?>)?Previous Day)'),
-        help='Index format: yyyymmdd',
+        name='GoComicsDotCom/' + name,
+        imageUrl=latestUrl + '/%s',
+        imageSearch=compile(tagre("img", "src", r'(http://assets\.amuniversal\.com/[0-9a-f]+)')),
+        prevSearch=compile(tagre("a", "href", "(/%s/\d+/\d+/\d+)")+"Previous"),
+        help='Index format: yyyy/mm/dd',
         namer=namer)
     )
 
+# http://www.gocomics.com/features
+# XXX
+
+# http://www.gocomics.com/explore/editorial_list
+# XXX
+
+# http://www.gocomics.com/explore/sherpa_list
+# XXX
 
 acaseinpoint = comicsDotCom('acaseinpoint', 'comics')
 agnes = comicsDotCom('agnes', 'creators')