From 8ddf553eb4cf7b04166598fb475f55c60d941391 Mon Sep 17 00:00:00 2001
From: Tobias Gruetzmacher <tobias-git@23.gs>
Date: Fri, 22 Apr 2016 01:04:47 +0200
Subject: [PATCH] Fix some more SmackJeeves modules.

---
 dosagelib/plugins/smackjeeves.py | 80 ++------------------------------
 scripts/smackjeeves.py           |  1 +
 2 files changed, 6 insertions(+), 75 deletions(-)

diff --git a/dosagelib/plugins/smackjeeves.py b/dosagelib/plugins/smackjeeves.py
index 98f2814cf..4c093a425 100644
--- a/dosagelib/plugins/smackjeeves.py
+++ b/dosagelib/plugins/smackjeeves.py
@@ -18,6 +18,7 @@ class _SmackJeeves(_ParserScraper):
     prevSearch = (
         '//a[@class="nav-prev"]' + ONLY_COMICS,
         '//a[img[re:test(@alt, "prev", "i")]]' + ONLY_COMICS,
+        '//a[img[re:test(@src, "/(prev|back)")]]' + ONLY_COMICS,
         '//a[re:test(@title, "previous", "i")]' + ONLY_COMICS,
         '//a[re:test(text(), "prev|back", "i")]' + ONLY_COMICS,
         '//select[@class="jumpbox"]/preceding::a[1]' + ONLY_COMICS,
@@ -26,6 +27,7 @@ class _SmackJeeves(_ParserScraper):
     nextSearch = (
         '//a[@class="nav-next"]' + ONLY_COMICS,
         '//a[img[re:test(@alt, "next", "i")]]' + ONLY_COMICS,
+        '//a[img[re:test(@src, "/next", "i")]]' + ONLY_COMICS,
         '//a[re:test(@title, "next", "i")]' + ONLY_COMICS,
         '//a[re:test(text(), "next", "i")]' + ONLY_COMICS,
         '//select[@class="jumpbox"]/following::a[1]' + ONLY_COMICS,
@@ -35,6 +37,7 @@ class _SmackJeeves(_ParserScraper):
         '//img[@id="comic_image"]',
         '//div[@id="comic-image"]//img',
         '//img[@id="comic"]',
+        '//div[@id="comicset"]/object/param[@name="movie"]/@value',
     )
 
     @property
@@ -848,11 +851,6 @@ class SJFatetheAnthologyofKaienandhisfuckingmagicfriends(_SmackJeeves):
     sub = 'fatehoho'
 
 
-class SJFeathersPI(_SmackJeeves):
-    sub = 'featherpi'
-    adult = True
-
-
 class SJFemmeSchism(_SmackJeeves):
     sub = 'femmeschism'
 
@@ -865,10 +863,6 @@ class SJFinalArcanum(_SmackJeeves):
     sub = 'finalarcanum'
 
 
-class SJFireWire(_SmackJeeves):
-    sub = 'firewire'
-
-
 class SJFireredLisasReise(_SmackJeeves):
     sub = 'lisasreise'
 
@@ -928,10 +922,6 @@ class SJFurtherDowntheRabbitHole(_SmackJeeves):
     adult = True
 
 
-class SJGATEKEEPER(_SmackJeeves):
-    sub = 'gatekeepercomic'
-
-
 class SJGamerCafe(_SmackJeeves):
     sub = 'gamercafe'
 
@@ -952,10 +942,6 @@ class SJGayTimesWithRyanandJay(_SmackJeeves):
     sub = 'gtwraj'
 
 
-class SJGearTheTakedown(_SmackJeeves):
-    sub = 'geartd'
-
-
 class SJGetUpandGo(_SmackJeeves):
     sub = 'getupandgo'
     adult = True
@@ -1020,10 +1006,6 @@ class SJHabibahssong(_SmackJeeves):
     sub = 'habibahsong'
 
 
-class SJHarfang(_SmackJeeves):
-    sub = 'harfang'
-
-
 class SJHarvestMoonParadiseFound(_SmackJeeves):
     sub = 'paradisefound'
 
@@ -1113,10 +1095,6 @@ class SJIciVontLesMorts(_SmackJeeves):
     adult = True
 
 
-class SJImminentMoose(_SmackJeeves):
-    sub = 'imminentmoose'
-
-
 class SJInHouseHumor(_SmackJeeves):
     sub = 'inhousehumor'
 
@@ -1141,10 +1119,6 @@ class SJInspiredByADream(_SmackJeeves):
     sub = 'inspiredbyadream'
 
 
-class SJInthePride(_SmackJeeves):
-    sub = 'in-the-pride'
-
-
 class SJIntoxicated(_SmackJeeves):
     sub = 'intoxicated'
     adult = True
@@ -1263,10 +1237,6 @@ class SJKissoftheDevil(_SmackJeeves):
     sub = 'kissofthedevil'
 
 
-class SJKnife(_SmackJeeves):
-    sub = 'knife'
-
-
 class SJKnightface(_SmackJeeves):
     sub = 'knightface'
     adult = True
@@ -1280,10 +1250,6 @@ class SJKojiX5(_SmackJeeves):
     sub = 'kojix5'
 
 
-class SJKranburn(_SmackJeeves):
-    host = 'kranburn.thewebcomic.com'
-
-
 class SJKreetor(_SmackJeeves):
     sub = 'kreetor'
 
@@ -1427,10 +1393,6 @@ class SJLoveMeLoveMyTeddyBear(_SmackJeeves):
     sub = 'teddybear'
 
 
-class SJLoveTwister(_SmackJeeves):
-    sub = 'lovetwister'
-
-
 class SJLoveandIcecream(_SmackJeeves):
     sub = 'lovexandxicecream'
 
@@ -1528,10 +1490,6 @@ class SJMegaManTales(_SmackJeeves):
     sub = 'megamantales'
 
 
-class SJMegaManiacs(_SmackJeeves):
-    sub = 'megamaniacscomics'
-
-
 class SJMegaPain(_SmackJeeves):
     sub = 'megapain'
 
@@ -1549,10 +1507,6 @@ class SJMetroJack(_SmackJeeves):
     adult = True
 
 
-class SJMewsDynasty(_SmackJeeves):
-    sub = 'mews-dynasty'
-
-
 class SJMidnightPrince(_SmackJeeves):
     sub = 'midnightprince'
 
@@ -1589,10 +1543,6 @@ class SJMokepon(_SmackJeeves):
     sub = 'mokepon'
 
 
-class SJMomthegamestorerippedusoffAGAIN(_SmackJeeves):
-    sub = 'crappygames'
-
-
 class SJMonstar(_SmackJeeves):
     host = 'monstar.thewebcomic.com'
 
@@ -1601,10 +1551,6 @@ class SJMoonValley(_SmackJeeves):
     sub = 'moonvalley'
 
 
-class SJMoonlitDawnAMythicalTale(_SmackJeeves):
-    sub = 'moonlitdawn'
-
-
 class SJMorphE(_SmackJeeves):
     host = 'morphe.thewebcomic.com'
 
@@ -1729,10 +1675,6 @@ class SJOctober20th(_SmackJeeves):
     host = 'www.october20comic.com'
 
 
-class SJOddContact(_SmackJeeves):
-    sub = 'oddcontact'
-
-
 class SJOddPlaceOddTime(_SmackJeeves):
     sub = 'oddplaceoddtime'
 
@@ -1745,10 +1687,6 @@ class SJOldElastikid(_SmackJeeves):
     sub = 'oldelastikid'
 
 
-class SJOneFrameGags(_SmackJeeves):
-    sub = 'oneframegags'
-
-
 class SJOneRainyDay(_SmackJeeves):
     sub = 'one-rainy-day'
     adult = True
@@ -1779,7 +1717,7 @@ class SJOutofKey(_SmackJeeves):
 
 
 class SJOverSync(_SmackJeeves):
-    sub = 'linearperspective'
+    sub = 'oversync'
 
 
 class SJPMDExplorersofHeart(_SmackJeeves):
@@ -1794,10 +1732,6 @@ class SJPMDVictoryFire(_SmackJeeves):
     sub = 'victoryfire'
 
 
-class SJPRAGUERACE(_SmackJeeves):
-    sub = 'praguerace'
-
-
 class SJPTO(_SmackJeeves):
     sub = 'pto'
     adult = True
@@ -1887,7 +1821,7 @@ class SJPokemonGleamingCrystal(_SmackJeeves):
 
 
 class SJPokemonLANDSKY(_SmackJeeves):
-    host = 'www.landxsky.com'
+    sub = 'landsky'
 
 
 class SJPokemonMysteryDungeonTeamCrystal(_SmackJeeves):
@@ -2027,10 +1961,6 @@ class SJRyuManwebcomicversion(_SmackJeeves):
     sub = 'ryuman-web'
 
 
-class SJSAKANA(_SmackJeeves):
-    sub = 'sakana'
-
-
 class SJSChIzO(_SmackJeeves):
     sub = 'schizophrenic'
 
diff --git a/scripts/smackjeeves.py b/scripts/smackjeeves.py
index 04a1ba32a..9eceabc09 100755
--- a/scripts/smackjeeves.py
+++ b/scripts/smackjeeves.py
@@ -84,6 +84,7 @@ class SmackJeevesUpdater(ComicListUpdater):
         # images are 403 forbidden
         "AngelJunkPileFelix",
         "AntavioussGenLab",
+        "Harfang",
         "Okamirai",
 
         # missing images