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

[reddit] fix errors with 't1_…' submissions

Browse Source
This commit is contained in:
Mike Fährmann 2019-12-20 16:49:44 +01:00
parent 58391d492d
commit 9c0928457a
No known key found for this signature in database
GPG Key ID: 5680CA389D365A88
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gallery_dl/extractor/reddit.py
View File

@ -60,14 +60,16 @@ class RedditExtractor(Extractor):
def _urls(self, submissions):
for submission, comments in submissions:
self._visited.add(submission["id"])
if not submission["is_self"]:
yield submission["url"], submission
if submission:
self._visited.add(submission["id"])
for url in text.extract_iter(
submission["selftext_html"] or "", ' href="', '"'):
yield url, submission
if not submission["is_self"]:
yield submission["url"], submission
for url in text.extract_iter(
submission["selftext_html"] or "", ' href="', '"'):
yield url, submission
if comments:
for comment in comments:
@ -298,17 +300,24 @@ class RedditAPI():
while True:
data = self._call(endpoint, params)["data"]
for submission in data["children"]:
submission = submission["data"]
if (date_min <= submission["created_utc"] <= date_max and
id_min <= self._decode(submission["id"]) <= id_max):
if submission["num_comments"] and self.comments:
try:
yield self.submission(submission["id"])
except exception.AuthorizationError:
pass
else:
yield submission, None
for child in data["children"]:
kind = child["kind"]
post = child["data"]
if (date_min <= post["created_utc"] <= date_max and
id_min <= self._decode(post["id"]) <= id_max):
if kind == "t3":
if post["num_comments"] and self.comments:
try:
yield self.submission(post["id"])
except exception.AuthorizationError:
pass
else:
yield post, None
elif kind == "t1" and self.comments:
yield None, (post,)
if not data["after"]:
return