github/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-21 20:46:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix python2 compatibility and title extraction

Browse source
This commit is contained in:
xarantolus 2020-07-31 10:05:11 +02:00
parent f536080701
commit 299056ad52
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
youtube_dl/extractor/youtube.py
View file

@ -3325,7 +3325,7 @@ def _real_initialize(self):
def _find_videos_in_json(self, extracted): def _find_videos_in_json(self, extracted):
videos = [] videos = []
continuation = None c = {}
def _real_find(obj): def _real_find(obj):
if obj is None or isinstance(obj, str): if obj is None or isinstance(obj, str):
@ -3341,8 +3341,7 @@ def _real_find(obj):
return return
if "nextContinuationData" in obj: if "nextContinuationData" in obj:
nonlocal continuation c["continuation"] = obj["nextContinuationData"]
continuation = obj["nextContinuationData"]
return return
for _, o in obj.items(): for _, o in obj.items():
@ -3350,7 +3349,7 @@ def _real_find(obj):
_real_find(extracted) _real_find(extracted)
return videos, continuation return videos, try_get(c, lambda x: x["continuation"])
def _entries(self, page): def _entries(self, page):
info = [] info = []
@ -3384,7 +3383,7 @@ def _entries(self, page):
info.extend(new_info) info.extend(new_info)
for video in new_info: for video in new_info:
yield self.url_result(try_get(video, lambda x: x['videoId']), YoutubeIE.ie_key(), video_title=try_get(video, lambda x: x['title']['simpleText'])) yield self.url_result(try_get(video, lambda x: x['videoId']), YoutubeIE.ie_key(), video_title=try_get(video, lambda x: x['title']['runs'][0]['text']))
if not continuation: if not continuation:
break break