Fix broken comics

doc/changelog.txt

@@ -6,8 +6,16 @@ Features:
   Closes: GH bug #39
 
 Fixes:
-- comics: Fixed Oglaf, removed AetheriaEpics
+- comics: Fixed all DrunkDuckk comics since the domain has moved.
+- comics: Fixed AllTheGrowingThings, AxeCop, BookOfBiff, BroodHollow,
+  Carciphona, CatAndGirl, CatsAndCameras, ChainsawSuit, ElGoonishShive,
+  EvilInc, Garanos, GleefulNihilism, LeastICouldDo, MysteriesOfTheArcana,
+  NineteenNinetySeven, NoNeedForBushido, Oglaf, OneQuestion,
+  OverCompensating, ScenesFromAMultiverse, Shivae, Spinnerette,
+  Wigu, Wonderella, Wulffmorgenthaler
   Closes: GH bug #41
+- comics: Removed broken AetheriaEpics, ChuckBrain, Fallen, HMHigh,
+  IanJay, InsideOut, Nodwick, WebcomicsNation_ClownSamurai
 
 
 Dosage 2.5 (released 18.7.2013)

dosagelib/plugins/a.py

@@ -163,7 +163,7 @@ class AllTheGrowingThings(_BasicScraper):
     rurl = escape(url)
     stripUrl = url + '%s/'
     firstStripUrl = stripUrl % '2009/04/21/all-the-growing-things'
-    imageSearch = compile(tagre("img", "src", r'(%sfiles/comics/[^"]+)' % rurl))
+    imageSearch = compile(tagre("img", "src", r'(%sfiles/[^"]+)' % rurl))
     prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl, after="prev"))
     help = 'Index format: yyyy/mm/dd/strip-name'
 
