From 23c20bfe326bee6f4e2c9f7d20a3b5674c37b1db Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <bastian.kleineidam@web.de>
Date: Thu, 7 Mar 2013 18:22:24 +0100
Subject: [PATCH] Fix some comics.

---
 dosagelib/plugins/b.py        | 3 ++-
 dosagelib/plugins/gocomics.py | 1 -
 dosagelib/plugins/j.py        | 2 +-
 dosagelib/plugins/n.py        | 1 -
 dosagelib/plugins/o.py        | 2 +-
 dosagelib/plugins/t.py        | 3 +++
 scripts/gocomics.py           | 1 +
 7 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/dosagelib/plugins/b.py b/dosagelib/plugins/b.py
index 27182b8fb..4362ebe54 100644
--- a/dosagelib/plugins/b.py
+++ b/dosagelib/plugins/b.py
@@ -172,7 +172,7 @@ class BratHalla(_BasicScraper):
 
 
 class BrentalFloss(_BasicScraper):
-    url = 'http://brentalflossthecomic.com/'
+    url = 'http://www.brentalflossthecomic.com/'
     stripUrl = url + '?id=%s'
     imageSearch = compile(tagre("img", "src", r'([^"]*/img/comic/[^"]*)'))
     prevSearch = compile(tagre("a", "href", r'([^"]*)') + "Prev")
@@ -194,6 +194,7 @@ class BrentalFlossFit(BrentalFloss):
         if url:
             return url.replace("\n", "")
 
+
 class BrentalFlossGuest(BrentalFloss):
     name = 'BrentalFloss/GuestComics'
     url = 'http://brentalflossthecomic.com/guestcomics/'
diff --git a/dosagelib/plugins/gocomics.py b/dosagelib/plugins/gocomics.py
index b90d2fa42..553764efc 100644
--- a/dosagelib/plugins/gocomics.py
+++ b/dosagelib/plugins/gocomics.py
@@ -211,7 +211,6 @@ add('Farcus', '/farcus')
 add('FaronSquare', '/faron-square')
 add('FatCats', '/fat-cats')
 add('Featherweight', '/featherweight')
-add('FlexandTone', '/flex-and-tone')
 #add('FloandFriends', '/floandfriends')
 add('FoolishMortals', '/foolish-mortals')
 add('ForBetterorForWorse', '/forbetterorforworse')
diff --git a/dosagelib/plugins/j.py b/dosagelib/plugins/j.py
index 491142ceb..5db56ebb6 100644
--- a/dosagelib/plugins/j.py
+++ b/dosagelib/plugins/j.py
@@ -34,7 +34,7 @@ class JoeAndMonkey(_BasicScraper):
 class JohnnyWander(_BasicScraper):
     url = 'http://www.johnnywander.com/'
     stripUrl = url + 'comics/%s'
-    imageSearch = compile(tagre("img", "src", r'(http://www\.johnnywander\.com/files/comics/[^"]+\.jpg)'))
+    imageSearch = compile(tagre("img", "src", r'(http://www\.johnnywander\.com/files/comics/[^"]+)'))
     prevSearch = compile(tagre("a", "href", r'(/comics/\d+)') + r'prev')
     help = 'Index format: nnn'
 
diff --git a/dosagelib/plugins/n.py b/dosagelib/plugins/n.py
index e98dadaa8..d0f7163df 100644
--- a/dosagelib/plugins/n.py
+++ b/dosagelib/plugins/n.py
@@ -49,7 +49,6 @@ class NewAdventuresOfBobbin(_BasicScraper):
     url = 'http://www.bobbin-comic.com/bobbin_strips/'
     imageSearch = compile(tagre("a", "href", r'(\d+\.gif)'))
     multipleImagesPerStrip = True
-    prevSearch = None
     help = 'Index format: none'
 
 
diff --git a/dosagelib/plugins/o.py b/dosagelib/plugins/o.py
index 23b87beb6..1ca993a5d 100644
--- a/dosagelib/plugins/o.py
+++ b/dosagelib/plugins/o.py
@@ -63,7 +63,7 @@ class OnTheEdge(_BasicScraper):
 
 
 class OneQuestion(_BasicScraper):
-    url = 'http://www.onequestioncomic.com/'
+    url = 'http://onequestioncomic.com/'
     stripUrl = url + 'comic.php?strip_id=%s'
     imageSearch = compile(tagre("img", "src", r'((?:\.\./)?istrip_files/strips/\d+\.jpg)'))
     prevSearch = compile(tagre("a", "href", r'(comic\.php\?strip_id=\d+)') + tagre("img", "src", r'img/arrow_prev\.jpg'))
diff --git a/dosagelib/plugins/t.py b/dosagelib/plugins/t.py
index 126e6a2a7..367834258 100644
--- a/dosagelib/plugins/t.py
+++ b/dosagelib/plugins/t.py
@@ -100,6 +100,9 @@ class ToonHole(_BasicScraper):
     prevSearch = compile(tagre("a", "href", r'(http://www\.toonhole\.com/\d+/\d+/[^"]+)', after="prev"))
     help = 'Index format: yyyy/mm/stripname'
 
+    def shouldSkipUrl(self, url):
+        return url in ("http://www.toonhole.com/2013/03/if-game-of-thrones-was-animated/",)
+
 
 # XXX disallowed by robots.txt
 class _TwoLumps(_BasicScraper):
diff --git a/scripts/gocomics.py b/scripts/gocomics.py
index 455b95d56..a870cc44c 100755
--- a/scripts/gocomics.py
+++ b/scripts/gocomics.py
@@ -30,6 +30,7 @@ exclude_comics = [
     "DellAndSteve", # too few comics
     "Dilbert", # redirect
     "DutchnPals", # too few comics
+    "FlexandTone", # too few comics
     "InkeeDoodles", # comic unavailable
     "MaggiesComics", # too few comics
     "OfMiceandMud", # too few comics