github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[imgur] update URL patterns (#1561)

Browse Source
This commit is contained in:
Mike Fährmann
2021-05-19 15:44:10 +02:00
parent 1eabfa5c7a
commit 4fc9668922
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gallery_dl/extractor/imgur.py
View File

@@ -57,7 +57,8 @@ class ImgurImageExtractor(ImgurExtractor):
subcategory = "image" subcategory = "image"
filename_fmt = "{category}_{id}{title:?_//}.{extension}" filename_fmt = "{category}_{id}{title:?_//}.{extension}"
archive_fmt = "{id}" archive_fmt = "{id}"
pattern = BASE_PATTERN + r"/(?!gallery|search)(\w{7}|\w{5})[sbtmlh]?\.?" pattern = (BASE_PATTERN + r"/(?!gallery|search)"
r"(?:r/\w+/)?(\w{7}|\w{5})[sbtmlh]?")
test = ( test = (
("https://imgur.com/21yMxCS", { ("https://imgur.com/21yMxCS", {
"url": "6f2dcfb86815bdd72808c313e5f715610bc7b9b2", "url": "6f2dcfb86815bdd72808c313e5f715610bc7b9b2",
@@ -110,6 +111,7 @@ class ImgurImageExtractor(ImgurExtractor):
("https://imgur.com/zzzzzzz", { # not found ("https://imgur.com/zzzzzzz", { # not found
"exception": exception.HttpError, "exception": exception.HttpError,
}), }),
("https://m.imgur.com/r/Celebs/iHJ7tsM"),
("https://www.imgur.com/21yMxCS"), # www ("https://www.imgur.com/21yMxCS"), # www
("https://m.imgur.com/21yMxCS"), # mobile ("https://m.imgur.com/21yMxCS"), # mobile
("https://imgur.com/zxaY6"), # 5 character key ("https://imgur.com/zxaY6"), # 5 character key
@@ -289,7 +291,7 @@ class ImgurFavoriteExtractor(ImgurExtractor):
class ImgurSubredditExtractor(ImgurExtractor): class ImgurSubredditExtractor(ImgurExtractor):
"""Extractor for a subreddits's imgur links""" """Extractor for a subreddits's imgur links"""
subcategory = "subreddit" subcategory = "subreddit"
pattern = BASE_PATTERN + r"/r/([^/?#]+)" pattern = BASE_PATTERN + r"/r/([^/?#]+)/?$"
test = ("https://imgur.com/r/pics", { test = ("https://imgur.com/r/pics", {
"range": "1-100", "range": "1-100",
"count": 100, "count": 100,