From 5e79ff9d840f2221837fc43fca1744809d74e039 Mon Sep 17 00:00:00 2001
From: Techwolf <dring@wolfishly.me>
Date: Fri, 12 Jul 2019 20:41:06 -0700
Subject: [PATCH] Fix DoghouseDiaries

---
 dosagelib/plugins/d.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dosagelib/plugins/d.py b/dosagelib/plugins/d.py
index d4c0f4ecb..6e70d54dd 100644
--- a/dosagelib/plugins/d.py
+++ b/dosagelib/plugins/d.py
@@ -193,15 +193,20 @@ class DoemainOfOurOwn(_ParserScraper):
     help = 'Index format: yyyy-mm-dd'
 
 
-class DogHouseDiaries(_BasicScraper):
+class DoghouseDiaries(_ParserScraper):
     url = 'http://thedoghousediaries.com/'
-    rurl = escape(url)
     stripUrl = url + '%s'
     firstStripUrl = stripUrl % '34'
-    prevSearch = compile(r"<a id='previouslink' href='(http://thedoghousediaries.com/\d+)'")
-    imageSearch = compile(r"<img src='(dhdcomics/[^']+)'")
+    imageSearch = '//img[@class="imgcomic"]'
+    textSearch = imageSearch + '/@title'
+    prevSearch = '//a[@id="previouslink"]'
+    nextSearch = '//a[@id="nextlink"]'
+    starter = bounceStarter
     help = 'Index format: number'
 
+    def namer(self, imageUrl, pageUrl):
+        return pageUrl.rsplit('/', 1)[-1] + '.' + imageUrl.rsplit('.', 1)[-1]
+
 
 class DominicDeegan(_ParserScraper):
     url = 'http://www.dominic-deegan.com/'