diff --git a/CHANGELOG.md b/CHANGELOG.md index bf016aaa..77c5b924 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## Unreleased +- Fixed chapter information parsing for certain manga on `kissmanga` ([#58](https://github.com/mikf/gallery-dl/issues/58)) + ## 1.1.1 - 2017-12-22 - Added support for: - `slideshare` - https://www.slideshare.net/ ([#54](https://github.com/mikf/gallery-dl/issues/54)) diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index 4a4a5410..87ced415 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -301,7 +301,7 @@ class DeviantartCollectionExtractor(DeviantartExtractor): test = [(("https://pencilshadings.deviantart.com" "/favourites/70595441/3D-Favorites"), { "url": "36ea299132a6b0a0cd319318e9bf18ad32e9b8cc", - "keyword": "e32b1840f1e09d1671bdc0f8a7a72472a0df57a8", + "keyword": "703068ad65c4f2d6e34c5f58483e8a221cb55348", "options": (("original", False),), })] diff --git a/gallery_dl/extractor/jaiminisbox.py b/gallery_dl/extractor/jaiminisbox.py index e25b260e..c3d47471 100644 --- a/gallery_dl/extractor/jaiminisbox.py +++ b/gallery_dl/extractor/jaiminisbox.py @@ -20,7 +20,7 @@ class JaiminisboxChapterExtractor(foolslide.FoolslideChapterExtractor): "keyword": "d8919bc8f0351b44e938862214e654401962b5a5", }), ("https://jaiminisbox.com/reader/read/dr-stone/en/0/16/", { - "keyword": "faa77b1f6ff462cd5e01511ab55b8c2d6ec42c3e", + "keyword": "9b658599651f1ae87cab3e0e29dd21e8337a362c", }), ] method = "base64" diff --git a/gallery_dl/extractor/kissmanga.py b/gallery_dl/extractor/kissmanga.py index decacfe6..6a13f877 100644 --- a/gallery_dl/extractor/kissmanga.py +++ b/gallery_dl/extractor/kissmanga.py @@ -58,9 +58,11 @@ class KissmangaExtractor(Extractor): ), data["chapter_string"]) if not match: - match = re.match( - r"[\w ]+?(?: -)? 0*()(\d+)()(?: *[:-]? *(.+))?", - data["chapter_string"]) + match = re.match(( + r".+?(?: -)? ()" + r"0*(\d+)(?:[Vv.]0*(\d+))?" + r"(?: *[:-]? *(.+))?" + ), data["chapter_string"]) volume, chapter, minor, title = match.groups() data["volume"] = util.safe_int(volume) diff --git a/gallery_dl/version.py b/gallery_dl/version.py index b314a018..8b8af630 100644 --- a/gallery_dl/version.py +++ b/gallery_dl/version.py @@ -6,4 +6,4 @@ # it under the terms of the GNU General Public License version 2 as # published by the Free Software Foundation. -__version__ = "1.1.1" +__version__ = "1.1.2-dev" diff --git a/test/test_extractors.py b/test/test_extractors.py index ea5ec2ad..9f4de281 100644 --- a/test/test_extractors.py +++ b/test/test_extractors.py @@ -82,7 +82,7 @@ skip = [ "exhentai", "kissmanga", "mangafox", "dynastyscans", "nijie", "archivedmoe", "archiveofsins", "thebarchive", # temporary issues - "hbrowse", + "mangapark", ] # enable selective testing for direct calls if __name__ == '__main__' and len(sys.argv) > 1: