From 40637556fa1391e765f1cceb8ee20f929234b3f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sun, 28 Jul 2019 10:37:54 +0200 Subject: [PATCH] [ngomik] fix extraction --- gallery_dl/extractor/adultempire.py | 2 +- gallery_dl/extractor/luscious.py | 2 +- gallery_dl/extractor/ngomik.py | 2 +- gallery_dl/extractor/sankaku.py | 4 ++-- test/test_results.py | 1 - 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gallery_dl/extractor/adultempire.py b/gallery_dl/extractor/adultempire.py index d87eb00a..5ea835fe 100644 --- a/gallery_dl/extractor/adultempire.py +++ b/gallery_dl/extractor/adultempire.py @@ -21,7 +21,7 @@ class AdultempireGalleryExtractor(GalleryExtractor): test = ( ("https://www.adultempire.com/5998/gallery.html", { "range": "1", - "keyword": "9057a960a7224873431612e4c95b88b2e8b5c97b", + "keyword": "0533ef1184892be8ac02b17286797c95f389ba63", "content": "5c6beb31e5e3cdc90ee5910d5c30f9aaec977b9e", }), ("https://www.adultdvdempire.com/5683/gallery.html", { diff --git a/gallery_dl/extractor/luscious.py b/gallery_dl/extractor/luscious.py index 65ae8432..dc4022d6 100644 --- a/gallery_dl/extractor/luscious.py +++ b/gallery_dl/extractor/luscious.py @@ -62,7 +62,7 @@ class LusciousAlbumExtractor(LusciousBase, GalleryExtractor): test = ( ("https://luscious.net/albums/okinami-no-koigokoro_277031/", { "url": "7e4984a271a1072ac6483e4228a045895aff86f3", - "keyword": "c597c132834f4990f90bf5dee5de2a9d4ba263a4", + "keyword": "c0536584fc455c67940b032e6b833343871ae93d", "content": "b3a747a6464509440bd0ff6d1267e6959f8d6ff3", }), ("https://luscious.net/albums/virgin-killer-sweater_282582/", { diff --git a/gallery_dl/extractor/ngomik.py b/gallery_dl/extractor/ngomik.py index 8135a8ae..f3608b26 100644 --- a/gallery_dl/extractor/ngomik.py +++ b/gallery_dl/extractor/ngomik.py @@ -44,7 +44,7 @@ class NgomikChapterExtractor(ChapterExtractor): @staticmethod def images(page): - readerarea = text.extract(page, 'id=readerarea', 'class=chnav')[0] + readerarea = text.extract(page, 'id="readerarea"', 'class="chnav"')[0] return [ (text.unescape(url), None) for url in re.findall(r"\ssrc=[\"']?([^\"' >]+)", readerarea) diff --git a/gallery_dl/extractor/sankaku.py b/gallery_dl/extractor/sankaku.py index 012cb8ba..da9735e8 100644 --- a/gallery_dl/extractor/sankaku.py +++ b/gallery_dl/extractor/sankaku.py @@ -283,9 +283,9 @@ class SankakuPostExtractor(SankakuExtractor): "options": (("tags", True),), "keyword": { "tags_artist": "bonocho", - "tags_copyright": "batman_(series) the_dark_knight", - "tags_medium": "sketch copyright_name", "tags_studio": "dc_comics", + "tags_medium": "sketch copyright_name", + "tags_copyright": str, "tags_character": str, "tags_general": str, }, diff --git a/test/test_results.py b/test/test_results.py index 576ddab4..2095f4c9 100644 --- a/test/test_results.py +++ b/test/test_results.py @@ -27,7 +27,6 @@ TRAVIS_SKIP = { # temporary issues, etc. BROKEN = { "mangapark", - "piczel", }