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

[reddit] allow arbitrary subdomains

Browse Source
This commit is contained in:
Mike Fährmann
2018-05-13 11:23:23 +02:00
parent 4cea886177
commit 92fc199b07
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gallery_dl/extractor/reddit.py
View File

@@ -72,12 +72,15 @@ class RedditExtractor(Extractor):
class RedditSubredditExtractor(RedditExtractor): class RedditSubredditExtractor(RedditExtractor):
"""Extractor for images from subreddits on reddit.com""" """Extractor for images from subreddits on reddit.com"""
subcategory = "subreddit" subcategory = "subreddit"
pattern = [r"(?:https?://)?(?:m\.|www\.)?reddit\.com/r/([^/?&#]+)" pattern = [r"(?:https?://)?(?:\w+\.)?reddit\.com/r/([^/?&#]+)"
r"(/[a-z]+)?/?" r"(/[a-z]+)?/?"
r"(?:\?.*?(?:\bt=([a-z]+))?)?$"] r"(?:\?.*?(?:\bt=([a-z]+))?)?$"]
test = [ test = [
("https://www.reddit.com/r/lavaporn/", None), ("https://www.reddit.com/r/lavaporn/", None),
("https://www.reddit.com/r/lavaporn/top/?sort=top&t=month", None), ("https://www.reddit.com/r/lavaporn/top/?sort=top&t=month", None),
("https://old.reddit.com/r/lavaporn/", None),
("https://np.reddit.com/r/lavaporn/", None),
("https://m.reddit.com/r/lavaporn/", None),
] ]
def __init__(self, match): def __init__(self, match):
@@ -94,7 +97,7 @@ class RedditSubmissionExtractor(RedditExtractor):
"""Extractor for images from a submission on reddit.com""" """Extractor for images from a submission on reddit.com"""
subcategory = "submission" subcategory = "submission"
pattern = [(r"(?:https?://)?(?:" pattern = [(r"(?:https?://)?(?:"
r"(?:m\.|www\.)?reddit\.com/r/[^/]+/comments|" r"(?:\w+\.)?reddit\.com/r/[^/?&#]+/comments|"
r"redd\.it" r"redd\.it"
r")/([a-z0-9]+)")] r")/([a-z0-9]+)")]
test = [ test = [
@@ -102,6 +105,8 @@ class RedditSubmissionExtractor(RedditExtractor):
"pattern": r"https?://i\.imgur\.com/AaAUCgy\.jpg", "pattern": r"https?://i\.imgur\.com/AaAUCgy\.jpg",
"count": 1, "count": 1,
}), }),
("https://old.reddit.com/r/lavaporn/comments/2a00np/", None),
("https://np.reddit.com/r/lavaporn/comments/2a00np/", None),
("https://m.reddit.com/r/lavaporn/comments/2a00np/", None), ("https://m.reddit.com/r/lavaporn/comments/2a00np/", None),
("https://redd.it/2a00np/", None), ("https://redd.it/2a00np/", None),
] ]