From 30a28cdb3e7215a1499781a3ebfd8b1c98344744 Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <calvin@debian.org>
Date: Mon, 12 Nov 2012 18:59:19 +0100
Subject: [PATCH] Fix some comics.

---
 dosagelib/plugins/a.py | 17 ++++-------------
 dosagelib/plugins/b.py |  8 --------
 dosagelib/plugins/c.py | 21 +++++++++++----------
 3 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py
index 896889112..83d38303c 100644
--- a/dosagelib/plugins/a.py
+++ b/dosagelib/plugins/a.py
@@ -248,15 +248,6 @@ class AlienShores(_BasicScraper):
 
 
 
-class AllKindsOfBees(_BasicScraper):
-    latestUrl = 'http://www.allkindsofbees.com/'
-    imageUrl = 'http://www.allkindsofbees.com/?p=%s'
-    imageSearch = compile(r'<img src="(http://www.allkindsofbees.com/comics/.+?)"')
-    prevSearch = compile(r'<div class="nav-previous"><a href="(http://www.allkindsofbees.com/.+?)">')
-    help = 'Index format: nnn'
-
-
-
 class AllTheGrowingThings(_BasicScraper):
     latestUrl = 'http://typodmary.com/growingthings/'
     imageUrl = 'http://typodmary.com/growingthings/%s/'
@@ -268,10 +259,10 @@ class AllTheGrowingThings(_BasicScraper):
 
 class Amya(_BasicScraper):
     latestUrl = 'http://www.amyachronicles.com/'
-    imageUrl = 'http://www.amyachronicles.com/archives/%s'
-    imageSearch = compile(r'<img src="(http://www.amyachronicles.com/comics/.+?)"')
-    prevSearch = compile(r'<div class="nav-previous"><a href="(http://www.amyachronicles.com/archives/.+?)"')
-    help = 'Index format: nnn'
+    imageUrl = 'http://www.amyachronicles.com/comics/%s.jpg'
+    imageSearch = compile(tagre("img", "src", r'(http://www\.amyachronicles\.com/comics/[^"]+)'))
+    prevSearch = compile(tagre("a", "href", r'(http://www\.amyachronicles\.com/archives/\d+)', after="Previous"))
+    help = 'Index format: yyyy-mm-dd'
 
 
 
diff --git a/dosagelib/plugins/b.py b/dosagelib/plugins/b.py
index b1fb3b432..3d6fdd4a1 100644
--- a/dosagelib/plugins/b.py
+++ b/dosagelib/plugins/b.py
@@ -128,14 +128,6 @@ class ButternutSquash(_BasicScraper):
 
 
 
-class Bhag(_BasicScraper):
-    latestUrl = 'http://bhag.sackofjustice.com/'
-    imageUrl = 'http://bhag.sackofjustice.com/daily.php?date='
-    imageSearch = compile(r'/(comics/.+?)">')
-    prevSearch = compile(r'first.+?/(daily.php\?date=.+?)".+?previous')
-    help = 'Index format: yymmdd'
-
-
 def blankLabel(name, baseUrl):
     return type('BlankLabel_%s' % name,
         (_BasicScraper,),
diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py
index 30383a574..317c5f48d 100644
--- a/dosagelib/plugins/c.py
+++ b/dosagelib/plugins/c.py
@@ -50,10 +50,10 @@ class CaribbeanBlue(_BasicScraper):
 
 class Catena(_BasicScraper):
     latestUrl = 'http://catenamanor.com/'
-    imageUrl = 'http://catenamanor.com/index.php?comic=%s'
-    imageSearch = compile(r'(comics/catena/.+?)"')
-    prevSearch = compile(r'First</a>.+?"(.+?)".+?Previous')
-    help = 'Index format: n (unpadded)'
+    imageUrl = 'http://catenamanor.com/%s.gif'
+    imageSearch = compile(tagre("img", "src", r'(http://catenamanor\.com/comics/[^"]+)'))
+    prevSearch = compile(tagre("a", "href", r'[^"]+', after='rel="prev"'))
+    help = 'Index format: yyyy-mm-dd-<name>'
 
 
 class Catharsis(_BasicScraper):
@@ -197,15 +197,16 @@ class Curvy(_BasicScraper):
 
 
 def cloneManga(name, shortName, lastStrip=None):
-    baseUrl = 'http://manga.clone-army.org/%s.php' % (shortName,)
+    url = 'http://manga.clone-army.org'
+    baseUrl = '%s/%s.php' % (url, shortName)
     imageUrl = baseUrl + '?page=%s'
     if lastStrip is None:
-        starter = bounceStarter(baseUrl, compile(r'<a href="([^"]+)"><img src="next\.gif"'))
+        starter = bounceStarter(baseUrl, compile(tagre("a", "href", r'([^"]+)')+tagre("img", "src", r"next\.gif")))
     else:
-        starter = constStarter(imageUrl % (lastStrip,))
+        starter = constStarter(imageUrl % lastStrip)
 
     def namer(self, imageUrl, pageUrl):
-        return '%03d' % (int(getQueryParams(pageUrl)['page'][0]),)
+        return '%03d' % int(getQueryParams(pageUrl)['page'][0])
 
     return type('CloneManga_%s' % name,
         (_BasicScraper,),
@@ -213,8 +214,8 @@ def cloneManga(name, shortName, lastStrip=None):
             name='CloneManga/' + name,
             starter=starter,
             imageUrl=imageUrl,
-            imageSearch=compile(r'<img src="(http://manga\.clone-army\.org/[^"]+)"'),
-            prevSearch=compile(r'<a href="([^"]+)"><img src="previous\.gif"'),
+            imageSearch=compile(tagre("img", "src", r'((?:%s)?/%s/[^"]+)' % (url, shortName), after="center")),
+            prevSearch=compile(tagre("a", "href", r'([^"]+)')+tagre("img", "src", r"previous\.gif")),
             help='Index format: n',
             namer=namer)
     )