From 0245a0ba5f974df7ec620e3b42060fb4a6e4927f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Tue, 8 Aug 2017 19:11:13 +0200 Subject: [PATCH] fix extraction and update test results - fixes for hbrowse, imgyt, imgcandy, hosturimage - test updates for deviantart, gfycat --- gallery_dl/extractor/deviantart.py | 2 +- gallery_dl/extractor/gfycat.py | 2 +- gallery_dl/extractor/hbrowse.py | 4 ++-- gallery_dl/extractor/imagehosts.py | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gallery_dl/extractor/deviantart.py b/gallery_dl/extractor/deviantart.py index 4f65127d..c52ac74f 100644 --- a/gallery_dl/extractor/deviantart.py +++ b/gallery_dl/extractor/deviantart.py @@ -284,7 +284,7 @@ class DeviantartCollectionExtractor(DeviantartExtractor): r"/favourites/(\d+)/([^/?&#]+)"] test = [("http://rosuuri.deviantart.com/favourites/58951174/Useful", { "url": "65d070eae215b9375b4437a1ab4659efdad204e3", - "keyword": "a8b7b7c8ef9a4eba87c96cfaf098a7ef1c1e8be5", + "keyword": "b4abbad60f87a42fb6c1a021cb3a8efd9d31bfb7", })] def __init__(self, match): diff --git a/gallery_dl/extractor/gfycat.py b/gallery_dl/extractor/gfycat.py index 467e453a..95cb655d 100644 --- a/gallery_dl/extractor/gfycat.py +++ b/gallery_dl/extractor/gfycat.py @@ -45,7 +45,7 @@ class GfycatImageExtractor(GfycatExtractor): test = [ ("https://gfycat.com/GrayGenerousCowrie", { "url": "e0b5e1d7223108249b15c3c7898dd358dbfae045", - "keyword": "77a65049939823071b532cbdb7dec77582c6ee5b", + "keyword": "f92a5792df3ae61817627768897f1d0dd134c2e4", "content": "3157cd8b3799205c5a0df98a7ee31aa85bf6491e", }), (("https://thumbs.gfycat.com/SillyLameIsabellinewheatear" diff --git a/gallery_dl/extractor/hbrowse.py b/gallery_dl/extractor/hbrowse.py index e29ea060..6fad0dba 100644 --- a/gallery_dl/extractor/hbrowse.py +++ b/gallery_dl/extractor/hbrowse.py @@ -65,10 +65,10 @@ class HbrowseChapterExtractor(Extractor): return text.extract_all(page, ( ('title' , '', ''), (None , '', ''), - ('artist' , 'title="">', '<'), + ('artist' , '>', '<'), ('count-total', '', ' '), (None , '', ''), - ('origin' , 'title="">', '<'), + ('origin' , '>', '<'), ), values=data)[0] def get_image_urls(self, page): diff --git a/gallery_dl/extractor/imagehosts.py b/gallery_dl/extractor/imagehosts.py index ac0d7288..cfbe27e9 100644 --- a/gallery_dl/extractor/imagehosts.py +++ b/gallery_dl/extractor/imagehosts.py @@ -76,11 +76,11 @@ class ImgytImageExtractor(ImagehostImageExtractor): https = True def get_info(self, page): - url, pos = text.extract(page, "", "', '') - url, pos = text.extract(page, "src='", "'", pos) + url, pos = text.extract(page, 'src="', '"', pos) return url, url