@@ -354,17 +354,13 @@ class AxeCop(_BasicScraper):
     url = 'http://axecop.com/'
     rurl = escape(url)
     starter = bounceStarter(url,
-        compile(tagre("a", "href", r'(%scomic/episode-\d+/)' % rurl, after="navi-next")))
+        (
-    stripUrl = url + 'comic/episode-%s/'
+          compile(tagre("a", "href", r'(%scomic/page-\d+-[^"]+/)' % rurl, after="navi-next")),
+          compile(tagre("a", "href", r'(%scomic/[^"]+/)' % rurl, after="navi-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/episode-\d+/)' % rurl, after="navi-prev"))
+    prevSearch = compile(tagre("a", "href", r'(%scomic/page-\d+-[^"]+/)' % rurl, after="navi-prev"))
-    help = 'Index format: number'
+    help = 'Index format: usually page-number-stripname'
-
-    @classmethod
-    def namer(cls, imageUrl, pageUrl):
-        extension = imageUrl.rsplit('.', 1)[1]
-        episode = pageUrl.rsplit('-', 1)[1]
-        episode = episode.strip('/')
-        return 'AxeCop-%s.%s' % (episode, extension)
-

dosagelib/plugins/b.py

@@ -185,7 +185,7 @@ class BobWhite(_BasicScraper):
 
 class BookOfBiff(_BasicScraper):
     description = u'The Book of Biff - new adventures every monday through friday'
-    url = 'http://www.thebookofbiff.com/'
+    url = 'http://thebookofbiff.com/'
     stripUrl = url + '%s/'
     firstStripUrl = stripUrl % '2006/01/02/4'
     imageSearch = compile(tagre("img", "src", r'([^"]+/comics/[^"]+)'))
@@ -319,10 +319,10 @@ class BroodHollow(_BasicScraper):
     description = u'Broodhollow - A MWF cosmic horror adventure comic by Kris Straub'
     url = 'http://broodhollow.chainsawsuit.com/'
     rurl = escape(url)
-    stripUrl = url + '%s/'
+    stripUrl = url + 'page/%s/'
     firstStripUrl = stripUrl % '2012/10/08/broodhollow'
-    imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
+    imageSearch = compile(tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/[^"]+)' % rurl))
-    prevSearch = compile(tagre("a", "href", r'(%s\d+/\d+/\d+/[^"]+)' % rurl, after="prev"))
+    prevSearch = compile(tagre("a", "href", r'(%spage/\d+/\d+/\d+/[^"]+)' % rurl, after="prev"))
     help = 'Index format: yyyy/mm/dd/stripname'
 
 

dosagelib/plugins/c.py

@@ -36,9 +36,9 @@ class Carciphona(_BasicScraper):
     url = 'http://carciphona.com/'
     stripUrl = url + 'view.php?page=%s&chapter=%s'
     imageSearch = compile(tagre("div", "style", r'background-image:url\((_pages[^)]*)\)'))
-    prevSearch = compile(tagre("a", "href", r'(view\.php?[^"]*)', after="prevarea"))
+    prevSearch = compile(tagre("a", "href", r'(view\.php\?[^"]*)', after="prevarea"))
-    latestSearch = compile(tagre("a", "href", r'(view\.php?[^"]*)') +
+    latestSearch = compile(tagre("a", "href", r'(view\.php\?[^"]*)') +
-      tagre("div", "class", "linkslast"))
+      tagre("span", "class", "linkslast"))
     help = 'Index format: None'
     starter = indirectStarter(url, latestSearch)
 
@@ -90,6 +90,12 @@ class CatAndGirl(_BasicScraper):
     prevSearch = compile(tagre("a", "href", r'([^"]+)')+r"[^<]+Previous</a>")
     help = 'Index format: n (unpadded)'
 
+    def shouldSkipUrl(self, url):
+        """Skip pages without images."""
+        return url in (
+            self.stripUrl % '4299',
+        )
+
 
 class Catena(_BasicScraper):
     url = 'http://catenamanor.com/'
@@ -105,11 +111,11 @@ class CatsAndCameras(_BasicScraper):
     description = u'Just when you thought it was safe to go to the photographer'
     url = 'http://catsncameras.com/cnc/'
     rurl = escape(url)
-    stripUrl = url + '?p=%s'
+    stripUrl = url + '?comic=%s'
-    imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
+    imageSearch = compile(tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/[^"]+)' % rurl))
-    prevSearch = compile(tagre("div", "class", r'nav-previous') +
+    prevSearch = compile(tagre("span", "class", r'mininav-prev') +
         tagre("a", "href", r'(%s[^"]+)' % rurl))
-    help = 'Index format: nnn'
+    help = 'Index format: stripname'
 
 
 class ChainsawSuit(_BasicScraper):
@@ -118,8 +124,8 @@ class ChainsawSuit(_BasicScraper):
     rurl = escape(url)
     stripUrl = url + '%s/'
     firstStripUrl = stripUrl % '2008/03/12/strip-338'
-    imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
+    imageSearch = compile(tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/[^"]+)' % rurl))
-    prevSearch = compile(tagre("a", "href", r'(%s\d+/\d+/\d+/[^"]+)' % rurl) +
+    prevSearch = compile(tagre("a", "href", r'(%scomic/\d+/\d+/\d+/[^"]+)' % rurl) +
         tagre("img", "alt", r'previous'))
     help = 'Index format: yyyy/mm/dd/stripname'
 
@@ -185,19 +191,6 @@ class Chisuji(_BasicScraper):
     help = 'Index format: yyyy/mm/dd/strip-name'
 
 
-class Chucklebrain(_BasicScraper):
-    url = 'http://www.chucklebrain.com/main.php'
-    starter = indirectStarter(url,
-      compile(tagre("a", "href", r'(/main\.php\?img\=\d+)', quote="'") +
-              tagre("img", "src", r'/images/last\.jpg', quote="'")))
-    stripUrl = url + '?img=%s'
-    firstStripUrl = stripUrl % '19'
-    imageSearch = compile(tagre("img", "src", r'(/images/strip[^"]+)'))
-    prevSearch = compile(tagre("a", "href", r'(/main\.php\?img\=\d+)', quote="'") +
-              tagre("img", "src", r'/images/previous\.jpg', quote="'"))
-    help = 'Index format: nnn'
-
-
 class ChugworthAcademy(_BasicScraper):
     url = 'http://chugworth.com/'
     stripUrl = url + '?p=%s'
@@ -437,7 +430,10 @@ class CyanideAndHappiness(_BasicScraper):
 
     def shouldSkipUrl(self, url):
         """Skip pages without images."""
-        return url in (self.stripUrl % "3082",)
+        return url in (
+            self.stripUrl % "3082",
+            self.stripUrl % "3360", # video
+        )
 
     @classmethod
     def namer(cls, imageUrl, pageUrl):

dosagelib/plugins/comicfury.py

@@ -43,25 +43,20 @@ add('933dollars', 'http://933dollars.webcomic.ws/', u'')
 add('AAB', 'http://AAB.webcomic.ws/', u"This is where I plan on sticking all my non-cannon Frostbound, and miscellaneous art for your enjoyment. Any fan art that get's draw for Frostbound will also end up here.")
 add('Abrickishspacecomic', 'http://Abrickishspacecomic.webcomic.ws/', u'A photographic comic made with LEGO space.')
 add('AccidentallyonPurpose', 'http://Accidentally-on-Purpose.webcomic.ws/', u'A Warlock, a Guitarist, and a Host for a demon live under the same roof and are in a three way relationship. As things go upside down and right side up again, there seems to be quite a few issues in their lives, even though the three of them seem to still make it through okay, minus the huge bills they have to pay to their landlord...')
-add('Acelestialstory', 'http://acelestialstory.webcomic.ws/', u'Set in a nameless world where the gods of the sky and the gods of the earth once violently battled against each other, "A Celestial Story" is about a nameless Celestial and a curious Urie who travel to the ends of the earth to discover the truth behind the cause of the Urie-Celestial War. The thing is, do they really want to know the truth?')
 add('Acryden', 'http://acryden.webcomic.ws/', u"Hey everyone we're back on track with the pages. It was a mess up on my part with the dates. Of course our main site always updates first and has the latest information. Feel free to visit us at Acryden.com")
 add('Actingout', 'http://actingout.webcomic.ws/', u"When a bunch of kids with very different personalities come together in their school's drama club, a lot more goes on in the auditorium than you may think! Follow the dramatic lives of Clinton, Ollie, Tasha, and the rest of the gang as they set the scene and put on a heck of a performance, both on and off the stage! Updates are on Sundays and Thursdays!")
 add('Adventuresofjonas', 'http://adventuresofjonas.webcomic.ws/', u"These short, scribbely orange comics are excerpts from my life through my own slanted viewpoint .. they are totally out of context. Its mostly disjointed vignettes, relationships, inside jokes, a couple nifty thoughts and dumb adventures sprinkled on over that. somewhere between a soapdrama and a gag strip and a traffic accident. Life. whatever. if you prefer to read it in spanish, check out 'las Aventuras de JONAS!' at http://jonas.subcultura.es/")
 add('Afairtrade', 'http://afairtrade.webcomic.ws/', u'')
 add('Afrodays', 'http://afrodays.webcomic.ws/', u'Inspired By Life Nope, nope turkeys')
-add('Ahtiventures', 'http://ahtiventures.webcomic.ws/', u"The story of a fish boy and his bird best friend as they go on adventures in the mid-1700s. More will be added here as the story goes along but let's not spoil the fun.")
 add('Albinobros', 'http://albinobros.webcomic.ws/', u'Two guys at work shoot the breeze and do their best to not break the fourth wall.')
 add('Alexanderandlucas', 'http://alexanderandlucas.webcomic.ws/', u'Alex and Lucas are roomies and old friends. Follow their lives as they try to make it through the life of high school graduates. Hilarity, and mainly drama, ensues! This is a reboot of a previous comic I had on Drunk Duck.')
 add('Alittlebitofeverything', 'http://alittlebitofeverything.webcomic.ws/', u"Gag-a-day comic featuring the adventures of Lucky, Swifty, their friends & family. Expect laughs, classic muscle cars, and stuff blowing up... but hopefully not the muscle cars. We don't have the budget to replace them.")
 add('Allthebbqsauce', 'http://allthebbqsauce.webcomic.ws/', u'A comedy strip about antics and semantics.')
 add('Alone', 'http://Alone.webcomic.ws/', u'One day when Arianna wakes up, something\xb4s different... The entire world is gone, she sets out on an exciting adventure to find out what\xb4s going on.')
-add('Aloonaticstale', 'http://aloonaticstale.webcomic.ws/', u"A king needs a team of elite experts to help fight crime and uphold the peace of Mercia. Unfortunately, he hires crazy people for the job. This didn't quite pan out the way he thought it would.")
 add('AmericanNerd', 'http://AmericanNerd.webcomic.ws/', u"The adventures of the epynonymous nerd in Japan, going through the usual JRPG motions alongside a blonde amnesiac protagonist, a nature spirit, a Digital monster, a Sonic the Hedgehog cosplayer, and a few characters I haven't gotten around to yet. Whacky shennanigans ensue.")
 add('Americanextremists', 'http://americanextremists.webcomic.ws/', u"Politics 'n stuff")
-add('Amity', 'http://amity.webcomic.ws/', u'Daniel Simon wakes up in a strange land and comes face to face with a variety of talking animals, including a mountain lion named Amity. They soon find themselves on a quest to save the world.')
 add('Amtheatre', 'http://amtheatre.webcomic.ws/', u"Do you like mid-low fantasy? Do you like comedy? Are you not offended by characters who are missing important appendages? Maybe you should read this. Or maybe not. Is this another DnD comic? No. But is it filled with cheap pop culture references? Hell no. Why is the main character a girl with no legs or right arm? Because I'm a sick human being, okay???")
 add('AnK', 'http://AnK.webcomic.ws/', u"Synopsis: For the first time in millennia, Arecace is on the brink of war. Cyden, an Esarian rebel looking to achieve equal rights for his race conspires to overthrow the world's central government through violence and attrition. His nephew, Drake, may be the only one who can stop him. Both want to enlist the help of an young Esarian, Mathaeis who has only just learned what he is, and may be the key to either one's success by his association to a once formidable Esarian, Azrisar. Themes: power, betrayal, civil rights, liability Genre: fantasy, political thriller, action Written Summary of completed chapters here: sta.sh/08f2dfrpf8u")
-add('Angelguardian', 'http://angel-guardian.webcomic.ws/', u'Kyrsiel is a young apprentice of Guardian Angel. His teacher, Gersiel, is responsible he achieves a successful test mission to graduate. Moreover, Gersiel may not continue his evolution as Angel until Kyrsiel, who is his last student, graduates. And this is not easy! Both will play an important mission on Earth:: Protect Midori, a young student girl, from the demons that are chasing her. Will Kyrsiel do it successfully or will he fail again? Updates: Tuesdays and Fridays Story and drawings: \xa9 Reenave http://reenave.deviantart.com Translated into English by: Louise Brown http://cast-into-the-abyss.deviantart.com/')
 add('Angryfaerie', 'http://angryfaerie.webcomic.ws/', u"Not all faeries are happy, cheerful little forest creatures. One, in fact, is downright ornery. She's mean-spirited, violent.. and ANGRY. Welcome to the twisted world of Angry Faerie.")
 add('Antarcticbroadcasting', 'http://antarcticbroadcasting.webcomic.ws/', u'Stickmen and their shenanigans-- inspired by life and other disasters.')
 add('Anthrosanddungeons', 'http://Anthrosanddungeons.webcomic.ws/', u'Welcome to the Inn of the Anthros and Dungeons. Pull up a bar stool and order a pint. Listen to the tales told by the owners of this fine establishment of their years as adventurers and how they escaped their births in bondage. They have many tales to tell, and are always seeking an ear to listen to their tales.')
@@ -94,10 +89,8 @@ add('Bigfoldy', 'http://bigfoldy.webcomic.ws/', u'The Big Foldy: A tale of frien
 add('Bimorphon', 'http://bimorphon.webcomic.ws/', u'The humans are not alone in the universe, as two small androids travel from planet to planet, attempting to defend them from annihilation. After reaching Earth, they meet their human hosts and defend it from an evil that\u2019s been unstoppable. Can the humans help the androids protect Earth? Or will they only postpone the inevitable?')
 add('Biosyte', 'http://biosyte.webcomic.ws/', u'Michael Treble, an everyday man who seems to answer any question thrown at him with ease. Explaining things is a jiffy for him. Or so it would seem. He will receive a rather... gross awakening from his "high and mighty" persona when a biological weapon-a prototype parasitic virus- is suddenly introduced into his system. And what do you know?! This thing has been granted the power of sentience! (Occasional Updates)')
 add('Blackwoods', 'http://Blackwoods.webcomic.ws/', u'The Blackwoods is a comic about a teenage girl, Sadie, who ends up having to move in with her aunt. Her aunt works as a maid for a peculiar family in a gigantic mansion from the 1800s. Sadie discovers that the family who lives in the mansion, along with the servants, act as though they are still living in the 1800s. They never leave the mansion, and strange incidents occur which cause Sadie to unravel a dark and terrible secret that the Blackwoods have been hiding for centuries.')
-add('Blobworld', 'http://blobworld.webcomic.ws/', u'A story of swordsman, scientists, and time travel that follows protagonist Z and his allies as they prepare for an approaching battle against legendary swordsman Him and He.')
 add('BlueBloodHeroes', 'http://BlueBloodHeroes.webcomic.ws/', u'Six children possess a genetic irregularity that grants them super-human powers and turns their blood blue. As criminals and injustice begin to rise in their hometown, they decide to form a superhero team.')
 add('Bobbythefetus', 'http://bobbythefetus.webcomic.ws/', u"A fetal adventures of a fetus (which is not an e!). It features a Svalbardian/Swedish fetus(which might be a fetus, but isn't) named Bobby located somewhere in Iceland, adjustment disordered narrator who hates being seen, Roberta the fetus (who is not an e!) who is Bobby's girlfriend, the author himself, a sock puppet and a minor deity destined to ruin the world... This is a mirror of the DrunkDuck comic with the same name and author...")
-add('BookOfLiesComic', 'http://BookOfLiesComic.webcomic.ws/', u'In a strange mansion far to the north there is a strange library and at the center of the library is a book that may be the key to saving the world...or destroying it. This is the story of the book and the stories within it.')
 add('Booksdontworkhere', 'http://booksdontworkhere.webcomic.ws/', u'A meta flavored webcomic with no 4th wall and a plot about a webcomic actress and the challenges she has to face. You know imaginary scripts, unreliable narrators, plot holes, meta walls, wacky physics, mad science, and budget cuts. Updates Monday, Wednesday, and Friday.')
 add('Boritom', 'http://boritom.webcomic.ws/', u'The scintillating adventures of an alien, a redneck and a floating orb of death in the bucolic setting of fictional "Utopia Dell, Arizona." The strips currently running are all of the "classic Boritom" adventures from the strip\'s original run from 2000 to 2006. In all, there were about 325 strips, so I am currently updating 5 days a week in order to get people caught up. As we get closer to the "Big Day," where brand new strips start coming up, there will be lots of information and ballyhoo letting everyone know what to expect... to an extent. Spoilers, Doctor... Spoilers... Once new strips start coming out, however, the updates will probably scale back to once or twice a week.')
 add('Brickland', 'http://brickland.webcomic.ws/', u'Tales of Brickland centers around four groups of people: Kristy and Drew (adventurers who traveled to another continent for, well, adventures), Gina (a ninja), Captain Slade and his pirate crew, and Queen Toshiko, returned from the dead and bent on world domination. Again. A silly fantasy comic told with minifigs and bricks that updates every Monday, Wednesday, and Friday.')
@@ -161,10 +154,7 @@ add('EMT', 'http://eMT.webcomic.ws/', u"an experiment in Mental Theatre, externa
 add('Eclipselegend', 'http://eclipselegend.webcomic.ws/', u'A story of war, legends, aliens, explosions and more. A tale of superheroes and villains; of space battles, mad scientists, shadowy plots and dark pasts. This is Eclipse Legend.')
 #add('Educomix', 'http://educomix.webcomic.ws/', u'A parody educational comic about a young man called Dave and his crazy adventures. "Good. I\'ll make toast."')
 add('Elektroanthology', 'http://elektroanthology.webcomic.ws/', u'These are various unrelated comics I have worked on. Everything\'s tagged just in case. They\'re mostly short stories I\'ve done for different anthologies (Copyright also for "Various" because some of these I worked on with someone else as well). Updates whenever.')
-add('Elijahandazuuclassic', 'http://elijah-and-azuu-classic-.webcomic.ws/', u'Eljah and Azuu are an angel and demon forced to live together on earth and challenge each other to duels for the souls of humans who are equally worthy of both heaven and hell.')
 #add('Equsopia', 'http://equsopia.webcomic.ws/', u'Because of black magic, a king and his loyal knight were sent to another world. Now they must find their way home.')
-add('ErraticE', 'http://ErraticE.webcomic.ws/', u'My chaotic, beautiful, sometimes depressing, sometimes overwhelming, always unexpectedly lovely life. Updates whenever possible. (*The Sound Of Music)')
-add('EternalKnights', 'http://EternalKnights.webcomic.ws/', u'Haunted by lost loved ones and the friend she couldn\'t save, suicidal immortal knight Kathryn "Artemis" Kennedy finds reasons to live in new friend Detective Erica Richards and squire Julia... but also finds a way to die.')
 add('EternityC', 'http://EternityC.webcomic.ws/', u'When a compulsion is so strong that it runs your life, you have a complex. When that complex centers around Eternity, you have an adventure. Join Fae as she searches for Eternity and all that it might bring her.')
 add('Everydayabnormal', 'http://everydayabnormal.webcomic.ws/', u"When supernatural, technological, or mythic threats endanger human lives, only the Agency of the Unnatural can rise up to stop them -- but it's the ordinary people who are caught in the crossfire. Jon Grasseschi's ongoing saga explores how people react, live, and just survive when the unexplainable, the impossible, and the just plain weird intrude on their lives.")
 add('Fairydust', 'http://fairydust.webcomic.ws/', u"A world where fantasy creatures are real ought to feel a little complicated. Should you want to visit it, start with the cities, they're full of humans and modern comfort, if you don't mind having a leprechaun for neighbour or a troll driver. But you're not a racist, right?")
@@ -196,7 +186,6 @@ add('Hazardswake', 'http://hazardswake.webcomic.ws/', u"A fantasy webcomic in an
 add('Heavylittlepeople', 'http://heavylittlepeople.webcomic.ws/', u'A (mostly) daily snapshot of the lives of these odd Heavy Little People')
 add('Hellowanderingstar', 'http://hello-wandering-star.webcomic.ws/', u'Muse is a superhero in a world without superheroes. Things ensue!')
 add('Hero', 'http://hero.webcomic.ws/', u'The suprisingly funny exploits of three friends who fight crime any way they can.')
-add('Highlyexperimental', 'http://highlyexperimental.webcomic.ws/', u'Highly Experimental, or "HiEx" for short, is a mixed-genre, psychologically messed-up webcomic about a bunch of young adults in a smalltown science academy. Very small town Updates every Tuesday-ish')
 add('HitmanPiranha', 'http://HitmanPiranha.webcomic.ws/', u'')
 add('Hodgemosh', 'http://hodgemosh.webcomic.ws/', u"It's just kind of stuff. And then there's other stuff, and that's pretty much how it goes.")
 #add('Holon', 'http://holon.webcomic.ws/', u'In 3013, mankind has been driven to the edge of extinction in an intergalactic war. The lifeline of their endangered civilization are HOLONs, space stations established to harvest omnipotent and extremely destructive particles...')
@@ -239,7 +228,6 @@ add('Lifeexplained', 'http://lifeexplained.webcomic.ws/', u'What started as a hu
 add('Lightbulbs', 'http://lightbulbs.webcomic.ws/', u"A wizard from the 10th century is summoned into the 22nd century to act as a teacher. Sadly the wizard can barely conjure magic thanks to a total global lack of other wizards. To restore magic to the world first the world must be restored it's self.")
 add('Lilheroartists', 'http://lilheroartists.webcomic.ws/', u'')
 add('Lint', 'http://lint.webcomic.ws/', u'')
-add('LiteBites', 'http://LiteBites.webcomic.ws/', u'An anthology by various creators.')
 add('Littleblackdress', 'http://little-black-dress.webcomic.ws/', u'They say a "little black dress" will get you anywhere. Dress it up\' dress it down. This one is very special. It will do a lot for you, even if it\'s not always exactly what you wanted.')
 add('Littlejacquie', 'http://littlejacquie.webcomic.ws/', u'Life as seen through the eyes of Little Jacquie')
 #add('Littleredrobo', 'http://littleredrobo.webcomic.ws/', u'A little robot tries to make her way in the future.')
@@ -271,7 +259,6 @@ add('NewAmerica', 'http://NewAmerica.webcomic.ws/', u"The story of a dysfunction
 add('NoSongs', 'http://NoSongs.webcomic.ws/', u'Neil Gaiman meets H.P. Lovecraft meets The Bold And The Beautiful! Join Hector, our undead hero, as he attempts to make some sense out his recent death and resurrection. Magic, mystery and mayhem! Updates Sat-Sun.')
 add('Nojetpack', 'http://nojetpack.webcomic.ws/', u"My Life Without A Jetpack is a biographical webcomic about MaGnUs' life, written by him, with art by Taibox (and sometimes colored by Mindy Lopkin). Published weekly in English and Spanish.")
 add('Nostalgiaofeden', 'http://nostalgiaofeden.webcomic.ws/', u'The future. A colonized planet, Neo-Earth, is our new home. But all would not be well. Our sins have manifested into a being of such pure avarice, pure evil, and of such great size. And it is now heading to the world where its many creators dwells, to consume all of the Universe... Humans have the capacity to fight back, however. To resist. Across the globe, select humans of extraordinary traits will rise and face this threat to our world. From the strangest to the strongest, from the silliest to the serious, everyone\'s struggles become One. The battle for the fate of Creation itself begins! "Sir, put down the microphone." (Occasional Updates)')
-add('NotYoursAmI', 'http://NotYoursAmI.webcomic.ws/', u'Lyle harbors unrequited love for his twin sister\'s boyfriend, Kaden, ever since they were young. Years of suppressed feelings has made him very vulnerable and desperate that he\'ll grab any opportunity to be closer to him...even if it means losing his own identity? But is it really enough? "Not Yours, Am I?" is an original Yaoi / BL practice comic by Cinnamon Rub aka ScottWM. It was first published online in September 2009. --READ FROM RIGHT TO LEFT--')
 add('Notsinceyou', 'http://notsinceyou.webcomic.ws/', u"Your Mirror is an indie rock band in crisis. Zoe, the band leader, isn't sure about her year-old relationship with the band's guitarist, Jenny. Jenny isn't sure if she loves Zoe, but she knows she loves playing in the band. And then tensions rise when the band's tour lands in the backyard of Zoe's high school boyfriend, Rex. Will the band survive one more concert, let alone the rest of the tour? NOT SINCE YOU is a photo webcomic written by Daniel Barlow and Keith Moriarty and starring Vermont's most exciting cartoonists. About the authors: - Daniel Barlow is the co-founder (with Colin Tedford) of the Trees & Hills comic group, a social cartooning organization in New England. With Trees & Hills, Barlow has co-published dozens of comics, including the anthologies SEEDS, SHELTER and WOODS. Barlow lives in Vermont, works in politics and photographs cemeteries. www.danielbarlow.com - Keith Moriarty is a musician and writer living in New Hampshire. That's all you need to know.")
 add('Ocarinaoftim', 'http://ocarinaoftim.webcomic.ws/', u"Welcome to our world! It's strange, but a lot of fun! This reads right to left, in traditional manga style. We should warn you: if you are looking for a serious adventure..you may want to pick something else to read. Also...there is a bit of language. Not a lot of harsh language, but it is there.")
 add('OldHumanCookies', 'http://OldHumanCookies.webcomic.ws/', u"These are the older comics in my Human Cookies series. I've been asked by a few people to upload them, so here they are (well once they're all up anyway) I know some of them look bad, the focuses are terrible, the lighting is...well...yuck, but this is where I started, so they bring back some smiley memories for me, so enjoy the tackiness!")
@@ -282,7 +269,6 @@ add('Outletting', 'http://outletting.webcomic.ws/', u"OutLetting is the first we
 add('Paperstreamer', 'http://paperstreamer.webcomic.ws/', u'A science fiction web comic loosely based on ongoing research and speculation regarding space elevators and alternative space launch methods. The story and images are composed in pulp fiction and noir styles, with some use of 3D models, but with informative sections regarding the related technologies and concepts. The author and artist is an active reader of related technical research papers and hopes to entertain the audience while learning about the space elevator and its related physics concepts.')
 add('ParaFrenic', 'http://ParaFrenic.webcomic.ws/', u'ParaFrenic is an 18 year old half-man/half monster who holds down a daytime job as a video comic actor and spends the rest of his days trying to survive the tough avenues of Vagrant Street.')
 add('Parmeshen', 'http://parmeshen.webcomic.ws/', u"A story of gypsies, rovers and ramblers, of secrets and stories so old they're in the blood and bone of the people who tell them. This is a tale as wild as the wind and the roads. Come, and learn where it leads.")
-add('Patchworkpeople', 'http://patchworkpeople.webcomic.ws/', u"The fungus changes people, and it makes them change themselves. Lets. Yes, it lets them change themselves. Lets. I know, I just said. Oh. do you mean with an apostrophe? Let's? Sure, whatever. Let's change things. Things are Changing.")
 add('Peepsnperks', 'http://peepsnperks.webcomic.ws/', u"A Trio of friends decide to combine their two favorite things - sex and coffee. who doesn't love sex and coffee?! NSFW, unless you work in porn, in which case, call me!")
 #add('Pegwarmers', 'http://Pegwarmers.webcomic.ws/', u"Pegwarmers is basically a rip off of Twisted Kaiju Theater, but with superhero action figures. Occasionally, Transformers, Godzilla, and Star Trek characters will make an appearance, but it's predominantly superhero based. The main three characters are Deadpool, Spider-Man, and Batman.")
 add('PersonaFTW', 'http://PersonaFTW.webcomic.ws/', u'Finally, all of the Persona for the Win series in one convenient location. Containing the works of Persona Won, Persona 2 Win, Persona 3 FTW, and Persona 4TW. Now obviously as parody comics, all of the works do contain spoilers of their respective games. Read at your own risk.')
@@ -296,7 +282,6 @@ add('PobrePucho', 'http://PobrePucho.webcomic.ws/', u'There is a place far under
 add('Poharex', 'http://poharex.webcomic.ws/', u'In a prehistoric world, Poharex rises up to become the defender of all dinosaurs.')
 add('Popcultureskids', 'http://pop-cultures-kids.webcomic.ws/', u'A small group of kids, including a relative newcomer to the town, create a club for their mutual love of TV, music, movies, etc. My influences include Krazy Kat, Pogo, Bloom County and Calvin & Hobbes.')
 add('Poussiere', 'http://poussiere.webcomic.ws/', u"Un monde o\xf9 les cr\xe9atures fantastiques existent ne peut qu'\xeatre un peu compliqu\xe9. Si vous voulez le visiter, commencez donc par les villes, c'est plein d'humains et de confort moderne, tant que \xe7a ne vous d\xe9range pas d'avoir un lutin pour voisin ou un troll pour chauffeur. Mais vous n'\xeates pas racistes, n'est-ce pas?")
-add('Princeofcats', 'http://princeofcats.webcomic.ws/', u'')
 add('ProjectGTH', 'http://ProjectGTH.webcomic.ws/', u'A story about a genetically engineered girl made to be a killing machine. Who now tries to live a normal life after escaping her creators, but is still haunted by her past')
 add('Proportionalexcitability', 'http://proportionalexcitability.webcomic.ws/', u'The mostly real life adventures of two sisters. Updates Mondays.')
 add('Pulse', 'http://pulse.webcomic.ws/', u'Annie "Pulse" Chang, and Tabitha "Bolt" Greene, two female human batteries become armored super-heroines.')
@@ -308,7 +293,6 @@ add('Randomthoughts', 'http://randomthoughts.webcomic.ws/', u"Yeah so this reall
 add('Rangerrandom', 'http://rangerrandom.webcomic.ws/', u'Basically, where I put my unrelated art, or art not important enough to be mentioned.')
 add('Raspcat', 'http://raspcat.webcomic.ws/', u"The story of Upir's Mark, the most shocking band in Siberia and possibly the Universe.")
 #add('Ravenwolf', 'http://ravenwolf.webcomic.ws/', u'Due to human negligence the world as we know it has ended and been reborn. The animal spirits that guide man giving them the forms of animals so that they would be able to survive in this new wilderness. Though now carrying the form of beasts man has not forgotten the place they once had, as an existence greater then just what nature wanted of them, an existence above all. Those that worked to gain their humanity are known as domestics, while those who wished to follow the rolls the spirits had given them were known as wilds. Both groups grew arrogant and hateful of one another, the wilds saw the domestics as selfish monsters, for they were returning to the ways that had once destroyed the world, while the domestics saw the wilds as primitive beings afraid of progress, they no better than wild animals. The raven and the wolf spirits grew tired of the destruction and fighting, and sided with the wilds in their ideals, the domestics only capable of further destroying nature. In their anger they marked a tribe of wilds with a curse, they being removed from the sacred circle of life, unable to hunt or grow their own food, their souls never able to move on while their bodies are unable to return to the earth when they died. The curse upon them only broken once the domestics are gone once and for all. The cursed tribe now known to all by the name of the spirits whom cursed them. \u2018Raven Wolf\u2019')
-add('Rebuildofgenericmanga', 'http://rebuildofgenericmanga.webcomic.ws/', u'')
 add('RecklessComix', 'http://RecklessComix.webcomic.ws/', u'We are a couple of guys (or a few sometimes) With a camera and too much free time at work... Enjoy us')
 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'')
@@ -335,7 +319,6 @@ add('Shatterrealm', 'http://shatterrealm.webcomic.ws/', u'Iconoclasts clash as w
 add('Sinjetpack', 'http://sinjetpack.webcomic.ws/', u'Mi Vida Sin Un Jetpack es un comic autobiogr\xe1fico sobre la vida de MaGnUs, escrito por \xe9l, con arte de Taibox (ocasionalmente coloreado por Mindy Lopkin). Publicado semanalmente en ingl\xe9s y espa\xf1ol.')
 #add('Sketchy', 'http://sketchy.webcomic.ws/', u'Absurdly and charmingly absurd adventures that will make you say "Gosh!" Updates M-F.')
 #add('Slightlyaboveaverage', 'http://slightlyaboveaverage.webcomic.ws/', u'Keiko Tachibana is an average High school girl. Scratch that. She\'s a self proclaimed "Slighty above average" High school girl who has dedicated herself to being only moderately better than the social norm. However one day she gets a visit from someone Way over the top. An inter dimensional cutie whom goes by the name Llla-Elac Ngtholi Cllegogg, also known as "Laila" to humans. She has come to destroy the sanity, and lives of everyone at Daisuke Ryuzaki high school. However, poor Keiko seems to be the only one at school whom has noticed this terrifying beast, and to make matters worse, she\'s staying at her house!! Will Keiko be driven insane by the ramblings of this terrible alien and her Slightly above average lifestyle tossed to the wind? Or will she succeed in defeating this strange alien menace!? Find out in this incredibly odd web comic inspired by the works of H.P. Lovecraft!')
-add('Slightlyeccentricorigins', 'http://slightlyeccentricorigins.webcomic.ws/', u"These are the original Slightly Eccentric comics, back when it was still an experimental Webcomic whose erratic stories (mostly unfinished) were plucked out of the air on a weekly basis. It's an inactive archive. You can read the new re-telling [url=http://slightlyeccentric.com]here[/url].")
 #add('SlipstreamSingularity', 'http://SlipstreamSingularity.webcomic.ws/', u'350 years have passed since the first and only mission beyond Human Occupied Space was launched. In search of the alien intelligence that sent such wondrous knowledge back to Earth, the Odyssey mission was lost. Now, denied their own home world by the rebellion of their own children creations, the Synthetics, humanity has become a race of despots and wanderers that meander through the stars, eking out an existence. Updated Tuesdays and Saturdays. Created by TedChristensenGallery.com')
 add('Smalltownvalues', 'http://smalltownvalues.webcomic.ws/', u'A mixed up family where at times, the pets have a better grasp of a situation than the humans.')
 add('Snarlbear', 'http://snarlbear.webcomic.ws/', u'A teenager named Daisy falls into the mysterious Rainbow Dimension and beats up all of the monsters living there. Fantasy/Comedy/Horror/Action/Drama/Rainbows')
@@ -353,7 +336,6 @@ add('Spooncomic', 'http://spooncomic.webcomic.ws/', u'A evil wizard turned Charl
 add('Sscomic', 'http://ss-comic.webcomic.ws/', u'')
 add('Starraccoon', 'http://starraccoon.webcomic.ws/', u"it's bugs bunny meets spiderman an alien raccoon escapes to earth after a evil warlord destroys his planet now he's on run from the goverment the men in black alien bounty hunters and the warlord himself")
 #add('Stickfodder', 'http://stickfodder.webcomic.ws/', u"Stick figures at their finest and not so finest. Jokes, violence and harsh language? HELL YEAH! It's just fun for the entire family.")
-add('Stinkoman', 'http://Stinkoman.webcomic.ws/', u'Stinkoman goes off on a quest to defeat a fat,lazor firing, chicken. Along with his sidekick 1-up, he has wacky adventures in the year 20X6. Foes like the color guard, giant penguins, and more stand in his way. Will Stinkoman prevail? Loosely based of the brother chaps character.')
 add('StrangeAttractors', 'http://StrangeAttractors.webcomic.ws/', u'Strange Attractors is a humorous post-modern retro-science fiction comic. Sophie, the curator of the vast Museum of Lost Things, becomes embroiled in an epoch spanning war between magic and science, in which the comics she loves are actually coded histories, and she\u2019s become a magnet for all sorts of cosmic weirdness.')
 add('Supershashi', 'http://supershashi.webcomic.ws/', u'')
 add('TAOSAE', 'http://TAOSAE.webcomic.ws/', u'The Adventures of Sherilyn and Emma, and sometimes some other people. This comic follows two girls, who are named in the title, as they have adventures and shenanigans at school.')

dosagelib/plugins/comicgenesis.py

@@ -113,7 +113,6 @@ add('TemplarArizona', 'http://templaraz.comicgenesis.com/')
 add('TheAdventuresofKaniraBaxter', 'http://kanirabaxter.comicgenesis.com/')
 add('TheAdventuresofVindibuddSuperheroInTraining', 'http://vindibudd.comicgenesis.com/d/20070720.html')
 add('TheEasyBreather', 'http://easybreather.comicgenesis.com/')
-add('TheGreenAvenger', 'http://www.green-avenger.com/')
 add('TheLounge', 'http://thelounge.comicgenesis.com/')
 add('TheMisadventuresofOkk', 'http://okk.comicgenesis.com/')
 add('ThePath', 'http://thepath.comicgenesis.com/')

dosagelib/plugins/drunkduck.py

@@ -530,7 +530,6 @@ add('IF_I_GET_LOCKED_UP_TONITE', 'IF_I_GET_LOCKED_UP_TONITE')
 add('IRC', 'IRC')
 add('I_Come_From_Mars', 'I_Come_From_Mars')
 add('I_Fell_Down_The_Stairs', 'I_Fell_Down_The_Stairs')
-add('I_Fell_in_Love_With_a_Vampire_Catgirl_Part_2_Lovers_at_the_End_of_the_World', 'I_Fell_in_Love_With_a_Vampire_Catgirl_Part_2_Lovers_at_the_End_of_the_World')
 add('I_got_it_in_my_mouth', 'I_got_it_in_my_mouth')
 add('ImaginaryFriends', 'ImaginaryFriends')
 add('Imaginary_Daughter_Bonus', 'Imaginary_Daughter_Bonus')
@@ -1190,7 +1189,6 @@ add('Thors_Thundershack', 'Thors_Thundershack')
 add('Thunder_Roarer', 'Thunder_Roarer')
 add('Timed_chaos', 'Timed_chaos')
 add('Times_Like_This', 'Times_Like_This')
-add('Tinas_Story', 'Tinas_Story')
 add('Tiziana', 'Tiziana')
 add('Too_Many_Authors', 'Too_Many_Authors')
 add('Total_Immersion', 'Total_Immersion')

dosagelib/plugins/e.py

@@ -94,19 +94,19 @@ class ElGoonishShive(_BasicScraper):
     description = u'Fantasy sci-fi comic about a group of teenagers and the bizarre, strange and supernatural circumstances of their lives.'
     name = 'KeenSpot/ElGoonishShive'
     url = 'http://www.egscomics.com/'
-    stripUrl = url + '?date=%s'
+    stripUrl = url + 'index.php?id=%s'
-    imageSearch = compile(r"'(comics/.+?)'")
+    imageSearch = compile(tagre("img", "src", r'(comics/[^"]+)', after="comic"))
-    prevSearch = compile(r"<a href='(/\?date=.+?)'.+?arrow_prev.gif")
+    prevSearch = compile(tagre("a", "href", r'(/index\.php\?id=\d+)', after="prev"))
-    help = 'Index format: yyyy-mm-dd'
+    help = 'Index format: number'
 
 
 class ElGoonishShiveNP(_BasicScraper):
     name = 'KeenSpot/ElGoonishShiveNP'
-    url = 'http://www.egscomics.com/egsnp/'
+    url = 'http://www.egscomics.com/egsnp.php'
-    stripUrl = url + '?date=%s'
+    stripUrl = url + '?id=%s'
-    imageSearch = compile(r'<div class=\'comic2\'><img src=\'(comics/\d{4}/\d{2}.+?)\'')
+    imageSearch = compile(tagre("img", "src", r'(comics/[^"]+)', after="comic"))
-    prevSearch = compile(r'<a href=\'(.+?)\'[^>]+?onmouseover=\'\$\("navimg(6|2)"\)')
+    prevSearch = compile(tagre("a", "href", r'(/egsnp\.php\?id=\d+)', after="prev"))
-    help = 'Index format: yyyy-mm-dd'
+    help = 'Index format: number'
 
 
 class Ellerbisms(_BasicScraper):
@@ -170,12 +170,13 @@ class EvilDiva(_BasicScraper):
 
 class EvilInc(_BasicScraper):
     description = u'Evil Inc. by Brad Guigar - Daily Super-Villain Webcomic and Comics Blog'
-    url = 'http://www.evil-comic.com/'
+    url = 'http://evil-inc.com/'
-    stripUrl = url + 'archive/%s.html'
+    stripUrl = url + 'comic/%s'
-    firstStripUrl = stripUrl % '20050530'
+    firstStripUrl = stripUrl % 'monday-3'
-    imageSearch = compile(tagre("img", "src", r'(/comics/[^"]+)'))
+    imageSearch = compile(tagre("img", "src", r'(http://i\d\.wp\.com/evil-inc\.com/wp-content/uploads/[^"]+)'))
-    prevSearch = compile(tagre("a", "href", r'([^"]+)') + tagre("img", "src", r'/images/previous\.gif'))
+    prevSearch = compile(tagre("span", "class", "mininav-prev") +
-    help = 'Index format: yyyymmdd'
+      tagre("a", "href", r'([^"]+)'))
+    help = 'Index format: stripname'
 
 
 class Exiern(_BasicScraper):

dosagelib/plugins/f.py

@@ -2,7 +2,7 @@
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
 # Copyright (C) 2012-2013 Bastian Kleineidam
 
-from re import compile, escape, IGNORECASE, MULTILINE
+from re import compile, escape, IGNORECASE
 
 from ..util import tagre
 from ..scraper import _BasicScraper
@@ -19,27 +19,6 @@ class FalconTwin(_BasicScraper):
     help = 'Index format: nnn'
 
 
-class Fallen(_BasicScraper):
-    baseUrl = 'http://www.fallencomic.com/'
-    url = baseUrl + 'fal-page.htm'
-    stripUrl = baseUrl + 'pages/part%s/%s-p%s.htm'
-    imageSearch = compile(r'<IMG SRC="(page/.+?)"', IGNORECASE)
-    prevSearch = compile(r'<A HREF="(.+?)"><FONT FACE="Courier">Back', IGNORECASE)
-    help = 'Index format: nn-m (comicNumber-partNumber)'
-    starter = indirectStarter(url,
-        compile(r'\(NEW \d{2}/\d{2}/\d{2}\)\s*\n*\s*<a href="(pages/part\d+/\d+-p\d+\.htm)">\d+</a>', MULTILINE))
-
-    @classmethod
-    def namer(cls, imageUrl, pageUrl):
-        num = pageUrl.split('/')[-1].split('-')[0]
-        part = pageUrl.split('-')[-1].split('.')[0]
-        return '%s-%s' % (part, num)
-
-    def getIndexStripUrl(self, index):
-        index, part = index.split('-')
-        return self.stripUrl % (part, index, part)
-
-
 class FantasyRealms(_BasicScraper):
     description = u'Fantasy Realms'
     url = 'http://www.fantasyrealmsonline.com/'

dosagelib/plugins/g.py

@@ -26,9 +26,9 @@ class Garanos(_BasicScraper):
     rurl = escape(baseUrl)
     url = baseUrl + 'pages/page-1/'
     starter = indirectStarter(url,
-       compile(tagre("a", "href", r'(%spages/[^"]+)' % rurl, after="navi-last")))
+       compile(tagre("a", "href", r'(%spages/[^"]+)' % rurl, after="nav-last")))
     stripUrl = baseUrl + 'pages/page-%s'
-    imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
+    imageSearch = compile(tagre("img", "src", r'(%swp-content/uploads/sites/\d+/\d+/\d+/[^"]+)' % rurl))
     prevSearch = compile(tagre("a", "href", r'(%spages/[^"]+)' % rurl, after="prev"))
     help = 'Index format: n (unpadded)'
 
@@ -123,11 +123,11 @@ class GleefulNihilism(_BasicScraper):
     description = u'pointless comics with a sideways grin'
     url = 'http://gleefulnihilism.com/'
     rurl = escape(url)
-    stripUrl = url + 'comics/%s/'
+    stripUrl = url + 'comic/%s/'
-    firstStripUrl = stripUrl % '2008/10/20/amoeba'
+    firstStripUrl = stripUrl % 'amoeba'
-    imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
+    imageSearch = compile(tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/[^"]+)' % rurl))
-    prevSearch = compile(tagre("a", "href", r'(%scomics/[^"]+)' % rurl) + 'Previous')
+    prevSearch = compile(tagre("a", "href", r'(%scomic/[^"]+)' % rurl) + '‹')
-    help = 'Index format: yyyy/mm/dd/stripname'
+    help = 'Index format: stripname'
 
 
 class GoblinsComic(_BasicScraper):

dosagelib/plugins/gocomics.py

@@ -134,7 +134,6 @@ add('Cortoons', '/cortoons')
 add('CowSheepandaGnomeNamedHelga', '/cow-sheep-and-a-gnome-named-helga')
 add('CowTown', '/cowtown')
 add('CowandBoyClassics', '/cowandboy')
-add('Critterdoodles', '/critterdoodles')
 add('Crumb', '/crumb')
 add('CuldeSac', '/culdesac')
 add('DaddysHome', '/daddyshome')
@@ -267,7 +266,6 @@ add('JimsJournal', '/jimsjournal')
 add('JoeHeller', '/joe-heller')
 add('JoeVanilla', '/joevanilla')
 add('JoelPett', '/joelpett')
-add('JoesBar', '/joes-bar')
 add('JohnDeering', '/johndeering')
 add('JumpStart', '/jumpstart')
 add('JustPosted', '/just-posted')
@@ -479,14 +477,12 @@ add('TheArgyleSweater', '/theargylesweater')
 add('TheBarn', '/thebarn')
 add('TheBentPinky', '/the-bent-pinky')
 add('TheBigPicture', '/thebigpicture')
-add('TheBluckwells', '/bluckwells')
 add('TheBoobiehatch', '/the-boobiehatch')
 add('TheBoondocks', '/boondocks')
 add('TheBornLoser', '/the-born-loser')
 add('TheBuckets', '/thebuckets')
 add('TheCardinal', '/thecardinal')
 add('TheCity', '/thecity')
-add('TheConjurers', '/the-conjurers')
 add('TheCreeps', '/the-creeps')
 add('TheDinetteSet', '/dinetteset')
 add('TheDoozies', '/thedoozies')

dosagelib/plugins/i.py

@@ -18,16 +18,6 @@ class IAmArg(_BasicScraper):
     help = 'Index format: yyyy/mm/dd/stripname'
 
 
-class IanJay(_BasicScraper):
-    url = 'http://ianjay.net/'
-    rurl = escape(url)
-    stripUrl = url + '?p=%s'
-    firstStripUrl = stripUrl % '210'
-    imageSearch = compile(tagre("img", "src", r'(%scomics/\d+[^"]+)' % rurl))
-    prevSearch = compile(tagre("a", "href", r'(%s\?p=\d+)' % rurl, after="Previous"))
-    help = 'Index foramt: nnn'
-
-
 class ICanBarelyDraw(_BasicScraper):
     url = 'http://www.icanbarelydraw.com/comic/'
     rurl = escape(url)

dosagelib/plugins/l.py

@@ -44,7 +44,7 @@ class LeastICouldDo(_BasicScraper):
     rurl = escape(url)
     stripUrl = url + 'comic/%s'
     firstStripUrl = stripUrl % '20130109'
-    imageSearch = compile(tagre("img", "src", r'(http://(?:cdn\.)?licd\.com/wp-content/uploads/\d+/\d+/\d{8,9}\.\w{1,4})'))
+    imageSearch = compile(tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/\d{8,9}\.\w{1,4})' % rurl))
     prevSearch = compile(tagre("a", "href", r'(%scomic/\d+/)' % rurl, after="Previous"))
     starter = indirectStarter(url,
       compile(tagre("a", "href", r'(%scomic/\d+/)' % rurl, after="feature-comic")))

dosagelib/plugins/m.py

@@ -143,8 +143,9 @@ class MyCartoons(_BasicScraper):
 
 class MysteriesOfTheArcana(_BasicScraper):
     url = 'http://mysteriesofthearcana.com/'
+    rurl = escape(url)
     stripUrl = url + 'index.php?action=comics&cid=%s'
     firstStripUrl = stripUrl % '1'
-    imageSearch = compile(tagre("img", "src", r'(image\.php\?type=com&i=[^"]+)'))
+    imageSearch = compile(tagre("img", "src", r'(%simage\.php\?type=com&i=[^"]+)' % rurl))
-    prevSearch = compile(tagre("a", "href", r'(index\.php[^"]+)', after="navprevious"))
+    prevSearch = compile(tagre("a", "href", r'(/index\.php[^"]+)', after="navprevious"))
     help = 'Index format: n (unpadded)'

dosagelib/plugins/n.py

@@ -138,16 +138,6 @@ class Nnewts(_BasicScraper):
     help = 'Index format: page-number'
 
 
-class Nodwick(_BasicScraper):
-    description = u'Welcome to Nodwick.com - A fantasy farce for the whole party!'
-    url = 'http://comic.nodwick.com/'
-    rurl = escape(url)
-    stripUrl = url + "?p=%s"
-    imageSearch = compile(tagre("img", "src", r'(%snodwickstrips/[^"]+)' % rurl))
-    prevSearch = compile(tagre("a", "href", r'(%s\?p=\d+)' % rurl, after="prev"))
-    help = 'Index format: stripnumber'
-
-
 class NobodyScores(_BasicScraper):
     description = u'Nobody Scores! A little comic about inevitable disaster'
     url = 'http://nobodyscores.loosenutstudio.com/'
@@ -161,13 +151,17 @@ class NobodyScores(_BasicScraper):
 
 
 class NoNeedForBushido(_BasicScraper):
-    baseUrl = 'http://noneedforbushido.com/'
+    url = 'http://nn4b.com/'
-    rurl = escape(baseUrl)
+    rurl = escape(url)
-    url = baseUrl + 'latest/'
+    stripUrl = url + '?webcomic1=%s'
-    stripUrl = baseUrl + '%s/'
+    imageSearch = compile(
-    imageSearch = compile(tagre("img", "src", r'(%scomics/comic/[^"]+)' % rurl))
+      tagre("a", "rel", "next") +
-    prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl, after="previous-comic-link"))
+      tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/[^"]+)' % rurl,
-    help = 'Index format: yyyy/comic/nnn'
+      after="attachment-full"))
+    prevSearch = compile(tagre("a", "href", r'(%s\?webcomic1=[^"]+)' % rurl, after="previous-webcomic"))
+    help = 'Index format: nnn'
+    starter = indirectStarter(url,
+       compile(tagre("a", "href", r'(%s\?webcomic1=[^"]+)' % rurl, after="last-webcomic")))
 
 
 class Nukees(_BasicScraper):

dosagelib/plugins/num.py

@@ -2,7 +2,7 @@
 # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs
 # Copyright (C) 2012-2013 Bastian Kleineidam
 
-from re import compile
+from re import compile, escape
 
 from ..util import tagre
 from ..scraper import _BasicScraper
@@ -11,9 +11,10 @@ from ..scraper import _BasicScraper
 class NineteenNinetySeven(_BasicScraper):
     description = u'1977 the Comic - Sex, Drugs and Rock and Roll Just Not in That Order'
     name = '1997'
-    url = 'http://www.1977thecomic.com/'
+    url = 'http://1977thecomic.com/'
+    rurl = escape(url)
     stripUrl = url + '%s/'
     firstStripUrl = stripUrl % '1977-comics/from-the-beginning-part-1'
-    imageSearch = compile(tagre("img", "src", r'(http://www\.1977thecomic\.com/comics-1977/[^"]+)'))
+    imageSearch = compile(tagre("img", "src", r'(%scomics-1977/[^"]+)' % rurl))
     prevSearch = compile(tagre("a", "href", r'([^"]+)')+"Previous")
     help = 'Index format: yyyy/mm/dd/strip-name'

dosagelib/plugins/o.py

@@ -97,7 +97,7 @@ class OnTheFasttrack(_BasicScraper):
 
 
 class OneQuestion(_BasicScraper):
-    url = 'http://www.onequestioncomic.com/'
+    url = 'http://onequestioncomic.com/'
     stripUrl = url + 'comic.php?strip_id=%s'
     firstStripUrl = stripUrl % '1'
     imageSearch = compile(tagre("img", "src", r'((?:\.\./)?istrip_files/strips/\d+\.\w{3,4})'))
@@ -128,8 +128,9 @@ class OurHomePlanet(_BasicScraper):
 class OverCompensating(_BasicScraper):
     description = u'OVERCOMPENSATING: The Journal Comic With a Seething Disdain for Reality.'
     url = 'http://www.overcompensating.com/'
-    stripUrl = url + 'overcompensating/index.php?comic=%s'
+    stripUrl = url + 'oc/index.php?comic=%s'
     firstStripUrl = stripUrl % '0'
-    imageSearch = compile(tagre("img", "src", r'(/overcompensating/comics/[^"]+)'))
+    imageSearch = compile(tagre("img", "src", r'(/oc/comics/[^"]+)'))
-    prevSearch = compile(tagre("a", "href", r'(/overcompensating/index\.php\?comic=\d+)', after="go back"))
+    prevSearch = compile(tagre("a", "href",
+      r'(/oc/index\.php\?comic=\d+)', after="go back"))
     help = 'Index format: number'

dosagelib/plugins/s.py

@@ -94,8 +94,13 @@ class ScenesFromAMultiverse(_BasicScraper):
     rurl = escape(url)
     stripUrl = url + '%s/'
     firstStripUrl = stripUrl % '2010/06/14/parenthood'
-    imageSearch = compile(tagre("img", "src", r'(%sfiles/comics/[^"]+)' % rurl))
+    imageSearch = (
-    prevSearch = compile(tagre("a", "href", r'(%s\d+\d+/\d+/\d+/[^"]+)' % rurl, after="prev"))
+      compile(tagre("div", "id", "comic") + r"\s*" +
+        tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/[^"]+)' % rurl)),
+      compile(tagre("div", "id", "comic") + r"\s*" + tagre("a", "href", r'[^"]*') +
+        tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/[^"]+)' % rurl)),
+    )
+    prevSearch = compile(tagre("a", "href", r'(%scomic/\d+\d+/\d+/\d+/[^"]+)' % rurl, after="prev"))
     help = 'Index format: yyyy/mm/dd/stripname'
 
 
@@ -215,8 +220,8 @@ class Shivae(_BasicScraper):
     rurl = escape(url)
     stripUrl = url + 'blog/%s/'
     firstStripUrl = stripUrl % '2007/09/21/09212007'
-    imageSearch = compile(tagre("img", "src", r'(%sfiles/comics/[^"]+)' % rurl))
+    imageSearch = compile(tagre("img", "src", r'(%swp-content/blogs\.dir/\d+/files/\d+/\d+/[^"]+)' % rurl))
-    prevSearch = compile(tagre("a", "href", r'(%sblog/[^"]+)' % rurl, after="Previous"))
+    prevSearch = compile(tagre("a", "href", r'(%sblog/[^"]+)' % rurl, after="navi-prev"))
     help = 'Index format: yyyy/mm/dd/stripname'
 
 
@@ -349,7 +354,7 @@ class SnowFlame(_BasicScraper):
     rurl = escape(url)
     stripUrl = url + '?comic=snowflame-%s-%s'
     firstStripUrl = stripUrl % ('01', '01')
-    imageSearch = compile(tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/[^"]+)' % rurl, after="Snow[Ff]lame the fan made"))
+    imageSearch = compile(tagre("img", "src", r'(%swp-content/uploads/\d+/\d+/[^"]+)' % rurl, after="Snow[Ff]lame "))
     prevSearch = compile(tagre("span", "class", "mininav-prev") +
         tagre("a", "href", r'(%s\?comic=snowflame[^"]+)' % rurl))
     starter = bounceStarter(url,
@@ -426,10 +431,10 @@ class SpareParts(_BasicScraper):
 class Spinnerette(_BasicScraper):
     url = 'http://www.spinnyverse.com/'
     rurl = escape(url)
-    stripUrl = url + '%s/'
+    stripUrl = url + 'index.php?id=%s'
     firstStripUrl = stripUrl % '2010/02/09/02092010'
-    imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
+    imageSearch = compile(tagre("img", "src", r'(comics/[^"]+)', after="comic"))
-    prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl, before="Previous Comic"))
+    prevSearch = compile(tagre("a", "href", r'(/index\.php\?id=[^"]+)', after="prev"))
     help = 'Index format: number'
 
 

dosagelib/plugins/t.py

@@ -170,18 +170,6 @@ class TheWhiteboard(_BasicScraper):
     help = 'Index format: twb or wb + n wg. twb1000'
 
 
-class HMHigh(_BasicScraper):
-    description = u'Welcome to the website of professional artist and illustrator, Angel Smith and of Fallen Angel Media Ltd; An independent art, design & publishing house and event management company based in Bristol, England'
-    name = 'TheFallenAngel/HMHigh'
-    baseUrl = 'http://www.thefallenangel.co.uk/'
-    url = baseUrl + 'hmhigh/'
-    rurl = escape(baseUrl)
-    stripUrl = url + '?id=%s'
-    imageSearch = compile(r'<img src="(%shmhigh/img/comic/.+?)"' % rurl)
-    prevSearch = compile(r' <a href="(%s.+?)" title=".+?">Prev</a>' % rurl)
-    help = 'Index format: nnn'
-
-
 class TheOuterQuarter(_BasicScraper):
     url = 'http://theouterquarter.com/'
     rurl = escape(url)

dosagelib/plugins/w.py

@@ -109,10 +109,10 @@ class WhyTheLongFace(_BasicScraper):
 class Wigu(_BasicScraper):
     description = u'WIGU: A COMIC ON INTERNET'
     url = 'http://wigucomics.com/'
-    stripUrl = url + 'mais/index.php?comic=%s'
+    stripUrl = url + 'oc/index.php?comic=%s'
     firstStripUrl = stripUrl % '1'
-    imageSearch = compile(tagre("img", "src", r'(/mais/comics/[^"]+)'))
+    imageSearch = compile(tagre("img", "src", r'(/oc/comics/[^"]+)'))
-    prevSearch = compile(tagre("a", "href", r'(/mais/index\.php\?comic=\d+)', after="go back"))
+    prevSearch = compile(tagre("a", "href", r'(/oc/index\.php\?comic=\d+)', after="go back"))
     help = 'Index format: n'
 
 
@@ -121,7 +121,8 @@ class Wonderella(_BasicScraper):
     rurl = escape(url)
     stripUrl = url + '%s/'
     firstStripUrl = stripUrl % '2006/09/09/the-torment-of-a-thousand-yesterdays'
-    imageSearch = compile(tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
+    imageSearch = compile(tagre("div", "id", r"comic", quote=r'["\']') + r"\s*" +
+        tagre("img", "src", r'(%scomics/[^"]+)' % rurl))
     prevSearch = compile(tagre("a", "href", r'(%s\d+/\d+/\d+/[^"]+)' % rurl, after="prev"))
     help = 'Index format: yyyy/mm/dd/name'
 
@@ -226,8 +227,11 @@ class _WorldOfWarcraftEh(_BasicScraper):
 
 class Wulffmorgenthaler(_BasicScraper):
     description = u"Entertainment - Since 2002. Wulff & Morgenthaler's Personal humoristic social commentary on life, nostalgia and the World in general. Nothing is taboo: They deal with Politics, News, Entertainment, Technology, Culture, and Weirdo Beavers"
-    url = 'http://wumocomicstrip.com/'
+    url = 'http://kindofnormal.com/wumo/'
+    rurl = escape(url)
     stripUrl = url + '%s'
-    imageSearch = compile(tagre("img", "src", r'(/img/strip/\d+/\d+/[^/"]+)'))
+    imageSearch = compile(tagre("div", "class", r'box-content') + r"\s*" +
-    prevSearch = compile(tagre("a", "href", r'([^"]+)') + "<span>Previous")
+        tagre("a", "href", r'[^"]+') + r"\s*" +
+        tagre("img", "src", r'(http://kindofnormal\.com/img/wumo/\d+/\d+/[^/"]+)'))
+    prevSearch = compile(tagre("a", "href", r'(%s[^"]+)' % rurl) + tagre("i", "class", r'icon-chevron-left'))
     help = 'Index format: yyyy/mm/dd'

dosagelib/plugins/webcomicnation.py

@@ -28,4 +28,5 @@ def add(name, subpath):
 add('AgnesQuill', 'daveroman/agnes/')
 add('MyMuse', 'gc/muse/')
 add('NekkoAndJoruba', 'nekkoandjoruba/nekkoandjoruba/')
-add('ClownSamurai', 'qsamurai/clownsamurai/')
+# custom navigation
+#add('ClownSamurai', 'qsamurai/clownsamurai/')

scripts/comicfury.py

@@ -30,9 +30,14 @@ exclude_comics = [
     "30Days", # unsuitable navigation
     "6tsc", # unsuitable navigation
     "Abyss", # unsuitable navigation
+    "Acelestialstory", # unsuitable navigation
     "Actdr", # unsuitable navigation
     "Aerosol", # unsuitable navigation
+    "Ahtiventures", # unsuitable navigation
     "Alienirony", # unsuitable navigation
+    "Aloonaticstale", # unsuitable navigation
+    "Amity", # unsuitable navigation
+    "Angelguardian", # unsuitable navigation
     "AngelguardianEspanol", # unsuitable navigation
     "Angryalien", # unsuitable navigation
     "Animangitis", # unsuitable navigation
@@ -44,9 +49,11 @@ exclude_comics = [
     "Bedlam", # unsuitable navigation
     "BITCHSquad", # missing images
     "Bidoof", # unsuitable navigation
+    "Blobworld", # unsuitable navigation
     "BlockTales", # unsuitable navigation
     "Bobcomix", # unsuitable navigation
     "Bonejangles", # unsuitable navigation
+    "BookOfLiesComic", # unsuitable navigation
     "BoozerandStoner", # unsuitable navigation
     "Boyaurus", # unsuitable navigation
     "Brainfood", # unsuitable navigation
@@ -77,7 +84,10 @@ exclude_comics = [
     "Droned", # unsuitable navigation
     "Druids", # unsuitable navigation
     "Effingukookoo", # unsuitable navigation
+    "Elijahandazuuclassic", # unsuitable navigation
     "ErraticBeat", # unsuitable navigation
+    "ErraticE", # unsuitable navigation
+    "EternalKnights", # unsuitable navigation
     "Evilbear", # unsuitable navigation
     "Ewmic", # unsuitable navigation
     "Fannicklas", # unsuitable navigation
@@ -105,6 +115,7 @@ exclude_comics = [
     "HazSci", # unsuitable navigation
     "Hellboundarchive", # unsuitable navigation
     "Herecomesskeeter", # unsuitable navigation
+    "Highlyexperimental", # unsuitable navigation
     "Holycowcomics", # unsuitable navigation
     "Hourlykelly", # unsuitable navigation
     "Houseescapeold", # unsuitable navigation
@@ -130,6 +141,7 @@ exclude_comics = [
     "Kmfe", # unsuitable navigation
     "Lately", # unsuitable navigation
     "Legendoftheredphantom", # unsuitable navigation
+    "LiteBites", # unsuitable navigation
     "Littlephoenix", # unsuitable navigation
     "Llwhoelterran", # unsuitable navigation
     "Lomeathandhuilii", # unsuitable navigation
@@ -157,18 +169,22 @@ exclude_comics = [
     "Noprrkele", # unsuitable navigation
     "Nothingfits", # unsuitable navigation
     "Nothingfitsartblog", # unsuitable navigation
+    "NotYoursAmI", # unsuitable navigation
     "Oeight", # unsuitable navigation
     "Ofpf", # unsuitable navigation
     "Old2g", # unsuitable navigation
     "Outtolunch", # unsuitable navigation
     "Parisel313", # unsuitable navigation
+    "Patchworkpeople", # unsuitable navigation
     "Pewfell", # unsuitable navigation
     "Phoenix", # unsuitable navigation
     "Pi5a", # unsuitable navigation
     "Pokemonwarpers", # unsuitable navigation
+    "Princeofcats", # unsuitable navigation
     "Princess", # unsuitable navigation
     "ProjectX", # unsuitable navigation
     "ReadershipofOne", # unsuitable navigation
+    "Rebuildofgenericmanga", # unsuitable navigation
     "Queenie", # unsuitable navigation
     "Rain", # unsuitable navigation
     "Ratantia", # unsuitable navigation
@@ -185,12 +201,14 @@ exclude_comics = [
     "Sigh", # unsuitable navigation
     "Sleazyspacesage", # unsuitable navigation
     "Slightlyeccentric", # unsuitable navigation
+    "Slightlyeccentricorigins", # unsuitable navigation
     "Smbhax", # unsuitable navigation
     "SpiritSquire1", # unsuitable navigation
     "Stampedegirl", # unsuitable navigation
     "Stardustthecat", # unsuitable navigation
     "Sticklife", # unsuitable navigation
     "StickMisadventures", # unsuitable navigation
+    "Stinkoman", # unsuitable navigation
     "StrangerThanFiction", # unsuitable navigation
     "SundaySmash", # unsuitable navigation
     "Superproultimatewrestling", # unsuitable navigation

scripts/comicgenesis.py

@@ -290,6 +290,7 @@ exclude_comics = [
     "TheDevilsPanties", # page moved
     "TheDoctorPepperShow", # page has 403 forbidden
     "TheFantasticalBestiary", # page has 403 forbidden
+    "TheGreenAvenger", # missing images
     "TheGodsPack", # page has 403 forbidden
     "TheMadBrothers", # page does not follow standard layout
     "TheMediocres", # missing images

scripts/drunkduck.py

@@ -59,6 +59,7 @@ exclude_comics = [
     "Greys_journey", # broken images
     "Head_over_Heart", # broken images
     "Hurrocks_Fardel", # broken images
+    "I_Fell_in_Love_With_a_Vampire_Catgirl_Part_2_Lovers_at_the_End_of_the_World", # start page requires login
     "Illusional_Beauty", # broken images
     "Indigo_Bunting__Vampire", # start page requires login
     "Irrumator", # start page requires login
@@ -144,6 +145,7 @@ exclude_comics = [
     "The_Misadventures_of_Everyone", # start page requires login
     "The_NEW_Life_Of_TimmY", # broken images
     "The_SSA", # broken images
+    "Tinas_Story", # start page requires login
     "Tony_The_Hedgehog", # broken images
     "Trapped_in_a_Comic", # start page requires login
     "Twonks_and_Plonkers", # broken images, no real content

scripts/gocomics.py

@@ -28,6 +28,7 @@ exclude_comics = [
     "Bonner", # missing page
     "Buster", # comic unavailabe
     "CarteBlanche", # missing images
+    "Critterdoodles", # missing images
     "CountyLine", # too few comics
     "Crawdiddy", # comic unavailable
     "DALTONDOG", # comic unavailable
@@ -40,6 +41,7 @@ exclude_comics = [
     "GOODAndEVIL", # too few comics
     "GoodwithCoffee", # too few comics
     "InkeeDoodles", # comic unavailable
+    "JoesBar", # missing images
     "KALEECHIKORNERS", # too few comics
     "LoveIs", # missing images
     "MaggiesComics", # too few comics
@@ -59,6 +61,8 @@ exclude_comics = [
     "SpaghettiSandwich", # too few comics
     "SparComics", # comic unavailable
     "SurvivingSingle", # comic unavailable
+    "TheBluckwells", # missing images
+    "TheConjurers", # too few comics
     "TheDeadlys", # too few comics
     "TheNursesLockerRoom", # too few comics
     "Tomversation", # too few comics