From 31e7ddbd7cfdc4657831d73f30d0b49d48b2ba38 Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <calvin@debian.org>
Date: Wed, 14 Nov 2012 06:22:08 +0100
Subject: [PATCH] Fix some comics.

---
 dosagelib/plugins/a.py | 10 ++++++----
 dosagelib/plugins/b.py |  6 +++---
 dosagelib/plugins/c.py | 10 +++++-----
 dosagelib/plugins/d.py |  8 ++++----
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py
index 5591683aa..343dd86e1 100644
--- a/dosagelib/plugins/a.py
+++ b/dosagelib/plugins/a.py
@@ -123,8 +123,10 @@ class AltermetaOld(Altermeta):
 
 class Angels2200(_BasicScraper):
     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>')
+    stripUrl = latestUrl + '%s'
+    imageSearch = compile(tagre("img", "src", r"(http://www\.janahoffmann\.com/angels/comics/[^']+)"))
+    prevSearch = compile(tagre("a", "href", r'([^"]+)')+"&laquo; Previous"))
+    help = 'Index format: yyyy/mm/dd/part-<n>-comic-<n>'
 
 
 
@@ -250,10 +252,10 @@ class AllTheGrowingThings(_BasicScraper):
 
 class Amya(_BasicScraper):
     latestUrl = 'http://www.amyachronicles.com/'
-    stripUrl = 'http://www.amyachronicles.com/comics/%s.jpg'
+    stripUrl = 'http://www.amyachronicles.com/archives/%s'
     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'
+    help = 'Index format: n'
 
 
 
diff --git a/dosagelib/plugins/b.py b/dosagelib/plugins/b.py
index 2fd6c87c3..01276c46e 100644
--- a/dosagelib/plugins/b.py
+++ b/dosagelib/plugins/b.py
@@ -121,7 +121,7 @@ class BoyOnAStickAndSlither(_BasicScraper):
 
 class ButternutSquash(_BasicScraper):
     latestUrl = 'http://www.butternutsquash.net/'
-    stripUrl = 'http://www.butternutsquash.net/v3/%s'
+    stripUrl = 'http://www.butternutsquash.net/%s'
     imageSearch = compile(tagre("img", "src", r'(http://www\.butternutsquash\.net/comics/[^"]+)'))
     prevSearch = compile(tagre("a", "href", r'(http://www\.butternutsquash\.net/[^"]+)', after="prev"))
     help = 'Index format: yyyy/mm/dd/strip-name-author-name'
@@ -134,7 +134,7 @@ def blankLabel(name, baseUrl):
         dict(
         name='BlankLabel/' + name,
         latestUrl=baseUrl,
-        stripUrl='/d/%s.shtml',
+        stripUrl=baseUrl+'d/%s.shtml',
         imageSearch=compile(tagre("img", "src", r'(/comic[s|/][^"]+)')),
         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))'),
@@ -142,7 +142,7 @@ def blankLabel(name, baseUrl):
     )
 
 
-checkerboard = blankLabel('CheckerboardNightmare', 'http://www.checkerboardnightmare.com')
+checkerboard = blankLabel('CheckerboardNightmare', 'http://www.checkerboardnightmare.com/')
 courtingDisaster = blankLabel('CourtingDisaster', 'http://www.courting-disaster.com/')
 evilInc = blankLabel('EvilInc', 'http://www.evil-comic.com/')
 greystoneInn = blankLabel('GreystoneInn', 'http://www.greystoneinn.net/')
diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py
index 77a4b97b4..004925a29 100644
--- a/dosagelib/plugins/c.py
+++ b/dosagelib/plugins/c.py
@@ -138,10 +138,10 @@ class Commissioned(_BasicScraper):
 
 class CoolCatStudio(_BasicScraper):
     latestUrl = 'http://www.coolcatstudio.com/'
-    stripUrl = 'http://www.coolcatstudio.com/index.php?p=%s'
+    stripUrl = 'http://www.coolcatstudio.com/strips-cat/ccs%s'
     imageSearch = compile(tagre("img", "src", r'(http://www.coolcatstudio.com/comics/[^"]+)'))
     prevSearch = compile(tagre("a", "href", r'(http://www\.coolcatstudio\.com/strips-cat/[^"]+)', before="cniprevt"))
-    help = 'Index format: n'
+    help = 'Index format: yyyymmdd'
 
 
 
@@ -190,7 +190,7 @@ class Curvy(_BasicScraper):
 def cloneManga(name, shortName, lastStrip=None):
     url = 'http://manga.clone-army.org'
     baseUrl = '%s/%s.php' % (url, shortName)
-    stripUrl = baseUrl + '?page=%s'
+    stripUrl = baseUrl + '?&page=%s'
     if lastStrip is None:
         starter = bounceStarter(baseUrl, compile(tagre("a", "href", r'([^"]+)')+tagre("img", "src", r"next\.gif")))
     else:
@@ -418,10 +418,10 @@ class CasuallyKayla(_BasicScraper):
 
 class Collar6(_BasicScraper):
     latestUrl = 'http://collar6.com/'
-    stripUrl = 'http://collar6.com/wp-content/webcomic/collar6/%s.jpg'
+    stripUrl = 'http://collar6.com/archive/%s'
     imageSearch = compile(tagre("img", "src", r'(http://collar6\.com/wp-content/webcomic/collar6/[^"]+)'))
     prevSearch = compile(tagre("a", "href", r'(http://collar6\.com/archive/[^"]+)', after="previous"))
-    help = 'Index format: yyyy-mm-dd-Collar-n-nnn'
+    help = 'Index format: <name>'
 
 
 
diff --git a/dosagelib/plugins/d.py b/dosagelib/plugins/d.py
index 9d73ee709..d577b35bf 100644
--- a/dosagelib/plugins/d.py
+++ b/dosagelib/plugins/d.py
@@ -10,13 +10,13 @@ from ..util import getQueryParams
 
 class DMFA(_BasicScraper):
     latestUrl = 'http://www.missmab.com/'
-    stripUrl = 'http://missmab.com/Comics/Vol_%s.php'
-    imageSearch = compile(r'<IMG SRC="(Comics/.+?|Vol.+?)">', IGNORECASE)
-    prevSearch = compile(r'<A HREF="(.+?)"><IMG SRC="(Images/comicprev.gif|../Images/comicprev.gif)" ', MULTILINE | IGNORECASE)
+    stripUrl = latestUrl + 'Comics/Vol_%s.php'
+    imageSearch = compile(tagre("img", "src", r'(Comics/[^"]+|Vol[^"]+)'))
+    prevSearch = compile(tagre("a", "href", r'([^"])+')+
+      tagre("img", "src", r'(Images/comicprev.gif|../Images/comicprev.gif)'))
     help = 'Index format: nnn (normally, some specials)'
 
 
-
 class DandyAndCompany(_BasicScraper):
     latestUrl = 'http://www.dandyandcompany.com/'
     stripUrl = 'http://www.dandyandcompany.com/%s'