diff --git a/gallery_dl/extractor/35photo.py b/gallery_dl/extractor/35photo.py index edb9d468..27634deb 100644 --- a/gallery_dl/extractor/35photo.py +++ b/gallery_dl/extractor/35photo.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright 2019-2020 Mike Fährmann +# Copyright 2019-2021 Mike Fährmann # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 as @@ -104,7 +104,8 @@ class _35photoUserExtractor(_35photoExtractor): r"/(?!photo_|genre_|tags/|rating/)([^/?#]+)") test = ( ("https://35photo.pro/liya", { - "pattern": r"https://m\d+.35photo.pro/photos_(main|series)/.*.jpg", + "pattern": r"https://([a-z][0-9]\.)?35photo\.pro" + r"/photos_(main|series)/.*\.jpg", "count": 9, }), ("https://35photo.pro/suhoveev", { @@ -214,7 +215,7 @@ class _35photoImageExtractor(_35photoExtractor): test = ("https://35photo.pro/photo_753340/", { "count": 1, "keyword": { - "url" : r"re:https://m\d+.35photo.pro/photos_main/.*.jpg", + "url" : r"re:https://35photo\.pro/photos_main/.*\.jpg", "id" : 753340, "title" : "Winter walk", "description": str, diff --git a/gallery_dl/extractor/500px.py b/gallery_dl/extractor/500px.py index 582fffd8..c2c5a66b 100644 --- a/gallery_dl/extractor/500px.py +++ b/gallery_dl/extractor/500px.py @@ -146,7 +146,7 @@ class _500pxGalleryExtractor(_500pxExtractor): }), # unavailable photos (#1335) ("https://500px.com/p/Light_Expression_Photography/galleries/street", { - "count": ">= 7", + "count": 0, }), ("https://500px.com/fashvamp/galleries/lera"), ) diff --git a/gallery_dl/extractor/foolfuuka.py b/gallery_dl/extractor/foolfuuka.py index 0bcec2b7..5962b9ec 100644 --- a/gallery_dl/extractor/foolfuuka.py +++ b/gallery_dl/extractor/foolfuuka.py @@ -135,7 +135,7 @@ class FoolfuukaThreadExtractor(FoolfuukaExtractor): "url": "61896d9d9a2edb556b619000a308a984307b6d30", }), ("https://thebarchive.com/b/thread/739772332/", { - "url": "e8b18001307d130d67db31740ce57c8561b5d80c", + "url": "07d39d2cb48f40fb337dc992993d965b0cd5f7cd", }), ) diff --git a/gallery_dl/extractor/manganelo.py b/gallery_dl/extractor/manganelo.py index f8e14736..021942eb 100644 --- a/gallery_dl/extractor/manganelo.py +++ b/gallery_dl/extractor/manganelo.py @@ -92,11 +92,12 @@ class ManganeloMangaExtractor(ManganeloBase, MangaExtractor): r"(/(?:manga/|read_)\w+)") test = ( ("https://manganelo.com/manga/ol921234", { - "url": "6ba7f083a6944e414ad8214b74a0a40cb60d4562", + "pattern": ManganeloChapterExtractor.pattern, + "count": ">= 70", }), ("https://manganelo.com/manga/read_otome_no_teikoku", { "pattern": ManganeloChapterExtractor.pattern, - "count": ">= 40" + "count": ">= 40", }), ) diff --git a/gallery_dl/extractor/unsplash.py b/gallery_dl/extractor/unsplash.py index d13ce0ff..e89a5b77 100644 --- a/gallery_dl/extractor/unsplash.py +++ b/gallery_dl/extractor/unsplash.py @@ -69,7 +69,8 @@ class UnsplashImageExtractor(UnsplashExtractor): subcategory = "image" pattern = BASE_PATTERN + r"/photos/([^/?#]+)" test = ("https://unsplash.com/photos/lsoogGC_5dg", { - "url": "b99a5829ca955b768a206aa9afc391bd3f3dd55e", + "pattern": r"https://images\.unsplash\.com/photo-1586348943529-" + r"beaae6c28db9\?ixid=\w+&ixlib=rb-1.2.1", "keyword": { "alt_description": "re:silhouette of trees near body of water ", "blur_hash": "LZP4uQS4jboe%#o0WCa}2doJNaaz", @@ -114,7 +115,7 @@ class UnsplashImageExtractor(UnsplashExtractor): "id": "uMJXuywXLiU", "instagram_username": "just_midwest_rock", "last_name": "Hoefler", - "location": "Madison, WI", + "location": None, "name": "Dave Hoefler", "portfolio_url": str, "total_collections": int, diff --git a/gallery_dl/extractor/weasyl.py b/gallery_dl/extractor/weasyl.py index f8da1917..711d3fa5 100644 --- a/gallery_dl/extractor/weasyl.py +++ b/gallery_dl/extractor/weasyl.py @@ -77,7 +77,7 @@ class WeasylSubmissionExtractor(WeasylExtractor): "keyword": { "comments" : int, "date" : "dt:2012-04-20 00:38:04", - "description" : "
(flex)
", + "description" : "(flex)
\n", "favorites" : int, "folder_name" : "Wesley Stuff", "folderid" : 2081, @@ -160,8 +160,8 @@ class WeasylJournalExtractor(WeasylExtractor): "keyword": { "title" : "BBCode", "date" : "dt:2013-09-19 23:11:23", - "content": "" - "No more of that!
", + "content": "\n\n" + "No more of that!
\n", }, }) diff --git a/gallery_dl/extractor/wikiart.py b/gallery_dl/extractor/wikiart.py index 7fd60b15..511a609b 100644 --- a/gallery_dl/extractor/wikiart.py +++ b/gallery_dl/extractor/wikiart.py @@ -71,8 +71,8 @@ class WikiartArtistExtractor(WikiartExtractor): directory_fmt = ("{category}", "{artist[artistName]}") pattern = BASE_PATTERN + r"/(?!\w+-by-)([\w-]+)/?$" test = ("https://www.wikiart.org/en/thomas-cole", { - "url": "5ba2fbe6783fcce34e65014d16e5fbc581490c98", - "keyword": "eb5b141cf33e6d279afd1518aae24e61cc0adf81", + "url": "5140343730331786117fa5f4c013a6153393e28e", + "keyword": "4d9cbc50ebddfcb186f31ff70b08833578dd0070", }) def __init__(self, match): @@ -97,8 +97,8 @@ class WikiartImageExtractor(WikiartArtistExtractor): pattern = BASE_PATTERN + r"/(?!(?:paintings|artists)-by-)([\w-]+)/([\w-]+)" test = ( ("https://www.wikiart.org/en/thomas-cole/the-departure-1838", { - "url": "4d9fd87680a2620eaeaf1f13e3273475dec93231", - "keyword": "a1b083d500ce2fd364128e35b026e4ca526000cc", + "url": "976cc2545f308a650b5dbb35c29d3cee0f4673b3", + "keyword": "8e80cdcb01c1fedb934633d1c4c3ab0419cfbedf", }), # no year or '-' in slug ("https://www.wikiart.org/en/huang-shen/summer", {