diff options
| author | xarantolus <xarantolus@protonmail.com> | 2020-08-24 14:29:16 +0200 |
|---|---|---|
| committer | xarantolus <xarantolus@protonmail.com> | 2020-08-24 14:29:16 +0200 |
| commit | 7d743516b541cf448bbaaa35ac95f8ecc8139432 (patch) | |
| tree | f797b4c79a82b431ffb9499fd5965dd7e8e49192 | |
| parent | 2ad7b6ace9e042a283612f209aa0094819059ae1 (diff) | |
| download | hypervideo-pre-7d743516b541cf448bbaaa35ac95f8ecc8139432.tar.lz hypervideo-pre-7d743516b541cf448bbaaa35ac95f8ecc8139432.tar.xz hypervideo-pre-7d743516b541cf448bbaaa35ac95f8ecc8139432.zip | |
[youtube] Make `ytcfg.set` config extraction non-fatal
If the markup of the page changes in the future, it might be possible that _FEED_DATA still works, but the other regex does not. SInce it is not necessary for the first page of videos, we make sure the program doesn't exit before extracting them.
TL;DR: Extract the first video page even if there are problems
| -rw-r--r-- | youtube_dl/extractor/youtube.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index ad8db2c2d..ee8a4626d 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -3350,7 +3350,7 @@ class YoutubeFeedsInfoExtractor(YoutubeBaseInfoExtractor): def _entries(self, page): info = [] - yt_conf = self._parse_json(self._search_regex(self._YTCFG_DATA, page, 'ytcfg.set'), None) + yt_conf = self._parse_json(self._search_regex(self._YTCFG_DATA, page, 'ytcfg.set', default="null"), None, fatal=False) search_response = self._parse_json(self._search_regex(self._FEED_DATA, page, 'ytInitialData'), None) @@ -3381,7 +3381,7 @@ class YoutubeFeedsInfoExtractor(YoutubeBaseInfoExtractor): 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']['runs'][0]['text'])) - if not continuation: + if not continuation or not yt_conf: break search_response = self._download_json( |