From fda654b5e0cbf129ad6f5b2ba16916350d9d9220 Mon Sep 17 00:00:00 2001
From: Dirk Reiners <reiners@destiny.ualr.edu>
Date: Fri, 24 Oct 2014 16:42:32 -0500
Subject: [PATCH] Some fixes...

AbstruseGoose: fixed prev
Carciphona: fixed latest
Curtailed: fixed image and prev (moved to WP)
DorkTower: fixed image search
GrrlPower: fixed site name issue
MadamAndEve: archive not updated in a long time, but current strip is.
Works, but needs to be run daily.
PennyArcade: fixed namer
PvPonline: fixed prev
---
 dosagelib/plugins/a.py | 3 ++-
 dosagelib/plugins/c.py | 7 +++----
 dosagelib/plugins/d.py | 2 +-
 dosagelib/plugins/g.py | 6 +++---
 dosagelib/plugins/m.py | 6 ++----
 dosagelib/plugins/p.py | 6 +++---
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py
index 9ef85b532..86941db63 100644
--- a/dosagelib/plugins/a.py
+++ b/dosagelib/plugins/a.py
@@ -36,7 +36,8 @@ class AbstruseGoose(_BasicScraper):
     stripUrl = url + '%s'
     firstStripUrl = stripUrl % '1'
     imageSearch = compile(tagre('img', 'src', r'(http://abstrusegoose\.com/strips/[^<>"]+)'))
-    prevSearch = compile(tagre('a', 'href', r'(%s\d+)' % rurl) + r'&laquo; Previous</a>')
+    prevSearch = compile(tagre('a', 'href', r'(%s\d+)' % rurl) + r'&laquo; Previous')
+    nextSearch = compile(tagre('a', 'href', r'(%s\d+)' % rurl) + r'Next &raquo;')
     help = 'Index format: n (unpadded)'
     textSearch = compile(tagre("img", "title", r'([^"]+)'))
 
diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py
index c5d85035d..57ced8a8a 100755
--- a/dosagelib/plugins/c.py
+++ b/dosagelib/plugins/c.py
@@ -46,8 +46,7 @@ class Carciphona(_BasicScraper):
     stripUrl = url + 'view.php?page=%s&chapter=%s'
     imageSearch = compile(tagre("div", "style", r'background-image:url\((_pages[^)]*)\)'))
     prevSearch = compile(tagre("a", "href", r'(view\.php\?[^"]*)', after="prevarea"))
-    latestSearch = compile(tagre("a", "href", r'(view\.php\?[^"]*)') +
-      tagre("span", "class", "linkslast"))
+    latestSearch = compile(tagre("a", "href", r'(view\.php\?page=[0-9]+[^"]*)'))
     help = 'Index format: None'
     starter = indirectStarter(url, latestSearch)
 
@@ -385,8 +384,8 @@ class Curtailed(_BasicScraper):
     stripUrl = url + '%s/'
     firstStripUrl = stripUrl % '2012/04/08/sneeze'
     rurl = escape(url)
-    imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]*)' % rurl))
-    prevSearch = compile(tagre("a", "href", r'(%s\d{4}/[^"]*)' % rurl, after="navi-prev"))
+    imageSearch = compile(tagre("img", "src", r'(%swp-content/uploads/[0-9]+/[^"]*)' % rurl))
+    prevSearch = compile('<a href="([^"]*)" class="comic-nav-base comic-nav-previous"')
     help = 'Index format: yyyy/mm/dd/stripname'
 
 
diff --git a/dosagelib/plugins/d.py b/dosagelib/plugins/d.py
index c6afbe276..55e504729 100644
--- a/dosagelib/plugins/d.py
+++ b/dosagelib/plugins/d.py
@@ -243,7 +243,7 @@ class DorkTower(_BasicScraper):
     rurl = escape(url)
     stripUrl = url + '%s/'
     firstStripUrl = stripUrl % '1997/01/01/shadis-magazine-strip-1'
