diff options
| author |   Unit 193 <unit193@unit193.net> | 2020-10-25 17:59:22 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2020-10-25 17:59:22 -0400 |
| commit | 5dc7d6f5902ddaee5223d041d5c10060f0c72430 (patch) | |
| tree | 6ddd103a86ea7bbb0d695f5fdfa55e43f04756ca /gallery_dl/extractor/35photo.py | |
| parent | e0c914765184ebbf99cffdecfe8cdbe10f42486e (diff) | |
New upstream version 1.15.2.upstream/1.15.2
Diffstat (limited to 'gallery_dl/extractor/35photo.py')
| -rw-r--r-- | gallery_dl/extractor/35photo.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gallery_dl/extractor/35photo.py b/gallery_dl/extractor/35photo.py index e33aa2d..edb9d46 100644 --- a/gallery_dl/extractor/35photo.py +++ b/gallery_dl/extractor/35photo.py @@ -101,7 +101,7 @@ class _35photoUserExtractor(_35photoExtractor): """Extractor for all images of a user on 35photo.pro""" subcategory = "user" pattern = (r"(?:https?://)?(?:[a-z]+\.)?35photo\.pro" - r"/(?!photo_|genre_|tags/|rating/)([^/?&#]+)") + r"/(?!photo_|genre_|tags/|rating/)([^/?#]+)") test = ( ("https://35photo.pro/liya", { "pattern": r"https://m\d+.35photo.pro/photos_(main|series)/.*.jpg", @@ -142,7 +142,7 @@ class _35photoTagExtractor(_35photoExtractor): subcategory = "tag" directory_fmt = ("{category}", "Tags", "{search_tag}") archive_fmt = "t{search_tag}_{id}_{num}" - pattern = r"(?:https?://)?(?:[a-z]+\.)?35photo\.pro/tags/([^/?&#]+)" + pattern = r"(?:https?://)?(?:[a-z]+\.)?35photo\.pro/tags/([^/?#]+)" test = ("https://35photo.pro/tags/landscape/", { "range": "1-25", "count": 25, |