From 91c32515d52a6adfe87be81787bea8c903e25ab1 Mon Sep 17 00:00:00 2001 From: Bastian Kleineidam Date: Tue, 19 Feb 2013 20:58:04 +0100 Subject: [PATCH] Fix some comics. --- dosagelib/plugins/e.py | 8 ++++---- dosagelib/plugins/f.py | 1 + dosagelib/plugins/l.py | 6 ++++-- dosagelib/plugins/p.py | 5 +++-- dosagelib/plugins/smackjeeves.py | 6 ------ scripts/smackjeeves.py | 6 ++++++ 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dosagelib/plugins/e.py b/dosagelib/plugins/e.py index 770196d8e..63071eabf 100644 --- a/dosagelib/plugins/e.py +++ b/dosagelib/plugins/e.py @@ -110,10 +110,10 @@ class EvilInc(_BasicScraper): class Exiern(_BasicScraper): url = 'http://www.exiern.com/' - stripUrl = url + '?p=%s' + stripUrl = url + '%s/' imageSearch = compile(tagre("img", "src", r'(http://www\.exiern\.com/comics/[^"]+)')) prevSearch = compile(tagre("a", "href", r'(http://www\.exiern\.com/[^"]+)', after="prev")) - help = 'Index format: n' + help = 'Index format: yyyy/mm/dd/stripname' class ExiernDarkReflections(_BasicScraper): @@ -134,10 +134,10 @@ class ExtraLife(_BasicScraper): class EyeOfRamalach(_BasicScraper): url = 'http://theeye.katbox.net/' - stripUrl = url + 'archive/%s/' + stripUrl = url + 'comic/%s/' imageSearch = compile(tagre("img", "src", r'(http://theeye\.katbox\.net/wp-content/uploads/[^"]+final[^"]+)')) prevSearch = compile(tagre("a", "href", r'(http://theeye\.katbox\.net/comic/[^"]+)', after="previous")) - help = 'Index format: n (unpadded)' + help = 'Index format: stripname' class EarthsongSaga(_BasicScraper): diff --git a/dosagelib/plugins/f.py b/dosagelib/plugins/f.py index 24a4a2749..38c7c0937 100644 --- a/dosagelib/plugins/f.py +++ b/dosagelib/plugins/f.py @@ -45,6 +45,7 @@ class FilibusterCartoons(_BasicScraper): class FirstWorldProblems(_BasicScraper): url = 'http://bradcolbow.com/archive/C5/' stripUrl = url + '%s' + firstStripUrl = 'http://bradcolbow.com/archive/C5/P10/' imageSearch = compile(tagre("img", "src", r'(http://(?:fwpcomics\.s3\.amazonaws\.com|s3\.amazonaws\.com/fwpcomics)/s1-[^"]+)')) prevSearch = compile(tagre("a", "href", r'(http://bradcolbow\.com/archive/C5/[^"]+)', before="prev")) multipleImagesPerStrip = True diff --git a/dosagelib/plugins/l.py b/dosagelib/plugins/l.py index 3f08467bb..b740a785d 100644 --- a/dosagelib/plugins/l.py +++ b/dosagelib/plugins/l.py @@ -10,7 +10,7 @@ from ..util import tagre class LasLindas(_BasicScraper): url = 'http://laslindas.katbox.net/' - stripUrl = url + 'archive/%s/' + stripUrl = url + 'comic/%s/' imageSearch = compile(tagre("img", "src", r'(http://laslindas\.katbox\.net/wp-content/uploads/[^"]+)', after="attachment-full")) prevSearch = compile(tagre("a", "href", r'(http://laslindas\.katbox\.net/comic/[^"]+)', after="previous")) help = 'Index format: stripname' @@ -49,5 +49,7 @@ class LeastICouldDo(_BasicScraper): url = 'http://leasticoulddo.com/' stripUrl = url + 'comic/%s' imageSearch = compile(tagre("img", "src", r'(http://cdn\.leasticoulddo\.com/wp-content/uploads/\d+/\d+/\d{8}\.\w{1,4})')) - prevSearch = compile(r'Previous') + prevSearch = compile(tagre("a", "href", r'(http://www\.leasticoulddo\.com/comic/\d+/)', after="Previous")) + starter = indirectStarter(url, + compile(tagre("a", "href", r'(http://www\.leasticoulddo\.com/comic/\d+/)', after="feature-comic"))) help = 'Index format: yyyymmdd' diff --git a/dosagelib/plugins/p.py b/dosagelib/plugins/p.py index ebedb2c8a..b9613264d 100644 --- a/dosagelib/plugins/p.py +++ b/dosagelib/plugins/p.py @@ -103,7 +103,7 @@ class PiledHigherAndDeeper(_BasicScraper): url = 'http://www.phdcomics.com/comics/archive.php' starter = bounceStarter(url, compile(r'')) stripUrl = url + '?comicid=%s' - imageSearch = compile(r'') help = 'Index format: n (unpadded)' namer = queryNamer('comicid', usePageUrl=True) @@ -160,7 +160,8 @@ class PunksAndNerdsOld(_BasicScraper): help = 'Index format: yyyymmdd' -class PlanescapeSurvival(_BasicScraper): +# Broken navigation: prev link at http://planescapecomic.com/201.html points to same URL. +class _PlanescapeSurvival(_BasicScraper): url = 'http://planescapecomic.com/' stripUrl = url + '%s.html' imageSearch = compile(r'src="(comics/.+?)"') diff --git a/dosagelib/plugins/smackjeeves.py b/dosagelib/plugins/smackjeeves.py index b47054587..6cde1684e 100644 --- a/dosagelib/plugins/smackjeeves.py +++ b/dosagelib/plugins/smackjeeves.py @@ -204,7 +204,6 @@ add('DBON', 'http://dbondoujin.smackjeeves.com/comics/', u'An 8 issue long cross add('DDSR', 'http://ddsr.smackjeeves.com/comics/', u'A sprite comic that has no Sonic sprites! Seriously, all customly done. Join two friends and there crazy adventures involving demons, robots, explosions and shiny things.', False, True) add('DOUBLEK', 'http://doublek.smackjeeves.com/comics/', u'Miami Vice meets Gurren Lagann in the most explosive, high-octane buddy cop comedy in the HISTORY OF POLICE and/or INTERNET FAN COMICS', False, True) add('DanielleDark', 'http://danielledark.smackjeeves.com/comics/', u"Danielle Dark is a vampire trying to make it in the mortal world. It isn't easy, and she is discovering that she is different than other vampires in many ways.", False, True) -add('Darkkyosshorts', 'http://darkkyo123-shorts.smackjeeves.com/comics/', u'Just some short stories by me. They very in what there about. The stories are form 2009 to the present.', True, True) add('Darkoly', 'http://darkoly.smackjeeves.com/comics/', u'The STORY... It all began when a mysterious "Lightstream" enters the world and within a month passed,mysterious portals/gateways started to appear from nowhere.Unknown creatures and beings begins to surface and in just a short period of time the world just turned into a massive hunting ground to the "possessed".', False, True) add('DavidDoesntGetIt', 'http://daviddoesntgetit.smackjeeves.com/comics/', u'A diary comic of me and my three siblings.', False, True) add('DaysGoBy', 'http://daysgoby.smackjeeves.com/comics/', u"YAY! my first comic! but i must warn i'm not know for my consistence so this may not get update for lengthy periods.. PLOT: It's a furry comic about Trixxie living her life, hanging with friends, working, and trying to find that special someone... WARNING! Boys Love, Girls love and hetero", True, True) @@ -281,7 +280,6 @@ add('FruitMachine', 'http://fruitmachine.smackjeeves.com/comics/', u"Jason Fello add('FruitloopAndMrDownbeat', 'http://fruitbeat.smackjeeves.com/comics/', u"After hitting a bump in the road of life, Danny Lawson ended up moving back to the city where he attended college. His next door neighbor, Alan Taylor, is a senior in high school who falls in love with Danny almost immediately. AND THUS THEY BECAME FRUITLOOP & MR. DOWNBEAT. (bad intro, yes.) THIS COMIC IS PRETTY GAY. IT HAS BL AND GL IN IT (and straight people!) But regardless, as it's intended to be a comedy, I don't think you have to be a fan of the whole 'yaoi/yuri' thing to enjoy it. (contains boy/boy, girl/girl, foul language, cartoon violence, some sexual themes) Schedule is being removed for the time being. Updates whenever the author can get her crap together w> Warning: Yaoi, BL, BoyxBoy action Don't like, don't read. Author applications closed!", True, True) #add('NekotheKitty', 'http://www.nekothekitty.net/comics/', u"Comic about a cute little kitty cat who's really quite cheerful about how much he hates everything. Ireland's #1 webcomic, online since 2002!", False, True) add('NemesisKatharsis', 'http://nemesiskatharsis.smackjeeves.com/comics/', u"Jove is the descendant of the most powerful magical clan in Nokt'ader - the Aerin. She is expected to be a magic user of legend by her parents and clan. Unfortunately, she cannot even learn how to... levitate. With almost no affinity for magic, and considered the black sheep of her family, Jove harbors the ridiculous notion of one day becoming the land's... Arch Mistress of Magic! Updating schedule: heavily variable! :s I'm also working on Sailor Moon: The Enemy Next Door, and that's my priority :) but as this here is MY baby, I'll do my best to post often Genre: fantasy/adventure/romance Edit 10.12.2012: Regarding updating, I've decided to get more regular and update at least ONCE per week. What day of the week that will be is literally dependent on the position of the stars. But at least I'm introducing some structure. Yay!", False, False) -add('Nemutionpobae', 'http://pobae.smackjeeves.com/comics/', u"(loosely translated as: Nemution's jewel; this does not a literal form of jewel) ************** Once every 100 years, Nemution will be formed into a jewel his sould searching for his eternal lover. Once merged they must both accept each other for a complete transformation. However, because the lover is unable to recognize and prepare ones body for the merge, they destroy each other and are once again parted for 100 years; till nemution rises again and his reborn eternal lover is called to him. After many years of separation, Nemution has once again found his eternal lover; a promise and a vow, forever kept. But a new torment awaits the eternal lover. NOTES: (due to a friend wanting to see this comic on here) 1. the comic was re-drawn back in 2009, so the art is a bit wonky till it catches up 2. The comic content does contain yaoi, However, due to smack jeeves rules and regulations: that content WILL NOT be seen on this site, I can however leave a link to the actual page. so certain pages are edit heavily. 3. the prologue DOES NOT contain yaoi. 4. posting will be daily till it's caught up to the latest page: 1 page a day.", False, True) add('NeoCrystalAdventures', 'http://neocrystaladventures.smackjeeves.com/comics/', u'My best, and longest lasting attempt at a sprite comic! Has a mix of things, ideas, and characters in it! All put into a dramatic/romantic/comedy setting! Currently numbering at 1200+ comics and still going strong, this comic is updated daily if at all possible! Enjoy your stay, and have fun reading!', False, True) add('NiceKitty', 'http://nicekitty.smackjeeves.com/comics/', u"About Nice Kitty: It is the touching coming of age story of a young boy and his cuddly feline companion, trying to find love and acceptance in a world fraught with peril and harsh realities. Will the mysterious new friend they meet one fateful day be able to answer the call of their lonely hearts, and bring some life and color to their otherwise blue and lonely world? You'll laugh, you'll cry, you'll pray for it to stop, but It won't because you can't stop the rock and why are you still reading this? You came to read the comic so READ already. This drivel certainly won't help you understand the story any better. Get going! And just remember: Be nice to your kitty, and he'll be NICE to you..........", False, False) add('NighHeavenandHell', 'http://newnighheavenandhell.smackjeeves.com/comics/', u'A grudge as old as mankind. Three travelers entwined by fate. This road, once travelled, can never be undone. Between damnation & salvation, you find the truth hidden by God, Nigh Heaven & Hell. //Updates Every Friday//', False, True) @@ -516,7 +511,6 @@ add('PokemonMysteryDungeonStrikedownChronicles', 'http://pmdsc.smackjeeves.com/c add('PokemonMysteryDungeonTales', 'http://pmdt.smackjeeves.com/comics/', u'Vexx and Mack of the Super Ranked Team, GreenFire, set out on a mission of their own, to explore the world outside their Island! However, things do not go according to plan when enemies of old appear with plans of their own. Along with their new team-mates, friends and allies, Vexx and Mack set a course to continue helping the Pok\xe9mon of the world while exploring the new world around them. This is their Tale... Based on the popular Pok\xe9mon Mystery Dungeon \xa9 series. Pok\xe9mon is copyrighted \xa9 to Nintendo/GameFreak Updates once a week, or whenever possible', False, True) add('PokemonSAKOHJU', 'http://sakohju.smackjeeves.com/comics/', u"Different adventures kick off with different characters in different parts of the Pokemon world! There's darkness in the Pokearth, and it's not just Team Plasma. A group by the name of Team Midnight is on the rise. However, their biggest obstacle appears when the protoganists come together to form SAKOHJU, an organization dedicated to ridding the Pokemon world of evil. As the fight rages, it's unclear how many will make it out alive, as it all comes down to SAKOHJU vs. Team Midnight... ____________________ I started this comic a couple years ago so some parts of it (beginning especially) aren't all that good. It's become more of a sketch comic and it's a learning experience for me, I improve and as my first project I'm seeing this thing to the end no matter what. I also have lots of characters based off real people. I will say that now. Also breaks the fourth wall. A LOT.", False, True) add('Ponzi', 'http://ponzi.smackjeeves.com/comics/', u"About: It's a new beginning, a new age and a new world where people enjoy advanced industrial games, technology and entertainment. At this moment, after a mysterious broadcast, the world media has launched a new tournament called N.E.O.SIN. The prize for this competition is unlike any other, the winners will receive an evolutionary enhancement of their body. This enhancement will improve their physical and mental capacity as a human being. Ever dream of super speed, super vision or any other kind of supernatural enhancement? Who will win the key to the evolution of the human race? (You can read more info on the official site: www.pigtailstudio.com )", False, True) -add('PrettyUgly', 'http://prettyugly.smackjeeves.com/comics/', u'Katie Smith was recently cheated on by her boyfriend Kyle, with none other than her best friend Sarah! Dejected and alienated because of her plain appearance, she suddenly finds herself surrounded by new friends who turn out to be just as problematic as she is. Will she ever be able to be the girl she knows she is inside? NOTES FOR FIRST-TIME READERS: -Chapters 1, half of 2, and 6 and up, are all colored. Chapters 3-5 will be colored eventually, so please excuse the sketches! (They are still readable, don\'t worry!) -There are lots of characters. At the end of Chapter 1, I have character reference sheets. You may want to refer back to them if you get confused. (Sorry...) -Pretty Ugly updates randomly, but usually once a week/every other week, because I like to have at least 3 pages done before I post them. So definitely take advantage of the "save your place" options (: Thanks for reading!!!! *hugs you*', False, False) add('Puck', 'http://puck.smackjeeves.com/comics/', u'Puck is a weekly webcomic that, in the words of one fan, is "mostly irreverent humor concerning a pretty girl with freckles and a hot she-devil who wears fan-service costumes." That\'s about right. Surreal fantasy slice-of-life crazy-type stuff about the world\'s funniest redhead! Updates Tuesday.', False, True) add('PulseandBolt', 'http://pulse-bolt.smackjeeves.com/comics/', u'Two female human batteries become armored superheroes.', False, True) add('PumpkinFlower', 'http://pumpkinflower.smackjeeves.com/comics/', u"CONTAINS: BL When being stalked by an amnesiatic ghost is the best thing going for you there may be a problem. Now if only the ghost could understand the term 'personal space.'", False, True) diff --git a/scripts/smackjeeves.py b/scripts/smackjeeves.py index 345eee138..eccc8a2c6 100755 --- a/scripts/smackjeeves.py +++ b/scripts/smackjeeves.py @@ -24,21 +24,26 @@ exclude_comics = [ "Authorbattlesthevideogame", # missing images "BambooArmonicKnightsGuild", # missing previous link "ClubLove", # does not follow standard layout + "Darkkyosshorts", # missing images "DeSTRESS", # does not follow standard layout "DollarStoreCaviar", # broken images "DreamCatcher", # does not follow standard layout "EdgeofDecember", # missing images "Fumiko", # does not follow standard layout "FurryExperience", # timeout + "GART", # does not follow standard layout "GBAsCrib", # timeout "HEARD", # missing images + "IwillbenapoSpamDump", # missing images "JennyHaniver", # does not follow standard layout "KiLAiLO", # does not follow standard layout + "KirbysoftheAlternateDimension", # missing images "LoudEra", # does not follow standard layout "LunarHill", # does not follow standard layout "MyLifewithFelENESPANOL", # does not follow standard layout "MylifewithFel", # does not follow standard layout "NegativeZen", # does not follow standard layout + "Nemutionpobae", # does not follow standard layout "NightShot", # does not follow standard layout "NormalIsBoring", # does not follow standard layout "Okamirai", # images are 403 forbidden @@ -47,6 +52,7 @@ exclude_comics = [ "PicturesofYou", # does not follow standard layout "PlatonicManagementDilemma", # missing images "Pornjunkiesstrip", # does not follow standard layout + "PrettyUgly", # does not follow standard layout "Project217", # does not follow standard layout "Ribon", # does not follow standard layout "SecretSanta2011", # missing images