From 934546954b48497922f2e6a4473a5564cc4aeeb3 Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <bastian.kleineidam@web.de>
Date: Wed, 10 Jul 2013 18:43:53 +0200
Subject: [PATCH] Added MarriedToTheSea, NatalieDee

---
 doc/changelog.txt      |  8 ++++++--
 dosagelib/plugins/m.py | 16 ++++++++++++++++
 dosagelib/plugins/n.py | 16 ++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 92a3a5c48..7b25f2272 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,7 +1,11 @@
-Dosage 2.5 (released xx.7.2013)
+Dosage 2.5 (released xx.xx.2013)
 
 Features:
-- comics: Added ICanBarelyDraw.
+- comics: Added ICanBarelyDraw, MarriedToTheSea, NatalieDee.
+  Closes: GH bug #37
+
+Fixes:
+- comics: Fixed GoblinsComic, KevinAndKell and other comics.
 
 
 Dosage 2.4 (released 24.6.2013)
diff --git a/dosagelib/plugins/m.py b/dosagelib/plugins/m.py
index e9d523728..a784e4370 100644
--- a/dosagelib/plugins/m.py
+++ b/dosagelib/plugins/m.py
@@ -55,6 +55,22 @@ class Marilith(_BasicScraper):
     help = 'Index format: yyyymmdd'
 
 
+class MarriedToTheSea(_BasicScraper):
+    description = u'comics by Drew & Natalie Dee - Updates daily at midnight'
+    url = 'http://www.marriedtothesea.com/'
+    rurl = escape(url)
+    stripUrl = url + 'index.php?date=%s'
+    firstStripUrl = stripUrl % '022806'
+    imageSearch = compile(tagre("img", "src", r'(%s\d+/[^"]+)' % rurl, before="overflow"))
+    prevSearch = compile(tagre("a", "href", r'([^"]+)') + "&lt;&lt; Yesterday")
+    help = 'Index format: mmddyy'
+
+    @classmethod
+    def namer(cls, imageUrl, pageUrl):
+        unused, date, filename = imageUrl.rsplit('/', 2)
+        return '%s-%s' % (date, filename)
+
+
 class Meek(_BasicScraper):
     url = 'http://www.meekcomic.com/'
     stripUrl = url + '%s'
diff --git a/dosagelib/plugins/n.py b/dosagelib/plugins/n.py
index e4a32a271..c0534fc7a 100644
--- a/dosagelib/plugins/n.py
+++ b/dosagelib/plugins/n.py
@@ -33,6 +33,22 @@ class NamirDeiter(_BasicScraper):
     help = 'Index format: yyyymmdd'
 
 
+class NatalieDee(_BasicScraper):
+    description = u"America's Favorite Cracker"
+    url = 'http://www.nataliedee.com/'
+    rurl = escape(url)
+    stripUrl = url + 'index.php?date=%s'
+    firstStripUrl = stripUrl % '022806'
+    imageSearch = compile(tagre("img", "src", r'(%s\d+/[^"]+)' % rurl, before="overflow"))
+    prevSearch = compile(tagre("a", "href", r'([^"]+)') + "&lt;&lt; Yesterday")
+    help = 'Index format: mmddyy'
+
+    @classmethod
+    def namer(cls, imageUrl, pageUrl):
+        unused, date, filename = imageUrl.rsplit('/', 2)
+        return '%s-%s' % (date, filename)
+
+
 class Nedroid(_BasicScraper):
     url = 'http://nedroid.com/'
     rurl = escape(url)