diff --git a/gallery_dl/extractor/foolslide.py b/gallery_dl/extractor/foolslide.py index ed9e119c..bf925b69 100644 --- a/gallery_dl/extractor/foolslide.py +++ b/gallery_dl/extractor/foolslide.py @@ -173,8 +173,7 @@ EXTRACTORS = { ), "test-manga": ("https://sensescans.com/reader/series/yotsubato/", { - "url": "180d2d2b75008c733d642cdee62354c1a229184d", - "keyword": "2acd6ea5e70d691c5fe0d5d46c60255733cb7d1d", + "count": ">= 3", }), }, "_ckey": "chapterclass", diff --git a/gallery_dl/extractor/gfycat.py b/gallery_dl/extractor/gfycat.py index ac1bca3b..ba2fe5de 100644 --- a/gallery_dl/extractor/gfycat.py +++ b/gallery_dl/extractor/gfycat.py @@ -100,13 +100,13 @@ class GfycatImageExtractor(GfycatExtractor): "gfyName": "GrayGenerousCowrie", "gfyNumber": "755075459", "title": "Bottom's up", - "userName": "jackson3oh3", + "username": "jackson3oh3", "createDate": 1495884169, "md5": "a4796e05b0db9ba9ce5140145cd318aa", "width": 400, "height": 224, - "frameRate": 23, - "numFrames": 158, + "frameRate": 23.0, + "numFrames": 158.0, "views": int, }, }), diff --git a/gallery_dl/extractor/nozomi.py b/gallery_dl/extractor/nozomi.py index abf88cd0..5e7e3873 100644 --- a/gallery_dl/extractor/nozomi.py +++ b/gallery_dl/extractor/nozomi.py @@ -106,7 +106,7 @@ class NozomiPostExtractor(NozomiExtractor): # multiple images per post ("https://nozomi.la/post/25588032.html", { "url": "6aa3b7db385abcc9d374bdffd19187bccbf8f228", - "keyword": "0aa99cbaaeada2984a1fbf912274409c6ba106d4", + "keyword": "8c3a2561ccc9ad429be9850d1383a952d0b4a8ab", "count": 7, }), ) diff --git a/gallery_dl/extractor/paheal.py b/gallery_dl/extractor/paheal.py index 8f2d6339..f08055c0 100644 --- a/gallery_dl/extractor/paheal.py +++ b/gallery_dl/extractor/paheal.py @@ -95,8 +95,8 @@ class PahealPostExtractor(PahealExtractor): pattern = (r"(?:https?://)?(?:rule34|rule63|cosplay)\.paheal\.net" r"/post/view/(\d+)") test = ("https://rule34.paheal.net/post/view/481609", { - "url": "d3fd0f82762716fe3fb03c9c923e61c13ce22204", - "keyword": "35748081bfeaab48f909f4b097a4d79b2be12538", + "url": "a91d579be030753282f55b8cb4eeaa89c45a9116", + "keyword": "44154bdac3d6cf289d0d9739a566acd8b7839e50", "content": "7b924bcf150b352ac75c9d281d061e174c851a11", }) diff --git a/gallery_dl/extractor/pixiv.py b/gallery_dl/extractor/pixiv.py index bed1d049..ee8f9bbe 100644 --- a/gallery_dl/extractor/pixiv.py +++ b/gallery_dl/extractor/pixiv.py @@ -105,7 +105,7 @@ class PixivUserExtractor(PixivExtractor): # avatar (#595, 623) ("https://www.pixiv.net/en/users/173530", { "options": (("avatar", True),), - "content": "22af450d4dbaf4973d370f164f66f48c7382a6de", + "content": "4e57544480cc2036ea9608103e8f024fa737fe66", "range": "1", }), # deleted account @@ -247,10 +247,10 @@ class PixivFavoriteExtractor(PixivExtractor): r"|bookmark\.php(?:\?([^#]*))?)") test = ( ("https://www.pixiv.net/en/users/173530/bookmarks/artworks", { - "url": "a4f574e0a84e3dbafc576cf2c2a0f645c6c4b779", + "url": "e717eb511500f2fa3497aaee796a468ecf685cc4", }), ("https://www.pixiv.net/bookmark.php?id=173530", { - "url": "a4f574e0a84e3dbafc576cf2c2a0f645c6c4b779", + "url": "e717eb511500f2fa3497aaee796a468ecf685cc4", }), # bookmarks with specific tag (("https://www.pixiv.net/en/users/3137110" diff --git a/gallery_dl/extractor/pornhub.py b/gallery_dl/extractor/pornhub.py index bbbc7096..6b36cddb 100644 --- a/gallery_dl/extractor/pornhub.py +++ b/gallery_dl/extractor/pornhub.py @@ -29,9 +29,9 @@ class PornhubGalleryExtractor(PornhubExtractor): archive_fmt = "{id}" pattern = BASE_PATTERN + r"/album/(\d+)" test = ( - ("https://www.pornhub.com/album/1708982", { + ("https://www.pornhub.com/album/17218841", { "pattern": r"https://\w+.phncdn.com/pics/albums/\d+/\d+/\d+/\d+/", - "count": 93, + "count": 81, "keyword": { "id": int, "num": int, @@ -40,11 +40,11 @@ class PornhubGalleryExtractor(PornhubExtractor): "caption": str, "user": "Unknown", "gallery": { - "id" : 1708982, + "id" : 17218841, "score": int, "views": int, "tags" : list, - "title": "Random Hentai", + "title": "Hentai/Ecchi 41", }, }, }), diff --git a/gallery_dl/extractor/sankaku.py b/gallery_dl/extractor/sankaku.py index b07d0242..a9252f50 100644 --- a/gallery_dl/extractor/sankaku.py +++ b/gallery_dl/extractor/sankaku.py @@ -152,7 +152,7 @@ class SankakuTagExtractor(SankakuExtractor): test = ( ("https://chan.sankakucomplex.com/?tags=bonocho", { "count": 5, - "pattern": r"https://cs\.sankakucomplex\.com/data/[^/]{2}/[^/]{2}" + "pattern": r"https://c?s\.sankakucomplex\.com/data/[^/]{2}/[^/]{2}" r"/[^/]{32}\.\w+\?e=\d+&m=[^&#]+", }), # respect 'page' query parameter diff --git a/test/test_results.py b/test/test_results.py index 1756a42b..a594032b 100644 --- a/test/test_results.py +++ b/test/test_results.py @@ -33,7 +33,6 @@ BROKEN = { "imagevenue", "ngomik", "photobucket", - "pururin", }