summaryrefslogtreecommitdiffstats
path: root/gallery_dl/extractor/imgur.py
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@unit193.net>2021-06-05 20:55:36 -0400
committerLibravatarUnit 193 <unit193@unit193.net>2021-06-05 20:55:36 -0400
commit8a644b7a06c504263a478d3681eed10b4161b5be (patch)
treeb3d668588e5c0be8c75467e50499f73ff9ec7c05 /gallery_dl/extractor/imgur.py
parente7eb1f9779f2e223575ab23a6bc1abf2222e7d27 (diff)
New upstream version 1.17.5.upstream/1.17.5
Diffstat (limited to 'gallery_dl/extractor/imgur.py')
-rw-r--r--gallery_dl/extractor/imgur.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/gallery_dl/extractor/imgur.py b/gallery_dl/extractor/imgur.py
index 7009c7a..f925c9e 100644
--- a/gallery_dl/extractor/imgur.py
+++ b/gallery_dl/extractor/imgur.py
@@ -57,7 +57,8 @@ class ImgurImageExtractor(ImgurExtractor):
subcategory = "image"
filename_fmt = "{category}_{id}{title:?_//}.{extension}"
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 = (
("https://imgur.com/21yMxCS", {
"url": "6f2dcfb86815bdd72808c313e5f715610bc7b9b2",
@@ -110,6 +111,7 @@ class ImgurImageExtractor(ImgurExtractor):
("https://imgur.com/zzzzzzz", { # not found
"exception": exception.HttpError,
}),
+ ("https://m.imgur.com/r/Celebs/iHJ7tsM"),
("https://www.imgur.com/21yMxCS"), # www
("https://m.imgur.com/21yMxCS"), # mobile
("https://imgur.com/zxaY6"), # 5 character key
@@ -289,7 +291,7 @@ class ImgurFavoriteExtractor(ImgurExtractor):
class ImgurSubredditExtractor(ImgurExtractor):
"""Extractor for a subreddits's imgur links"""
subcategory = "subreddit"
- pattern = BASE_PATTERN + r"/r/([^/?#]+)"
+ pattern = BASE_PATTERN + r"/r/([^/?#]+)/?$"
test = ("https://imgur.com/r/pics", {
"range": "1-100",
"count": 100,