Fixed some comics.

doc/changelog.txt

@@ -2,7 +2,8 @@ Dosage 2.7 (released xx.xx.xxxx)
 
 Fixes:
 - comics: Fixed GoComic image URL matcher.
-
+- comics: Fixed AxeCop, PensAndTales_FireflyCross.
+- comics: Remove broken ComidFury_Rosie, InsideOut, SodiumEyes.
 
 Dosage 2.6 (released 12.11.2013)
 

doc/web/content/comics/ComicFury_Rosie.md

@@ -1,39 +0,0 @@
-title: ComicFury/Rosie
-url: "/comics/ComicFury_Rosie.html"
----
-Dosage comic ComicFury/Rosie
------------------------------------------
-
-<p id="msg"></p>
-<script type="text/javascript">
-if (window.location.search === '?edit_info_mail=sent_ok') {
-  var elem = document.getElementById("msg");
-  elem.innerHTML = 'Edited information sucessfully sent for review, which is usually done daily. Thanks!';
-  elem.className = 'ok';
-}
-</script>
-<table class="comicinfo">
-<tr>
-<th>Description</th><td>Rosie is a young woman who experiences extreme states of mind, this comic follows her through her life events.</td>
-</tr>
-<tr>
-<th>Website</th><td><a href="http://Rosie.webcomic.ws/">http://Rosie.webcomic.ws/</a></td>
-</tr>
-<tr>
-<th>Genre</th><td>Other</td>
-</tr>
-<tr>
-<th>Language</th><td>English</td>
-</tr>
-<tr>
-<th>Adult content</th><td>no</td>
-</tr>
-<tr>
-<th>Status</th><td>error on 15.11.2013</td>
-</tr>
-<tr>
-<th>Votes</th><td>0</td>
-</tr>
-</table>
-
-[Edit this info](ComicFury_Rosie_edit.html) or go back to the [comic list](../comic-index.html).

doc/web/content/comics/ComicFury_Rosie_edit.md

@@ -1,32 +0,0 @@
-title: Edit ComicFury/Rosie
-url: "/comics/ComicFury_Rosie_edit.html"
----
-Edit info for comic ComicFury/Rosie
-
-<form name="comic" action="http://gaepostmail.appspot.com/comic/" method="post">
-<table class="comicinfo">
-<tr>
-<th>Description</th><td><textarea name="description" cols="40" rows="3">Rosie is a young woman who experiences extreme states of mind, this comic follows her through her life events.</textarea></td>
-</tr>
-<tr>
-<th>Website</th><td><input type="text" name="url" value="http://Rosie.webcomic.ws/" size="40"/></td>
-</tr>
-<tr>
-<th>Genre</th><td><input type="text" name="genre" value="Other" size="40"/></td>
-</tr>
-<tr>
-<th>Language</th><td><input type="text" name="language" value="English" size="40"/></td>
-</tr>
-<tr>
-<th>Adult content</th><td><input type="checkbox" name="adult" value="adult" /></td>
-</tr>
-<tr>
-<th></th><td>
-<input type="hidden" name="comic" value="ComicFury_Rosie" />
-<input type="submit" name="submit" value="Submit" />
-</td>
-</tr>
-</table>
-</form>
-
-Back to the [comic](ComicFury_Rosie.html).

dosagelib/plugins/a.py

@@ -355,12 +355,12 @@ class AxeCop(_BasicScraper):
     rurl = escape(url)
     starter = bounceStarter(url,
         (
-          compile(tagre("a", "href", r'(%scomic/page-\d+-[^"]+/)' % rurl, after="navi-next")),
+          compile(tagre("a", "href", r'(%scomic/page-\d+-[^"]+/)' % rurl, after="nav-next")),
-          compile(tagre("a", "href", r'(%scomic/[^"]+/)' % rurl, after="navi-next")),
+          compile(tagre("a", "href", r'(%scomic/[^"]+/)' % rurl, after="nav-next")),
         )
     )
     stripUrl = url + 'comic/%s/'
     firstStripUrl = stripUrl % '0'
     imageSearch = compile(tagre("img", "src", r'(http://mainsite\.axecop\.wpengine\.com/wp-content/uploads/sites/\d+/\d+/\d+/[^"]+)'))
-    prevSearch = compile(tagre("a", "href", r'(%scomic/page-\d+-[^"]+/)' % rurl, after="navi-prev"))
+    prevSearch = compile(tagre("a", "href", r'(%scomic/[^"]+/)' % rurl, after="nav-prev"))
-    help = 'Index format: usually page-number-stripname'
+    help = 'Index format: usually stripname'

dosagelib/plugins/arcamax.py

@@ -29,7 +29,7 @@ def add(name, shortname):
 #add('9ChickweedLane', '/thefunnies/ninechickweedlane/')
 #add('Agnes', '/thefunnies/agnes/')
 #add('AndyCapp', '/thefunnies/andycapp/')
-#add('Archie', '/thefunnies/archie/')
+add('Archie', '/thefunnies/archie/')
 add('ArcticCircle', '/thefunnies/arcticcircle/')
 #add('AskShagg', '/thefunnies/askshagg/')
 #add('BC', '/thefunnies/bc/')
@@ -91,7 +91,7 @@ add('Mutts', '/thefunnies/mutts/')
 #add('ReplyAll', '/thefunnies/replyall/')
 add('RhymeswithOrange', '/thefunnies/rhymeswithorange/')
 #add('Rubes', '/thefunnies/rubes/')
-#add('Rugrats', '/thefunnies/rugrats/')
+add('Rugrats', '/thefunnies/rugrats/')
 #add('ScaryGary', '/thefunnies/scarygary/')
 #add('SpeedBump', '/thefunnies/speedbump/')
 #add('StrangeBrew', '/thefunnies/strangebrew/')

