Merge branch '26564' of https://github.com/adrianheine/youtube-dl into adrianheine-26564

This commit is contained in:
Tom-Oliver Heidel 2020-09-12 05:37:08 +02:00
commit 310f762636

View File

@ -6,6 +6,8 @@
from .common import InfoExtractor
from ..utils import (
ExtractorError,
GeoRestrictedError,
orderedSet,
unified_strdate,
urlencode_postdata,
@ -59,8 +61,14 @@ def _real_extract(self, url):
for format_url in orderedSet(format_urls)]
if not formats:
formats = self._parse_html5_media_entries(
url, webpage, video_id)[0]['formats']
entries = self._parse_html5_media_entries(
url, webpage, video_id)
if not entries:
error = self._html_search_regex(r'<h1 class="page-title">([^<]+)</h1>', webpage, 'error', default='Cannot find video')
if error == 'Video Unavailable':
raise GeoRestrictedError(error)
raise ExtractorError(error)
formats = entries[0]['formats']
self._check_formats(formats, video_id)
self._sort_formats(formats)