From da60636b8a3020c250159e74178fb0a0dad84b59 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Sun, 18 Feb 2024 23:43:02 +0100 Subject: [PATCH] Fix some Shivae Studios modules --- dosagelib/plugins/old.py | 4 +++- dosagelib/plugins/shivaestudios.py | 26 +++++++++----------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dosagelib/plugins/old.py b/dosagelib/plugins/old.py index 4ca85ba18..7cda0dc1a 100644 --- a/dosagelib/plugins/old.py +++ b/dosagelib/plugins/old.py @@ -1581,6 +1581,8 @@ class Removed(Scraper): cls('WintersLight'), # Removed in 3.1 + cls('AbbysAgency', 'brk'), + cls('BlackRose', 'brk'), cls('CatenaManor/CatenaCafe'), cls('FalseStart'), cls('Ginpu'), @@ -1607,6 +1609,7 @@ class Removed(Scraper): cls('MangaDex/ImTheMaxLevelNewbie', 'legal'), cls('MrLovenstein', 'jsh'), cls('MyCartoons'), + cls('Shivae/BlackRose', 'brk'), cls('StudioKhimera/Mousechevious'), cls('TalesAndTactics'), cls('VampireHunterBoyfriends'), @@ -1704,7 +1707,6 @@ class Renamed(Scraper): cls('GoComics/Widdershins', 'Widdershins'), cls('Guardia', 'ComicFury/Guardia'), cls('RadioactivePanda', 'Tapas/RadioactivePanda'), - cls('Shivae/BlackRose', 'BlackRose'), cls('SmackJeeves/BlackTapestries', 'ComicFury/BlackTapestries'), cls('SmackJeeves/ByTheBook', 'ByTheBook'), cls('SmackJeeves/FurryExperience', 'ComicFury/FurryExperience'), diff --git a/dosagelib/plugins/shivaestudios.py b/dosagelib/plugins/shivaestudios.py index ace417cbd..2f508cabe 100644 --- a/dosagelib/plugins/shivaestudios.py +++ b/dosagelib/plugins/shivaestudios.py @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT -# Copyright (C) 2019-2022 Tobias Gruetzmacher -# Copyright (C) 2019-2021 Daniel Ring +# SPDX-FileCopyrightText: © 2019 Tobias Gruetzmacher +# SPDX-FileCopyrightText: © 2019 Daniel Ring from .common import WordPressSpliced @@ -12,22 +12,20 @@ class _CommonMulti(WordPressSpliced): self.endOfLife = eol -class AbbysAgency(WordPressSpliced): - url = 'https://abbysagency.us/' - stripUrl = url + 'blog/comic/%s/' - firstStripUrl = stripUrl % 'a' - - class AlienDice(WordPressSpliced): url = 'https://aliendice.com/' stripUrl = url + 'comic/%s/' firstStripUrl = stripUrl % '05162001' + def shouldSkipUrl(self, url, data): + """Skip pages without images.""" + return not data.xpath(self.imageSearch) + def getPrevUrl(self, url, data): # Fix broken navigation if url == self.stripUrl % 'day-29-part-2-page-3-4': return self.stripUrl % 'day-29-part-2-page-3-2' - return super(AlienDice, self).getPrevUrl(url, data) + return super().getPrevUrl(url, data) def namer(self, imageUrl, pageUrl): # Fix inconsistent filename @@ -47,12 +45,6 @@ class AlienDiceLegacy(WordPressSpliced): return super().isfirststrip(url.rsplit('?', 1)[0]) -class BlackRose(WordPressSpliced): - url = 'https://www.blackrose.monster/' - stripUrl = url + 'comic/%s/' - firstStripUrl = stripUrl % '2004-11-01' - - class TheCyantianChronicles(_CommonMulti): baseUrl = 'https://cyantian.net/' @@ -81,9 +73,9 @@ class TheCyantianChronicles(_CommonMulti): class Shivae(WordPressSpliced): - url = 'https://shivae.com/' + url = 'https://shivae.net/' stripUrl = url + 'comic/%s/' - firstStripUrl = stripUrl % '09202001' + firstStripUrl = stripUrl % '2002-02-27' class ShivaeComics(_CommonMulti):