From 48e417c647ad12575c96b4c68350b1d14aac3785 Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Mon, 18 Nov 2013 22:01:30 +0100 Subject: [PATCH] Fixed some comics. --- doc/changelog.txt | 3 +- doc/web/content/comics/ComicFury_Rosie.md | 39 ------------------- .../content/comics/ComicFury_Rosie_edit.md | 32 --------------- dosagelib/plugins/a.py | 8 ++-- dosagelib/plugins/arcamax.py | 4 +- dosagelib/plugins/c.py | 1 + dosagelib/plugins/comicfury.py | 1 - dosagelib/plugins/i.py | 10 ----- dosagelib/plugins/pensandtales.py | 11 +++--- scripts/comicfury.py | 2 + 10 files changed, 16 insertions(+), 95 deletions(-) delete mode 100644 doc/web/content/comics/ComicFury_Rosie.md delete mode 100644 doc/web/content/comics/ComicFury_Rosie_edit.md diff --git a/doc/changelog.txt b/doc/changelog.txt index cf99a6728..cd4fe20dc 100644 --- a/doc/changelog.txt +++ b/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) diff --git a/doc/web/content/comics/ComicFury_Rosie.md b/doc/web/content/comics/ComicFury_Rosie.md deleted file mode 100644 index f9ad7b350..000000000 --- a/doc/web/content/comics/ComicFury_Rosie.md +++ /dev/null @@ -1,39 +0,0 @@ -title: ComicFury/Rosie -url: "/comics/ComicFury_Rosie.html" ---- -Dosage comic ComicFury/Rosie ------------------------------------------ - -

- - - - - - - - - - - - - - - - - - - - - - - -
DescriptionRosie is a young woman who experiences extreme states of mind, this comic follows her through her life events.
Websitehttp://Rosie.webcomic.ws/
GenreOther
LanguageEnglish
Adult contentno
Statuserror on 15.11.2013
Votes0
- -[Edit this info](ComicFury_Rosie_edit.html) or go back to the [comic list](../comic-index.html). diff --git a/doc/web/content/comics/ComicFury_Rosie_edit.md b/doc/web/content/comics/ComicFury_Rosie_edit.md deleted file mode 100644 index 55ef40c5e..000000000 --- a/doc/web/content/comics/ComicFury_Rosie_edit.md +++ /dev/null @@ -1,32 +0,0 @@ -title: Edit ComicFury/Rosie -url: "/comics/ComicFury_Rosie_edit.html" ---- -Edit info for comic ComicFury/Rosie - -
- - - - - - - - - - - - - - - - - - - -
Description
Website
Genre
Language
Adult content
- - -
-
- -Back to the [comic](ComicFury_Rosie.html). diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py index 1b71ba201..8b53ce32d 100644 --- a/dosagelib/plugins/a.py +++ b/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/[^"]+/)' % rurl, after="navi-next")), + compile(tagre("a", "href", r'(%scomic/page-\d+-[^"]+/)' % rurl, after="nav-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")) - help = 'Index format: usually page-number-stripname' + prevSearch = compile(tagre("a", "href", r'(%scomic/[^"]+/)' % rurl, after="nav-prev")) + help = 'Index format: usually stripname' diff --git a/dosagelib/plugins/arcamax.py b/dosagelib/plugins/arcamax.py index 942147183..a2b042b44 100644 --- a/dosagelib/plugins/arcamax.py +++ b/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/') diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py index 8af67f42b..4e7b3b485 100644 --- a/dosagelib/plugins/c.py +++ b/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 diff --git a/dosagelib/plugins/comicfury.py b/dosagelib/plugins/comicfury.py index 3b72bc121..3dc0d9f4b 100644 --- a/dosagelib/plugins/comicfury.py +++ b/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.') diff --git a/dosagelib/plugins/i.py b/dosagelib/plugins/i.py index c2aedbada..b1064ab8d 100644 --- a/dosagelib/plugins/i.py +++ b/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' diff --git a/dosagelib/plugins/pensandtales.py b/dosagelib/plugins/pensandtales.py index d432f425e..dd9661a4e 100644 --- a/dosagelib/plugins/pensandtales.py +++ b/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) + - '(?:' + tagre("img", "alt", r'Previous Comic') + '|' + - '[^<]+Previous' + ')') + _prevSearch = compile(tagre("span", "class", "mininav-prev") + + tagre("a", "href", r'([^"]*\?%s=[-\d]+)' % param)) 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/') diff --git a/scripts/comicfury.py b/scripts/comicfury.py index 01c59e3ff..28e8605bb 100755 --- a/scripts/comicfury.py +++ b/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