diff --git a/CHANGELOG.md b/CHANGELOG.md index 042ea90b..02430bd0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## Unreleased + ## 1.3.3 - 2018-04-06 - Added extractors for - `nhentai` search results diff --git a/gallery_dl/extractor/kissmanga.py b/gallery_dl/extractor/kissmanga.py index c27d7501..2fcd88ef 100644 --- a/gallery_dl/extractor/kissmanga.py +++ b/gallery_dl/extractor/kissmanga.py @@ -103,11 +103,11 @@ class KissmangaChapterExtractor(KissmangaBase, ChapterExtractor): r"/Manga/[^/?&#]+/[^/?&#]+\?id=(\d+)"] test = [ ("http://kissmanga.com/Manga/Dropout/Ch-000---Oneshot-?id=145847", { - "url": "4136bcd1c6cecbca8cc2bc965d54f33ef0a97cc0", + "url": "46e63fd63e9e16f19bc1e6c7a45dc060815642fd", "keyword": "4a3a9341d453541de0dbfa24cd6b2e3ed39c0182", }), ("http://kissmanga.com/Manga/Urban-Tales/a?id=256717", { - "url": "de074848f6c1245204bb9214c12bcc3ecfd65019", + "url": "c26be8bf9c2abacee2076979d021634092cf38f1", "keyword": "ffc11b630da44fe67709ed0473756cf51b90a05c", }), ("http://kissmanga.com/Manga/Monster/Monster-79?id=7608", { diff --git a/gallery_dl/extractor/tumblr.py b/gallery_dl/extractor/tumblr.py index 5ade7b53..0168c889 100644 --- a/gallery_dl/extractor/tumblr.py +++ b/gallery_dl/extractor/tumblr.py @@ -146,14 +146,20 @@ class TumblrExtractor(Extractor): @staticmethod def _prepare(url, post): + text.nameext_from_url(url, post) post["offset"] += 1 - return Message.Url, url, text.nameext_from_url(url, post) + post["hash"] = post["name"].partition("_")[2] + return Message.Url, url, post @staticmethod def _prepare_image(url, post): + text.nameext_from_url(url, post) post["offset"] += 1 - urls = _original_image(url) - return Message.Urllist, urls, text.nameext_from_url(url, post) + + parts = post["name"].split("_") + post["hash"] = parts[1] if parts[1] != "inline" else parts[2] + + return Message.Urllist, _original_image(url), post class TumblrUserExtractor(TumblrExtractor): diff --git a/gallery_dl/version.py b/gallery_dl/version.py index 534fbc9f..6d2cdfd6 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.3.3" +__version__ = "1.3.4-dev"