-    imageSearch = compile(tagre("img", "src", r'(%sfiles/\d+/\d+/[^"]+\.gif)' % rurl))
+    imageSearch = compile(tagre("div", "class", "entry-content") + "\s*<p>\s*" + tagre("img", "src", r'(%sfiles/[0-9]+/[0-9]+/[^"]*Dork[^"]+\.(?:gif|jpg))' % rurl, after=' alt'))
     prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl)+"Previous")
     help = 'Index format: yyyy/mm/dd/stripname-dd-mm-yy'
 
diff --git a/dosagelib/plugins/g.py b/dosagelib/plugins/g.py
index c6ed8f69a..5f61cb4b3 100644
--- a/dosagelib/plugins/g.py
+++ b/dosagelib/plugins/g.py
@@ -189,12 +189,12 @@ class GoneWithTheBlastwave(_BasicScraper):
 
 class GrrlPower(_BasicScraper):
     description = u'Grrl Power - A webcomic about superheroines.'
-    url = 'http://www.grrlpowercomic.com/'
+    url = 'http://grrlpowercomic.com/'
     rurl = escape(url)
     stripUrl = url + 'archives/%s'
     firstStripUrl = stripUrl % '48'
-    imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
-    prevSearch = compile(tagre("a", "href", r'(%sarchives/\d+)' % rurl, after="navi-prev"))
+    imageSearch = compile(tagre("img", "src", r'(.*/comics/[^"]+)'))
+    prevSearch = compile(tagre("a", "href", r'(.*/archives/\d+)', after="navi-prev"))
     help = 'Index format: number'
 
 
diff --git a/dosagelib/plugins/m.py b/dosagelib/plugins/m.py
index 058cfdff6..b00f78689 100755
--- a/dosagelib/plugins/m.py
+++ b/dosagelib/plugins/m.py
@@ -17,12 +17,10 @@ class MacHall(_BasicScraper):
     help = 'Index format: yyyy-mm-dd'
 
 
-# broken links - disable for now
 class MadamAndEve(_BasicScraper):
-    url = 'http://www.madamandeve.co.za/week_of_cartns.php'
+    url = 'http://www.madamandeve.co.za/'
     stripUrl = None
-    imageSearch = compile(r'<IMG BORDER="0" SRC="(cartoons/me\d{6}\.(gif|jpg))">')
-    prevSearch = compile(r'<a href="(weekend_cartoon.php)"')
+    imageSearch = compile(tagre('img', 'src', r'(/cartoons/me\d{6}\.(gif|jpg))'))
     multipleImagesPerStrip = True
 
 
diff --git a/dosagelib/plugins/p.py b/dosagelib/plugins/p.py
index 794299975..36c5427cf 100755
--- a/dosagelib/plugins/p.py
+++ b/dosagelib/plugins/p.py
@@ -112,8 +112,8 @@ class PennyArcade(_BasicScraper):
 
     @classmethod
     def namer(cls, imageUrl, pageUrl):
-        dummy, yyyy, mm, dd = pageUrl.rsplit('/', 3)
-        return '%04d%02d%02d' % (int(yyyy), int(mm), int(dd))
+        p = pageUrl.split('/')
+        return '%04d%02d%02d' % (int(p[4]), int(p[5]), int(p[6]))
 
 
 class PeppermintSaga(_BasicScraper):
@@ -266,5 +266,5 @@ class PvPonline(_BasicScraper):
     url = 'http://pvponline.com/comic'
     stripUrl = url + '%s'
     imageSearch = compile(tagre("img", "src", r'(http://s3[^"]+\.amazonaws\.com/pvponlinenew/img/comic/\d+/\d+/pvp[^"]+\.jpg)'))
-    prevSearch = compile(tagre("a", "href", r'(/comic/[^"]+)', after="Previous"))
+    prevSearch = compile(tagre("a", "href", r'(/comic/[^"]+)', after="left divider"))
     help = 'Index format: yyyy/mm/dd/stripname'