diff --git a/gallery_dl/extractor/artstation.py b/gallery_dl/extractor/artstation.py index d69aa6f1..34badc07 100644 --- a/gallery_dl/extractor/artstation.py +++ b/gallery_dl/extractor/artstation.py @@ -191,8 +191,10 @@ class ArtstationLikesExtractor(ArtstationExtractor): pattern = [r"(?:https?://)?(?:www\.)?artstation\.com" r"/(?!artwork|projects|search)([^/?&#]+)/likes/?"] test = [ - ("https://www.artstation.com/dcchris/likes", { - "count": ">= 3", + ("https://www.artstation.com/mikf/likes", { + "pattern": r"https://\w+\.artstation\.com/p/assets" + r"/images/images/\d+/\d+/\d+/large/[^/]+", + "count": 6, }), # no likes ("https://www.artstation.com/sungchoi/likes", { @@ -219,7 +221,8 @@ class ArtstationChallengeExtractor(ArtstationExtractor): (("https://www.artstation.com/contests/thu-2017/challenges/20"), None), (("https://www.artstation.com/contests/beyond-human" "/challenges/23?sorting=winners"), { - "count": 203, + "range": "1-30", + "count": 30, }), ] diff --git a/gallery_dl/extractor/imagefap.py b/gallery_dl/extractor/imagefap.py index a1d88635..9e3b8997 100644 --- a/gallery_dl/extractor/imagefap.py +++ b/gallery_dl/extractor/imagefap.py @@ -133,13 +133,19 @@ class ImagefapUserExtractor(ImagefapExtractor): """Extractor for all galleries from a user at imagefap.com""" subcategory = "user" categorytransfer = True - pattern = [(r"(?:https?://)?(?:www\.)?imagefap\.com/" - r"profile(?:\.php\?user=|/)([^/]+)"), - (r"(?:https?://)?(?:www\.)?imagefap\.com/" - r"usergallery\.php\?userid=(\d+)")] - test = [("https://www.imagefap.com/profile/Mr%20Bad%20Example/galleries", { - "url": "4c400a10d496701734d3bd7414ce2f45e6543c65", - })] + pattern = [(r"(?:https?://)?(?:www\.)?imagefap\.com" + r"/profile(?:\.php\?user=|/)([^/?&#]+)"), + (r"(?:https?://)?(?:www\.)?imagefap\.com" + r"/usergallery\.php\?userid=(\d+)")] + test = [ + ("https://www.imagefap.com/profile/LucyRae/galleries", { + "url": "d941aa906f56a75972a7a5283030eb9a8d27a4fd", + }), + ("https://www.imagefap.com/usergallery.php?userid=1862791", { + "url": "d941aa906f56a75972a7a5283030eb9a8d27a4fd", + }), + ("https://www.imagefap.com/profile.php?user=LucyRae", None), + ] def __init__(self, match): ImagefapExtractor.__init__(self) diff --git a/gallery_dl/extractor/pinterest.py b/gallery_dl/extractor/pinterest.py index 8672eb4b..2b6e7f74 100644 --- a/gallery_dl/extractor/pinterest.py +++ b/gallery_dl/extractor/pinterest.py @@ -119,8 +119,8 @@ class PinterestRelatedPinExtractor(PinterestPinExtractor): pattern = [BASE_PATTERN + r"/pin/([^/?#&]+).*#related$"] test = [ ("https://www.pinterest.com/pin/858146903966145189/#related", { - "range": "1-50", - "count": 50, + "range": "31-50", + "count": 20, }), ] @@ -140,8 +140,8 @@ class PinterestRelatedBoardExtractor(PinterestBoardExtractor): pattern = [BASE_PATTERN + r"/(?!pin/)([^/?#&]+)/([^/?#&]+).*#related$"] test = [ ("https://www.pinterest.com/g1952849/test-/#related", { - "range": "1-50", - "count": 50, + "range": "31-50", + "count": 20, }), ] diff --git a/gallery_dl/extractor/smugmug.py b/gallery_dl/extractor/smugmug.py index 8e925248..cec9e80e 100644 --- a/gallery_dl/extractor/smugmug.py +++ b/gallery_dl/extractor/smugmug.py @@ -56,7 +56,7 @@ class SmugmugAlbumExtractor(SmugmugExtractor): pattern = [r"smugmug:album:([^:]+)$"] test = [ ("smugmug:album:ddvxpg", { - "url": "8775c2cf05f001e895435faa89f22a03214568bf", + "url": "0429e9bf50ee600674e448934e3882ca1761ae7b", }), # empty ("smugmug:album:SXvjbW", { @@ -64,7 +64,7 @@ class SmugmugAlbumExtractor(SmugmugExtractor): }), # no "User" ("smugmug:album:6VRT8G", { - "url": "3d3f161a77e2e11a04b6778cc62238128c1f1113", + "url": "c4a0f4c4bfd514b93cbdeb02b3345bf7ef6604df", }), ] @@ -97,14 +97,14 @@ class SmugmugImageExtractor(SmugmugExtractor): pattern = [BASE_PATTERN + r"(?:/[^/?&#]+)+/i-([^/?&#]+)"] test = [ ("https://acapella.smugmug.com/Micro-Macro/Drops/i-g2Dmf9z", { - "url": "ab0d7aa001a53ff3fd228622070b39005b6fc179", - "keyword": "a116167929c22338e6067b81c5d3bee641df3af3", + "url": "78f0bf3516b6d670b7319216bdeccb35942ca4cf", + "keyword": "8ebb25fb493d3cd5cfcb8f3a4601fa721afe1d83", "content": "64a8f69a1d824921eebbdf2420087937adfa45cd", }), # no "ImageOwner" ("https://www.smugmug.com/gallery/n-GLCjnD/i-JD62fQk", { - "url": "721023fd2cba1a88404b54039d9eebb5756d1e68", - "keyword": "1189f48e6b2592f6b90f8bd875238e93aba780e7", + "url": "d4047637947b35e4ef49e3c7cb70303cc224a3a0", + "keyword": "96fc43bc3081f6356c929be43ab5971009975063", }), ] diff --git a/test/test_results.py b/test/test_results.py index fbcc6f98..26b666ad 100644 --- a/test/test_results.py +++ b/test/test_results.py @@ -25,8 +25,6 @@ TRAVIS_SKIP = { BROKEN = { "deviantart", "dokireader", - "imagefap", - "seaotterscans", }