From 2ecfcaec17255c9165eae3411cd81200961613c1 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Mon, 1 Feb 2021 00:19:22 +0100 Subject: [PATCH] Update GoComics --- dosagelib/plugins/gocomics.py | 29 ++++------------------------- dosagelib/plugins/old.py | 25 ++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/dosagelib/plugins/gocomics.py b/dosagelib/plugins/gocomics.py index 58f0c7527..cd206a5d5 100644 --- a/dosagelib/plugins/gocomics.py +++ b/dosagelib/plugins/gocomics.py @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam -# Copyright (C) 2015-2020 Tobias Gruetzmacher +# Copyright (C) 2015-2021 Tobias Gruetzmacher from ..scraper import _ParserScraper from ..helpers import indirectStarter @@ -38,7 +38,6 @@ class GoComics(_ParserScraper): return ( # old comics removed from the listing cls('HeavenlyNostrils', 'heavenly-nostrils'), - cls('MyCage', 'mycage'), # do not edit anything below since these entries are generated from # scripts/gocomics.py @@ -52,6 +51,7 @@ class GoComics(_ParserScraper): cls('AdultChildren', 'adult-children'), cls('Agnes', 'agnes'), cls('AJAndMagnus', 'aj-and-magnus'), + cls('AlGoodwynEditorialCartoons', 'algoodwyn'), cls('AlisHouse', 'alis-house'), cls('AlleyOop', 'alley-oop'), cls('AmandaTheGreat', 'amanda-the-great'), @@ -64,7 +64,6 @@ class GoComics(_ParserScraper): cls('AProblemLikeJamal', 'a-problem-like-jamal'), cls('ArloAndJanis', 'arloandjanis'), cls('AskACat', 'ask-a-cat'), - cls('AskAPortlySyndicatePerson', 'ask-a-portly-syndicate-person'), cls('AskShagg', 'askshagg'), cls('AtTavicat', 'tavicat'), cls('AuntyAcid', 'aunty-acid'), @@ -108,7 +107,6 @@ class GoComics(_ParserScraper): cls('Boomerangs', 'boomerangs'), cls('Bottomliners', 'bottomliners'), cls('BoundAndGagged', 'boundandgagged'), - cls('BrainSquirts', 'brain-squirts'), cls('BreakingCatNews', 'breaking-cat-news'), cls('BreakOfDay', 'break-of-day'), cls('Brevity', 'brevity'), @@ -140,7 +138,6 @@ class GoComics(_ParserScraper): cls('Cleats', 'cleats'), cls('CloseToHome', 'closetohome'), cls('Computoon', 'compu-toon'), - cls('ConnieToTheWonnie', 'connie-to-the-wonnie'), cls('Cornered', 'cornered'), cls('CowAndBoyClassics', 'cowandboy'), cls('CowTown', 'cowtown'), @@ -167,10 +164,8 @@ class GoComics(_ParserScraper): cls('Doonesbury', 'doonesbury'), cls('Drabble', 'drabble'), cls('DrewSheneman', 'drewsheneman'), - cls('Drive', 'drive'), cls('DumbwichCastle', 'dumbwich-castle'), cls('EdgeCity', 'edge-city'), - cls('EdgeOfAdventure', 'edge-of-adventure'), cls('Eek', 'eek'), cls('ElCafDePoncho', 'el-cafe-de-poncho', 'es'), cls('EmmyLou', 'emmy-lou'), @@ -206,6 +201,7 @@ class GoComics(_ParserScraper): cls('GaryMarkstein', 'garymarkstein'), cls('GaryVarvel', 'garyvarvel'), cls('GasolineAlley', 'gasolinealley'), + cls('Gaturro', 'gaturro', 'es'), cls('Geech', 'geech'), cls('GetALife', 'getalife'), cls('GetFuzzy', 'getfuzzy'), @@ -217,7 +213,6 @@ class GoComics(_ParserScraper): cls('GManWebcomics', 'g-man-webcomics'), cls('GnomeSyndicate', 'gnome-syndicate'), cls('Goats', 'goats'), - cls('GoComicsFanArt', 'fan-art'), cls('GrandAvenue', 'grand-avenue'), cls('GrayMatters', 'gray-matters'), cls('GreenHumour', 'green-humour'), @@ -232,9 +227,7 @@ class GoComics(_ParserScraper): cls('Herman', 'herman'), cls('HomeAndAway', 'homeandaway'), cls('HotComicsForCoolPeople', 'hot-comics-for-cool-people'), - cls('HowToCat', 'how-to-cat'), cls('HUBRIS', 'hubris'), - cls('HumanCull', 'human-cull'), cls('HutchOwen', 'hutch-owen'), cls('ImagineThis', 'imaginethis'), cls('ImogenQuest', 'imogen-quest'), @@ -262,7 +255,6 @@ class GoComics(_ParserScraper): cls('JumpStart', 'jumpstart'), cls('JunkDrawer', 'junk-drawer'), cls('JustoYFranco', 'justo-y-franco', 'es'), - cls('JustSayUncle', 'just-say-uncle'), cls('KenCatalino', 'kencatalino'), cls('KevinKallaugher', 'kal'), cls('KevinNecessaryEditorialCartoons', 'kevin-necessary-editorial-cartoons'), @@ -331,7 +323,6 @@ class GoComics(_ParserScraper): cls('MrLowe', 'mr-lowe'), cls('MustardAndBoloney', 'mustard-and-boloney'), cls('MuttAndJeff', 'muttandjeff'), - cls('MyCageNewAndOld', 'mycage'), cls('MyDadIsDracula', 'my-dad-is-dracula'), cls('MythTickle', 'mythtickle'), cls('Nancy', 'nancy'), @@ -374,14 +365,12 @@ class GoComics(_ParserScraper): cls('Pibgorn', 'pibgorn'), cls('PibgornSketches', 'pibgornsketches'), cls('Pickles', 'pickles'), - cls('Pinkerton', 'pinkerton'), cls('PirateMike', 'pirate-mike'), cls('PleaseListenToMe', 'please-listen-to-me'), cls('Pluggers', 'pluggers'), cls('PoochCafe', 'poochcafe'), cls('Poorcraft', 'poorcraft'), cls('PoorlyDrawnLines', 'poorly-drawn-lines'), - cls('PopCultureShockTherapy', 'pop-culture-shock-therapy'), cls('PotShots', 'pot-shots'), cls('PreTeena', 'preteena'), cls('PricklyCity', 'pricklycity'), @@ -412,12 +401,9 @@ class GoComics(_ParserScraper): cls('ScaryGary', 'scarygary'), cls('ScenesFromAMultiverse', 'scenes-from-a-multiverse'), cls('ScottStantis', 'scottstantis'), - cls('Sheldon', 'sheldon'), cls('ShenComix', 'shen-comix'), cls('ShirleyAndSonClassics', 'shirley-and-son-classics'), cls('Shoe', 'shoe'), - cls('Shoecabbage', 'shoecabbage'), - cls('ShutterbugFollies', 'shutterbug-follies'), cls('SigneWilkinson', 'signewilkinson'), cls('SketchsharkComics', 'sketchshark-comics'), cls('SkinHorse', 'skinhorse'), @@ -426,7 +412,6 @@ class GoComics(_ParserScraper): cls('SnoopyEnEspanol', 'peanuts-espanol', 'es'), cls('Snowflakes', 'snowflakes'), cls('SnowSez', 'snow-sez'), - cls('Speechless', 'speechless'), cls('SpeedBump', 'speedbump'), cls('SpiritOfTheStaircase', 'spirit-of-the-staircase'), cls('SpotTheFrog', 'spot-the-frog'), @@ -439,6 +424,7 @@ class GoComics(_ParserScraper): cls('StoneSoupClassics', 'stone-soup-classics'), cls('StrangeBrew', 'strangebrew'), cls('StuartCarlson', 'stuartcarlson'), + cls('StudioJantze', 'studio-jantze'), cls('SunnyStreet', 'sunny-street'), cls('SunshineState', 'sunshine-state'), cls('SuperFunPakComix', 'super-fun-pak-comix'), @@ -459,7 +445,6 @@ class GoComics(_ParserScraper): cls('TheArgyleSweater', 'theargylesweater'), cls('TheAwkwardYeti', 'the-awkward-yeti'), cls('TheBarn', 'thebarn'), - cls('TheBentPinky', 'the-bent-pinky'), cls('TheBigPicture', 'thebigpicture'), cls('TheBoondocks', 'boondocks'), cls('TheBornLoser', 'the-born-loser'), @@ -483,11 +468,9 @@ class GoComics(_ParserScraper): cls('TheMeaningOfLila', 'meaningoflila'), cls('TheMiddleAge', 'the-middle-age'), cls('TheMiddletons', 'themiddletons'), - cls('TheNorm40', 'the-norm-4-0'), cls('TheNormClassics', 'thenorm'), cls('TheOtherCoast', 'theothercoast'), cls('TheOtherEnd', 'the-other-end'), - cls('TheQuixoteSyndrome', 'the-quixote-syndrome'), cls('TheUpsideDownWorldOfGustaveVerbeek', 'upside-down-world-of-gustave-verbeek'), cls('TheWanderingMelon', 'the-wandering-melon'), cls('TheWizardOfIdSpanish', 'wizardofidespanol', 'es'), @@ -495,9 +478,7 @@ class GoComics(_ParserScraper): cls('think', 'think'), cls('ThinLines', 'thinlines'), cls('TimCampbell', 'tim-campbell'), - cls('TimEagan', 'tim-eagan'), cls('TinySepuku', 'tinysepuku'), - cls('TOBY', 'toby'), cls('TodaysSzep', 'todays-szep'), cls('TomTheDancingBug', 'tomthedancingbug'), cls('TomToles', 'tomtoles'), @@ -526,9 +507,7 @@ class GoComics(_ParserScraper): cls('WatchYourHead', 'watchyourhead'), cls('Wawawiwa', 'wawawiwa'), cls('WaynoVision', 'waynovision'), - cls('WebcomicName', 'webcomic-name'), cls('WeePals', 'weepals'), - cls('WhyattCartoons', 'whyatt-cartoons'), cls('Widdershins', 'widdershins'), cls('WideOpen', 'wide-open'), cls('WinLoseDrew', 'drewlitton'), diff --git a/dosagelib/plugins/old.py b/dosagelib/plugins/old.py index 5dbb1ce67..3d970127a 100644 --- a/dosagelib/plugins/old.py +++ b/dosagelib/plugins/old.py @@ -631,23 +631,31 @@ class Removed(Scraper): cls('ComicFury/TwentyFourSeven'), cls('ComicFury/TwentyFourSevenFans'), cls('GoComics/2CowsAndAChicken'), + cls('GoComics/AskAPortlySyndicatePerson'), cls('GoComics/Bewley'), cls('GoComics/Biographic'), + cls('GoComics/BrainSquirts'), cls('GoComics/CapsulasMedicas'), cls('GoComics/ClearBlueWater'), cls('GoComics/Committed'), + cls('GoComics/ConnieToTheWonnie'), cls('GoComics/DorrisMcComics'), cls('GoComics/DragonGirl'), + cls('GoComics/Drive'), cls('GoComics/DudeAndDude'), + cls('GoComics/EdgeOfAdventure'), cls('GoComics/EricTheCircle'), cls('GoComics/FacesOfTheNewsByKerryWaghorn'), cls('GoComics/FortKnox'), cls('GoComics/GarfieldMinusGarfield'), - cls('GoComics/Gaturro'), + cls('GoComics/GoComicsFanArt'), cls('GoComics/Graffiti'), cls('GoComics/HaikuEwe'), cls('GoComics/HealthCapsules'), + cls('GoComics/HowToCat'), + cls('GoComics/HumanCull'), cls('GoComics/JerryHolbert'), + cls('GoComics/JustSayUncle'), cls('GoComics/KidSpot'), cls('GoComics/KidTown'), cls('GoComics/KitNCarlyle'), @@ -657,21 +665,35 @@ class Removed(Scraper): cls('GoComics/MegClassics'), cls('GoComics/MichaelAndrew'), cls('GoComics/Microcosm'), + cls('GoComics/MyCage'), + cls('GoComics/MyCageNewAndOld'), cls('GoComics/PaulSzep'), cls('GoComics/PicturesInBoxes'), cls('GoComics/PieComic'), + cls('GoComics/Pinkerton'), + cls('GoComics/PopCultureShockTherapy'), cls('GoComics/ReplyAll'), cls('GoComics/ReplyAllLite'), + cls('GoComics/Sheldon'), + cls('GoComics/Shoecabbage'), cls('GoComics/Shortcuts'), + cls('GoComics/ShutterbugFollies'), + cls('GoComics/Speechless'), cls('GoComics/ThatsLife'), + cls('GoComics/TheBentPinky'), cls('GoComics/TheBestMedicineCartoon'), cls('GoComics/TheConjurers'), cls('GoComics/TheCreeps'), cls('GoComics/TheGentlemansArmchair'), cls('GoComics/TheLostBear'), + cls('GoComics/TheNorm40'), + cls('GoComics/TheQuixoteSyndrome'), cls('GoComics/TheSunshineClub'), + cls('GoComics/TimEagan'), + cls('GoComics/TOBY'), cls('GoComics/UncleArtsFunland'), cls('GoComics/USAcres'), + cls('GoComics/WhyattCartoons'), cls('GoComics/WorldOfWonder'), cls('JustAnotherEscape'), cls('Laiyu', 'brk'), @@ -1392,6 +1414,7 @@ class Renamed(Scraper): cls('GoComics/Owlturd', 'GoComics/ShenComix'), cls('GoComics/PeanutsEnEspanol', 'GoComics/SnoopyEnEspanol'), cls('GoComics/RipleysBelieveItOrNotSpanish', 'GoComics/RipleysAunqueUstedNoLoCrea'), + cls('GoComics/WebcomicName', 'WebcomicName'), cls('SmackJeeves/BlackTapestries', 'ComicFury/BlackTapestries'), cls('SmackJeeves/FurryExperience', 'ComicFury/FurryExperience'), cls('SmackJeeves/GrowingTroubles', 'ComicFury/GrowingTroubles'),