Fix all MangaDex comics
This commit is contained in:
parent
73675fb162
commit
ade72c28c5
1 changed files with 88 additions and 68 deletions
|
@ -7,63 +7,83 @@ from ..scraper import _ParserScraper
|
||||||
|
|
||||||
|
|
||||||
class MangaDex(_ParserScraper):
|
class MangaDex(_ParserScraper):
|
||||||
imageSearch = '//img[contains(@class, "_images")]/@data-url'
|
|
||||||
prevSearch = '//a[contains(@class, "_prevEpisode")]'
|
|
||||||
multipleImagesPerStrip = True
|
multipleImagesPerStrip = True
|
||||||
|
|
||||||
def __init__(self, name, mangaid):
|
def __init__(self, name, mangaId):
|
||||||
super(MangaDex, self).__init__('MangaDex/' + name)
|
super(MangaDex, self).__init__('MangaDex/' + name)
|
||||||
|
|
||||||
baseUrl = 'https://mangadex.org/api/'
|
baseUrl = 'https://api.mangadex.org/'
|
||||||
self.url = baseUrl + '?id=%s&type=manga' % str(mangaid)
|
self.url = baseUrl + 'manga/%s' % mangaId
|
||||||
self.stripUrl = baseUrl + '?id=%s&type=chapter'
|
self.chaptersUrl = baseUrl + 'manga/%s/feed?translatedLanguage[]=en&order[chapter]=desc&limit=500' % mangaId
|
||||||
|
self.stripUrl = baseUrl + 'chapter/%s'
|
||||||
|
self.imageUrl = 'https://s2.mangadex.org/data/%s/%%s'
|
||||||
|
|
||||||
def starter(self):
|
def starter(self):
|
||||||
# Retrieve manga metadata from API
|
# Retrieve manga metadata from API
|
||||||
manga = self.session.get(self.url)
|
mangaData = self.session.get(self.url)
|
||||||
manga.raise_for_status()
|
mangaData.raise_for_status()
|
||||||
mangaData = manga.json()
|
manga = mangaData.json()['data']
|
||||||
|
|
||||||
|
# Retrieve chapter list from API
|
||||||
|
chapterList = []
|
||||||
|
chapterTotal = 1
|
||||||
|
chapterOffset = 0
|
||||||
|
while len(chapterList) < chapterTotal:
|
||||||
|
chapterData = self.session.get(self.chaptersUrl + '&offset=%d' % chapterOffset)
|
||||||
|
chapterData.raise_for_status()
|
||||||
|
chapterBlock = chapterData.json()
|
||||||
|
chapterTotal = chapterBlock['total']
|
||||||
|
chapterOffset = chapterBlock['offset'] + chapterBlock['limit']
|
||||||
|
chapterList.extend(map(lambda c: c['data'], chapterBlock['results']))
|
||||||
|
|
||||||
# Determine if manga is complete and/or adult
|
# Determine if manga is complete and/or adult
|
||||||
if mangaData['manga']['last_chapter'] != '0':
|
if manga['attributes']['lastChapter'] != '0':
|
||||||
for ch in mangaData['chapter']:
|
for chapter in chapterList:
|
||||||
if mangaData['chapter'][ch]['chapter'] == mangaData['manga']['last_chapter']:
|
if chapter['attributes']['chapter'] == manga['attributes']['lastChapter']:
|
||||||
self.endOfLife = True
|
self.endOfLife = True
|
||||||
if mangaData['manga']['hentai'] != '0':
|
break
|
||||||
|
|
||||||
|
if manga['attributes']['contentRating'] != 'safe':
|
||||||
self.adult = True
|
self.adult = True
|
||||||
|
|
||||||
# Prepare chapter list
|
# Prepare chapter list
|
||||||
self.chapters = []
|
self.chapters = []
|
||||||
for ch in mangaData['chapter']:
|
for chapter in chapterList:
|
||||||
if mangaData['chapter'][ch]['lang_code'] != 'gb':
|
|
||||||
continue
|
|
||||||
if len(self.chapters) < 1:
|
if len(self.chapters) < 1:
|
||||||
self.chapters.append(ch)
|
self.chapters.append(chapter)
|
||||||
continue
|
continue
|
||||||
if mangaData['chapter'][ch]['chapter'] == mangaData['chapter'][self.chapters[-1]]['chapter']:
|
if chapter['attributes']['chapter'] == self.chapters[-1]['attributes']['chapter']:
|
||||||
continue
|
continue
|
||||||
if mangaData['chapter'][ch]['chapter'] == '':
|
if chapter['attributes']['chapter'] == '':
|
||||||
continue
|
continue
|
||||||
self.chapters.append(ch)
|
self.chapters.append(chapter)
|
||||||
self.chapters.reverse()
|
self.chapters.reverse()
|
||||||
|
|
||||||
# Find first and last chapter
|
# Find first and last chapter
|
||||||
self.firstStripUrl = self.stripUrl % self.chapters[0]
|
self.firstStripUrl = self.stripUrl % self.chapters[0]['id']
|
||||||
return self.stripUrl % self.chapters[-1]
|
return self.stripUrl % self.chapters[-1]['id']
|
||||||
|
|
||||||
def getPrevUrl(self, url, data):
|
def getPrevUrl(self, url, data):
|
||||||
chapter = url.replace('&type=chapter', '').rsplit('=', 1)[-1]
|
# Determine previous chapter ID from cached list
|
||||||
return self.stripUrl % self.chapters[self.chapters.index(chapter) - 1]
|
chapterId = url.rsplit('/', 1)[-1]
|
||||||
|
chapter = list(filter(lambda c: c['id'] == chapterId, self.chapters))
|
||||||
|
if len(chapter) == 0:
|
||||||
|
return None
|
||||||
|
return self.stripUrl % self.chapters[self.chapters.index(chapter[0]) - 1]['id']
|
||||||
|
|
||||||
def fetchUrls(self, url, data, urlSearch):
|
def fetchUrls(self, url, data, urlSearch):
|
||||||
# Retrieve chapter metadata from API
|
# Retrieve chapter metadata from API
|
||||||
chapterData = json.loads(data.text_content())
|
chapterData = json.loads(data.text_content())
|
||||||
self.chapter = chapterData['chapter']
|
self.chapter = chapterData['data']
|
||||||
|
|
||||||
# Save link order for position-based filenames
|
# Save link order for position-based filenames
|
||||||
imageUrl = chapterData['server'] + chapterData['hash'] + '/%s'
|
imageUrl = self.imageUrl % self.chapter['attributes']['hash']
|
||||||
self.imageUrls = [imageUrl % page for page in chapterData['page_array']]
|
self.imageUrls = [imageUrl % page for page in self.chapter['attributes']['data']]
|
||||||
return self.imageUrls
|
return self.imageUrls
|
||||||
|
|
||||||
def namer(self, imageUrl, pageUrl):
|
def namer(self, imageUrl, pageUrl):
|
||||||
# Construct filename from episode number and page index in array
|
# Construct filename from episode number and page index in array
|
||||||
chapterNum = self.chapter
|
chapterNum = self.chapter['attributes']['chapter']
|
||||||
pageNum = self.imageUrls.index(imageUrl)
|
pageNum = self.imageUrls.index(imageUrl)
|
||||||
pageExt = imageUrl.rsplit('.')[-1]
|
pageExt = imageUrl.rsplit('.')[-1]
|
||||||
return '%s-%02d.%s' % (chapterNum, pageNum, pageExt)
|
return '%s-%02d.%s' % (chapterNum, pageNum, pageExt)
|
||||||
|
@ -71,44 +91,44 @@ class MangaDex(_ParserScraper):
|
||||||
@classmethod
|
@classmethod
|
||||||
def getmodules(cls):
|
def getmodules(cls):
|
||||||
return (
|
return (
|
||||||
cls('AttackonTitan', 429),
|
cls('AttackOnTitan', '304ceac3-8cdb-4fe7-acf7-2b6ff7a60613'),
|
||||||
cls('Beastars', 20523),
|
cls('Beastars', 'f5e3baad-3cd4-427c-a2ec-ad7d776b370d'),
|
||||||
cls('BokuNoKokoroNoYabaiYatsu', 23811),
|
cls('BokuNoKokoroNoYabaiYatsu', '3df1a9a3-a1be-47a3-9e90-9b3e55b1d0ac'),
|
||||||
cls('DeliciousinDungeon', 13871),
|
cls('DeliciousinDungeon', 'd90ea6cb-7bc3-4d80-8af0-28557e6c4e17'),
|
||||||
cls('DragonDrive', 5165),
|
cls('DragonDrive', '5c06ae70-b5cf-431a-bcd5-262a411de527'),
|
||||||
cls('FuguushokuKajishiDakedoSaikyouDesu', 56319),
|
cls('FuguushokuKajishiDakedoSaikyouDesu', '17b3b648-fd89-4a69-9a42-6068ffbfa7a7'),
|
||||||
cls('GanbareDoukiChan', 46585),
|
cls('GanbareDoukiChan', '190616bc-7da6-45fd-abd4-dd2ca656c183'),
|
||||||
cls('HangingOutWithAGamerGirl', 42490),
|
cls('HangingOutWithAGamerGirl', 'de9e3b62-eac5-4c0a-917d-ffccad694381'),
|
||||||
cls('HoriMiya', 6770),
|
cls('HoriMiya', 'a25e46ec-30f7-4db6-89df-cacbc1d9a900'),
|
||||||
cls('HowToOpenATriangularRiceball', 19305),
|
cls('HowToOpenATriangularRiceball', '6ebd90ce-d5e8-49c0-a4bc-e02e0f8ecb93'),
|
||||||
cls('InterspeciesReviewers', 20796),
|
cls('InterspeciesReviewers', '1b2fddf9-1385-4f3c-b37a-cf86a9428b1a'),
|
||||||
cls('JahySamaWaKujikenai', 22369),
|
cls('JahySamaWaKujikenai', '2f4e5f5b-d930-4266-8c8a-c4cf9a81e51f'),
|
||||||
cls('JingaiNoYomeToIchaIchaSuru', 22651),
|
cls('JingaiNoYomeToIchaIchaSuru', '809d2493-df3c-4e72-a57e-3e0026cae9fb'),
|
||||||
cls('KawaiiJoushiWoKomarasetai', 17910),
|
cls('KawaiiJoushiWoKomarasetai', '23b7cc7a-df89-4049-af28-1fa78f88713e'),
|
||||||
cls('KanojoOkarishimasu', 22151),
|
cls('KanojoOkarishimasu', '32fdfe9b-6e11-4a13-9e36-dcd8ea77b4e4'),
|
||||||
cls('Lv2KaraCheatDattaMotoYuushaKouhoNoMattariIsekaiLife', 33797),
|
cls('Lv2KaraCheatDattaMotoYuushaKouhoNoMattariIsekaiLife', '58bc83a0-1808-484e-88b9-17e167469e23'),
|
||||||
cls('MaouNoOreGaDoreiElfWoYomeNiShitandaGaDouMederebaIi', 25495),
|
cls('MaouNoOreGaDoreiElfWoYomeNiShitandaGaDouMederebaIi', '55ace2fb-e157-4d76-9e72-67c6bd762a39'),
|
||||||
cls('ModernMoGal', 30308),
|
cls('ModernMoGal', 'b1953f80-36f7-492c-b0f8-e9dd0ad01752'),
|
||||||
cls('MyTinySenpaiFromWork', 43610),
|
cls('MyTinySenpaiFromWork', '28ed63af-61f8-43af-bac3-762030c72963'),
|
||||||
cls('OMaidensinYourSavageSeason', 22030),
|
cls('OMaidensinYourSavageSeason', 'c4613b7d-7a6e-48f9-82f0-bce3dd33383a'),
|
||||||
cls('OokamiShounenWaKyouMoUsoOKasaneru', 14569),
|
cls('OokamiShounenWaKyouMoUsoOKasaneru', '5e77d9e2-2e44-431a-a995-5fefd411e55e'),
|
||||||
cls('OokamiToKoshinryou', 1168),
|
cls('OokamiToKoshinryou', 'de900fd3-c94c-4148-bbcb-ca56eaeb57a4'),
|
||||||
cls('OtomeYoukaiZakuro', 4533),
|
cls('OtomeYoukaiZakuro', 'c1fa97be-0f1f-4686-84bc-806881c97d53'),
|
||||||
cls('OversimplifiedSCP', 32834),
|
cls('OversimplifiedSCP', 'e911fe33-a9b3-43dc-9eb7-f5ee081a6dc8'),
|
||||||
cls('PashiriNaBokuToKoisuruBanchouSan', 25862),
|
cls('PashiriNaBokuToKoisuruBanchouSan', '838e5b3a-51c8-44cf-b6e2-68193416f6fe'),
|
||||||
cls('PleaseDontBullyMeNagatoro', 22631),
|
cls('PleaseDontBullyMeNagatoro', 'd86cf65b-5f6c-437d-a0af-19a31f94ec55'),
|
||||||
cls('PleaseDontBullyMeNagatoroComicAnthology', 31004),
|
cls('PleaseDontBullyMeNagatoroComicAnthology', '2a4bc9ec-2d70-428a-8b46-27f6218ed267'),
|
||||||
cls('PleaseTellMeGalkochan', 12702),
|
cls('PleaseTellMeGalkochan', '7a2f2f6b-a6a6-4149-879b-3fc2f6916549'),
|
||||||
cls('SaekiSanWaNemutteru', 28834),
|
cls('SaekiSanWaNemutteru', 'd9aecdab-8aef-4b90-98d5-32e86faffb28'),
|
||||||
cls('SenpaiGaUzaiKouhaiNoHanashi', 23825),
|
cls('SenpaiGaUzaiKouhaiNoHanashi', 'af38f328-8df1-4b4c-a272-e737625c3ddc'),
|
||||||
cls('SewayakiKitsuneNoSenkoSan', 22723),
|
cls('SewayakiKitsuneNoSenkoSan', 'c26269c7-0f5d-4966-8cd5-b79acb86fb7a'),
|
||||||
cls('SousouNoFrieren', 48045),
|
cls('SousouNoFrieren', 'b0b721ff-c388-4486-aa0f-c2b0bb321512'),
|
||||||
cls('SwordArtOnline', 1360),
|
cls('SwordArtOnline', '3dd0b814-23f4-4342-b75b-f206598534f6'),
|
||||||
cls('SwordArtOnlineProgressive', 9604),
|
cls('SwordArtOnlineProgressive', '22ea3f54-11e4-4932-a527-89d63d3a62d9'),
|
||||||
cls('TamenDeGushi', 13939),
|
cls('TamenDeGushi', '3f1453fb-9dac-4aca-a2ea-69613856c952'),
|
||||||
cls('TheWolfAndRedRidingHood', 31079),
|
cls('TheWolfAndRedRidingHood', 'a7d1283b-ed38-4659-b8bc-47bfca5ccb8a'),
|
||||||
cls('TomoChanWaOnnanoko', 15722),
|
cls('TomoChanWaOnnanoko', '76ee7069-23b4-493c-bc44-34ccbf3051a8'),
|
||||||
cls('TonikakuKawaii', 23439),
|
cls('TonikakuKawaii', '30f3ac69-21b6-45ad-a110-d011b7aaadaa'),
|
||||||
cls('YotsubaAnd', 311),
|
cls('YotsubaAnd', '58be6aa6-06cb-4ca5-bd20-f1392ce451fb'),
|
||||||
cls('YuYuHakusho', 1738),
|
cls('YuYuHakusho', '44a5cbe1-0204-4cc7-a1ff-0fda2ac004b6'),
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue