Move all HijinksEnsue comics into alphabetic files.

dosagelib/plugins/a.py

@@ -10,7 +10,7 @@ from re import compile, escape, MULTILINE
 from ..util import tagre
 from ..scraper import _BasicScraper, _ParserScraper
 from ..helpers import regexNamer, bounceStarter, indirectStarter
-from .common import _WordPressScraper, xpath_class, WP_LATEST_SEARCH
+from .common import _WordPressScraper, _WPNaviIn, xpath_class, WP_LATEST_SEARCH
 
 
 class AbstruseGoose(_BasicScraper):
@@ -117,9 +117,8 @@ class ALessonIsLearned(_BasicScraper):
     help = 'Index format: nnn'
 
 
-class Alice(_WordPressScraper):
+class Alice(_WPNaviIn):
     url = 'http://www.alicecomics.com/'
-    prevSearch = '//a[%s]' % xpath_class('navi-prev-in')
     latestSearch = '//a[text()="Latest Alice!"]'
     starter = indirectStarter
 

dosagelib/plugins/b.py

@@ -10,8 +10,8 @@ from re import compile, escape
 from ..util import tagre
 from ..scraper import _BasicScraper, _ParserScraper
 from ..helpers import indirectStarter
-from .common import (_ComicControlScraper, _WordPressScraper, WP_PREV_SEARCH,
-                     xpath_class)
+from .common import (_ComicControlScraper, _WordPressScraper, _WPNaviIn,
+                     WP_PREV_SEARCH, xpath_class)
 
 
 class BadassMuthas(_BasicScraper):
@@ -221,9 +221,8 @@ class Buni(_WordPressScraper):
     url = 'http://www.bunicomic.com/'
 
 
-class BusinessCat(_WordPressScraper):
+class BusinessCat(_WPNaviIn):
     url = 'http://www.businesscat.happyjar.com/'
-    prevSearch = '//a[%s]' % xpath_class('navi-prev-in')
 
 
 class ButtercupFestival(_ParserScraper):

dosagelib/plugins/common.py

@@ -28,6 +28,10 @@ class _WordPressScraper(_ParserScraper):
     prevSearch = WP_PREV_SEARCH
 
 
+class _WPNaviIn(_WordPressScraper):
+    prevSearch = '//a[%s]' % xpath_class('navi-prev-in')
+
+
 class _ComicControlScraper(_ParserScraper):
     imageSearch = '//img[@id="cc-comic"]'
     prevSearch = '//a[@rel="prev"]'

dosagelib/plugins/f.py

@@ -9,6 +9,7 @@ from re import compile, escape, IGNORECASE
 from ..util import tagre
 from ..scraper import _BasicScraper, _ParserScraper
 from ..helpers import indirectStarter
+from .common import _WPNaviIn
 
 
 class FalconTwin(_BasicScraper):
@@ -20,6 +21,12 @@ class FalconTwin(_BasicScraper):
     help = 'Index format: nnn'
 
 
+class Faneurysm(_WPNaviIn):
+    url = 'http://hijinksensue.com/comic/think-only-tree/'
+    firstStripUrl = 'http://hijinksensue.com/comic/captains-prerogative/'
+    endOfLife = True
+
+
 class FantasyRealms(_BasicScraper):
     url = 'http://www.fantasyrealmsonline.com/'
     stripUrl = url + 'manga/%s.php'

dosagelib/plugins/h.py

@@ -6,10 +6,11 @@
 from __future__ import absolute_import, division, print_function
 
 from re import compile, escape
+
 from ..scraper import _BasicScraper
 from ..util import tagre
-from ..helpers import bounceStarter
-from .common import _WordPressScraper
+from ..helpers import bounceStarter, indirectStarter
+from .common import _WordPressScraper, _WPNaviIn
 
 
 class HagarTheHorrible(_BasicScraper):
@@ -60,3 +61,28 @@ class HarkAVagrant(_BasicScraper):
 class Hipsters(_WordPressScraper):
     url = 'http://www.hipsters-comic.com/'
     firstStripUrl = 'http://www.hipsters-comic.com/comic/hip01/'
+
+
+class HijinksEnsue(_WPNaviIn):
+    url = 'http://hijinksensue.com/'
+    latestSearch = '//a[text()="Latest HijiNKS ENSUE"]'
+    firstStripUrl = 'http://hijinksensue.com/comic/who-is-your-daddy-and-what-does-he-do/'
+    starter = indirectStarter
+
+
+class HijinksEnsueClassic(_WPNaviIn):
+    url = 'http://hijinksensue.com/comic/open-your-eyes/'
+    firstStripUrl = 'http://hijinksensue.com/comic/a-soul-as-black-as-eyeliner/'
+    endOfLife = True
+
+
+class HijinksEnsueConvention(_WPNaviIn):
+    url = 'http://hijinksensue.com/comic/emerald-city-comicon-2015-fancy-sketches-part-4/'
+    firstStripUrl = 'http://hijinksensue.com/comic/whatever-dad-im-outta-here/'
+    endOfLife = True
+
+
+class HijinksEnsuePhoto(_WPNaviIn):
+    url = 'http://hijinksensue.com/comic/emerald-city-comicon-2015-fancy-photo-comic-part-2/'
+    firstStripUrl = 'http://hijinksensue.com/comic/san-diego-comic-con-fancy-picto-comic-pt-1/'
+    endOfLife = True

dosagelib/plugins/l.py

@@ -10,7 +10,8 @@ from re import compile, escape
 from ..scraper import _BasicScraper, _ParserScraper
 from ..helpers import bounceStarter, indirectStarter
 from ..util import tagre
-from .common import _ComicControlScraper, _WordPressScraper, WP_LATEST_SEARCH
+from .common import (_ComicControlScraper, _WordPressScraper, _WPNaviIn,
+                     WP_LATEST_SEARCH)
 
 
 class Lackadaisy(_BasicScraper):
@@ -89,6 +90,12 @@ class LoadingArtist(_ParserScraper):
     prevSearch = "//a[contains(concat(' ', @class, ' '), ' prev ')]"
 
 
+class LoFiJinks(_WPNaviIn):
+    url = 'http://hijinksensue.com/comic/learning-to-love-again/'
+    firstStripUrl = 'http://hijinksensue.com/comic/lo-fijinks-everything-i-know-anout-james-camerons-avatar-movie/'
+    endOfLife = True
+
+
 class LookingForGroup(_ParserScraper):
     url = 'http://www.lfgcomic.com/'
     stripUrl = url + 'page/%s/'

dosagelib/plugins/wordpress.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-from ..helpers import indirectStarter
-from ..scraper import make_scraper
-from .common import _WordPressScraper
-
-
-def add(name, start):
-    attrs = dict(
-        name=name,
-        url='http://hijinksensue.com/',
-        latestSearch=start,
-        starter=indirectStarter
-    )
-    globals()[name] = make_scraper(name, _WordPressScraper, **attrs)
-
-
-# all comics on HijiNKS ENSUE
-for (name, starterXPath) in [
-    ('HijinksEnsue', '//h4[text()="Read The Latest HijiNKS ENSUE"]/..//a'),
-    ('HijinksEnsueClassic', '//h4[text()="Read HijiNKS ENSUE Classic"]/..//a[3]'),
-    ('Faneurysm', '//h4[text()="Read The Latest FANEURYSM"]/..//a'),
-    ('HijinksEnsueConvention', '//h4[text()="Latest Fancy Convention Sketches"]/..//a'),
-    ('HijinksEnsuePhoto', '//h4[text()="Latest Fancy Photo Comic"]/..//a')
-]:
-    add(name, starterXPath)