From 3b6af33ecba9133d4d14d61fb873e1c6adc1e097 Mon Sep 17 00:00:00 2001
From: Tobias Gruetzmacher <tobias-git@23.gs>
Date: Sun, 12 Feb 2017 20:15:25 +0100
Subject: [PATCH] Some small module fixes.

---
 dosagelib/plugins/c.py | 15 ---------------
 dosagelib/plugins/j.py | 12 ++++++------
 dosagelib/plugins/m.py |  2 +-
 3 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py
index c535feea9..97f3369a0 100644
--- a/dosagelib/plugins/c.py
+++ b/dosagelib/plugins/c.py
@@ -36,21 +36,6 @@ class CaptainSNES(_BasicScraper):
     help = 'Index format: yyyy/mm/dd/nnn-stripname'
 
 
-class Carciphona(_BasicScraper):
-    url = 'http://carciphona.com/'
-    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\?page=[0-9]+[^"]*)'))
-    starter = indirectStarter
-
-    def namer(self, image_url, page_url):
-        ip = image_url.split('/')
-        return "volume_%s_page_%s" % (ip[-2], ip[-1])
-
-
 class CaseyAndAndy(_BasicScraper):
     url = 'http://www.galactanet.com/comic/'
     stripUrl = url + 'view.php?strip=%s'
diff --git a/dosagelib/plugins/j.py b/dosagelib/plugins/j.py
index 4346f6da7..2fb82a05b 100644
--- a/dosagelib/plugins/j.py
+++ b/dosagelib/plugins/j.py
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs
 # Copyright (C) 2012-2014 Bastian Kleineidam
-# Copyright (C) 2015-2016 Tobias Gruetzmacher
+# Copyright (C) 2015-2017 Tobias Gruetzmacher
 
 from __future__ import absolute_import, division, print_function
 
 from re import compile, escape
 
-from ..scraper import _BasicScraper
+from ..scraper import _BasicScraper, _ParserScraper
 from ..util import tagre
 from ..helpers import indirectStarter
 from .common import _ComicControlScraper, xpath_class
@@ -23,12 +23,12 @@ class JackCannon(_BasicScraper):
     help = 'Index format: yyyy/mm/dd/page-nnn'
 
 
-class JerkCity(_BasicScraper):
+class JerkCity(_ParserScraper):
     url = 'http://www.jerkcity.com/'
-    stripUrl = url + '_jerkcity%s.html'
+    stripUrl = url + 'jerkcity%s.html'
     firstStripUrl = stripUrl % '1'
-    imageSearch = compile(tagre("img", "src", r'(/jerkcity[^"]+)'))
-    prevSearch = compile(tagre("a", "href", r'(/_jerkcity[^"]+)') + r'&lt;&lt;Previous')
+    imageSearch = '//div[@id="rapist"]//img'
+    prevSearch = '//div[@id="rapist"]/a'
     help = 'Index format: n'
 
 
diff --git a/dosagelib/plugins/m.py b/dosagelib/plugins/m.py
index fc93a3d4c..bebabf8ff 100755
--- a/dosagelib/plugins/m.py
+++ b/dosagelib/plugins/m.py
@@ -72,7 +72,7 @@ class Marilith(_BasicScraper):
 
 
 class MarriedToTheSea(_ParserScraper):
-    url = 'http://www.marriedtothesea.com/'
+    url = 'http://marriedtothesea.com/'
     stripUrl = url + '%s'
     firstStripUrl = stripUrl % '022806'
     imageSearch = '//div[%s]//p/img' % xpath_class('jumbotron')