dosagelib/plugins/c.py

@@ -433,6 +433,7 @@ class CyanideAndHappiness(_BasicScraper):
         return url in (
             self.stripUrl % "3082",
             self.stripUrl % "3360", # video
+            self.stripUrl % "3367", # video
         )
 
     @classmethod

dosagelib/plugins/comicfury.py

@@ -297,7 +297,6 @@ add('RecklessComix', 'http://RecklessComix.webcomic.ws/', u'We are a couple of g
 add('Remedy', 'http://Remedy.webcomic.ws/', u'Historical fantasy based in 5th century Roman empire. Even folklore has a beginning. Dark powers are stirring and only one band of outcasts stands between the world and oblivion. Whether for revenge,loyalty, curiosity, hope, despair, or love a curse brought them together and somewhere out there is the remedy. Updates often.(Any comments, questions, or criticisms would help greatly.)')
 add('Requiemsgate', 'http://requiemsgate.webcomic.ws/', u'')
 add('Residentweirdo', 'http://residentweirdo.webcomic.ws/', u'Some games, some life, some randomness. Whenever updates')
-add('Rosie', 'http://Rosie.webcomic.ws/', u'Rosie is a young woman who experiences extreme states of mind, this comic follows her through her life events.')
 add('RumfAdventures', 'http://RumfAdventures.webcomic.ws/', u"Hello! It is my pleasure to welcome you to the site of my beloved comic strip Rumf Adventures! In the event that you have not become acquainted with my tiny strip,allow me to give you a quick rundown.This is an action-packed adventure strip with a dash of humor.It features a cast of thousands, starring the mighty adventurer Rumfus! That's it.I don't want to spoil the rest for you,just start reading! Onward to Adventures!")
 add('STA', 'http://STA.webcomic.ws/', u"When two worlds are threaten and all hope seems lost, one hero will stand. Sadly, that's the best They're going to get.")
 #add('SailorMoonTheEnemyNextDoor', 'http://SailorMoonTheEnemyNextDoor.webcomic.ws/', u'This is a fan manga inspired, written, and drawn by the original author of Sailor Moon: Ms. Naoko Takeuchi. Karolina Romanska and John Smith do not wish in any way to claim, usurp, or abuse property rights of Ms Naoko Takeuchi and the other authors of images used in this fan-based manga. This is a NON-PROFIT project, done strictly in our leisure time for sheer enjoyment.')

dosagelib/plugins/i.py

@@ -38,16 +38,6 @@ class IDreamOfAJeanieBottle(_BasicScraper):
     help = 'Index format: n (unpadded)'
 
 
-class InsideOut(_BasicScraper):
-    description = u'Inside Out Comic - A new kind of Weird'
-    url = 'http://www.insideoutcomic.com/'
-    stripUrl = url + 'html/%s.html'
-    firstStripUrl = stripUrl % '1_snake_suicide'
-    imageSearch = compile(r'Picture12LYR.+?C="(.+?/assets/images/.+?)"')
-    prevSearch = compile(r'Picture7LYR.+?F="(.+?/html/.+?)"')
-    help = 'Index format: n_comic_name'
-
-
 class IrregularWebcomic(_BasicScraper):
     url = 'http://www.irregularwebcomic.net/'
     stripUrl = url + '%s.html'

dosagelib/plugins/pensandtales.py

@@ -5,13 +5,12 @@ from re import compile
 from ..scraper import make_scraper
 from ..util import tagre
 
-_imageSearch = compile(tagre("img", "src", r'([^"]*comics/[^"]+)'))
+_imageSearch = compile(tagre("img", "src", r'([^"]*wp-content/uploads/[^"]+)'))
 
 def add(name, baseUrl, param="date"):
     classname = 'PensAndTales_%s' % name
-    _prevSearch = compile(tagre("a", "href", r'([^"]*\?%s=\d+)' % param) +
+    _prevSearch = compile(tagre("span", "class", "mininav-prev") +
-       '(?:' + tagre("img", "alt", r'Previous Comic') + '|' +
+    tagre("a", "href", r'([^"]*\?%s=[-\d]+)' % param))
-       '[^<]+Previous' + ')')
     globals()[classname] = make_scraper(classname,
         name='PensAndTales/' + name,
         url = baseUrl,
@@ -22,9 +21,9 @@ def add(name, baseUrl, param="date"):
     )
 
 
-# Most of the comics linked an pensandtales are broken and
+# Most of the comics linked at pensandtales are broken and
 # the rest does not have a common layout. It seems they allow
 # almost arbitrary HTML layout.
 
-add('FireflyCross', 'http://www.fireflycross.pensandtales.com/', param="p")
+add('FireflyCross', 'http://www.fireflycross.pensandtales.com/', param="comic")
 add('Evilish', 'http://evilish.pensandtales.com/')

scripts/comicfury.py

@@ -195,6 +195,7 @@ exclude_comics = [
     "Retrofiyora", # unsuitable navigation
     "Rexfordavenue", # unsuitable navigation
     "Rocr", # unsuitable navigation
+    "Rosie", # unsuitable navigation
     "S", # unsuitable navigation
     "Sandgate", # unsuitable navigation
     "Shadowstories", # unsuitable navigation
@@ -231,6 +232,7 @@ exclude_comics = [
     "Thestickmen", # unsuitable navigation
     "Thingsthatannoyme", # unsuitable navigation
     "ThornsInOurSide", # unsuitable navigation
+    "Two_Rooks", # unsuitable navigation
     "Unichat", # unsuitable navigation
     "UFPA", # unsuitable navigation
     "V4", # unsuitable navigation