Mirrors/gallery-dl
1
0
Fork 0
mirror of https://github.com/mikf/gallery-dl.git synced 2025-01-31 11:41:35 +01:00
Code Issues Releases Wiki Activity

[reddit] improve gallery extraction (fixes #955)

Browse Source
This commit is contained in:
Mike Fährmann 2020-08-23 21:37:23 +02:00
parent 7140fe7e6d
commit d4ff767291
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gallery_dl/extractor/reddit.py
View File

@ -56,17 +56,9 @@ class RedditExtractor(Extractor):
text.nameext_from_url(url, submission)
yield Message.Url, url, submission
elif submission.get("is_gallery"):
if not submission.get("gallery_data"):
self.log.warning(
"gallery '%s' was deleted", submission["id"])
continue
meta = submission["media_metadata"]
for submission["num"], item in enumerate(
submission["gallery_data"]["items"], 1):
url = meta[item["media_id"]]["s"]["u"]
url = url.partition("?")[0]
url = url.replace("/preview.", "/i.", 1)
elif "gallery_data" in submission:
for submission["num"], url in enumerate(
self._extract_gallery(submission), 1):
text.nameext_from_url(url, submission)
yield Message.Url, url, submission
@ -122,6 +114,22 @@ class RedditExtractor(Extractor):
def submissions(self):
"""Return an iterable containing all (submission, comments) tuples"""
def _extract_gallery(self, submission):
if submission["gallery_data"] is None:
self.log.warning("gallery '%s' was deleted", submission["id"])
return
meta = submission["media_metadata"]
for item in submission["gallery_data"]["items"]:
src = meta[item["media_id"]]["s"]
url = src.get("u") or src.get("gif") or src.get("mp4")
if url:
yield url.partition("?")[0].replace("/preview.", "/i.", 1)
else:
self.log.error("Unable to get download URL for item '%s'",
item["media_id"])
self.log.debug(src)
class RedditSubredditExtractor(RedditExtractor):
"""Extractor for URLs from subreddits on reddit.com"""
@ -196,6 +204,11 @@ class RedditSubmissionExtractor(RedditExtractor):
("https://www.reddit.com/gallery/icfgzv", {
"count": 0,
}),
# animated gallery items (#955)
("https://www.reddit.com/r/araragi/comments/ib32hm", {
"pattern": r"https://i\.redd\.it/\w+\.gif",
"count": 2,
}),
("https://old.reddit.com/r/lavaporn/comments/2a00np/"),
("https://np.reddit.com/r/lavaporn/comments/2a00np/"),
("https://m.reddit.com/r/lavaporn/comments/2a00np/"),