projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Fix extraction (closes #20758, closes #20759, closes #20761, closes #20762...
[youtube-dl]
/
youtube_dl
/
extractor
/
dplay.py
diff --git
a/youtube_dl/extractor/dplay.py
b/youtube_dl/extractor/dplay.py
index fe47f6dcef72dcac44aa811ca3cc112d93f066cf..ebf59512c6bdf89df0efeb22c8cf047156dd4a7d 100644
(file)
--- a/
youtube_dl/extractor/dplay.py
+++ b/
youtube_dl/extractor/dplay.py
@@
-21,6
+21,7
@@
from ..utils import (
unified_strdate,
unified_timestamp,
update_url_query,
unified_strdate,
unified_timestamp,
update_url_query,
+ urljoin,
USER_AGENTS,
)
USER_AGENTS,
)
@@
-310,9
+311,11
@@
class DPlayItIE(InfoExtractor):
if not info:
info_url = self._search_regex(
if not info:
info_url = self._search_regex(
- r'url\s*[:=]\s*["\']((?:https?:)?//[^/]+/playback/videoPlaybackInfo/\d+)',
- webpage, 'info url')
+ (r'playback_json_url\s*:\s*(["\'])(?P<url>(?:(?!\1).)+)\1',
+ r'url\s*[:=]\s*["\'](?P<url>(?:https?:)?//[^/]+/playback/videoPlaybackInfo/\d+)'),
+ webpage, 'info url', group='url')
+ info_url = urljoin(url, info_url)
video_id = info_url.rpartition('/')[-1]
try:
video_id = info_url.rpartition('/')[-1]
try:
@@
-322,6
+325,8
@@
class DPlayItIE(InfoExtractor):
'dplayit_token').value,
'Referer': url,
})
'dplayit_token').value,
'Referer': url,
})
+ if isinstance(info, compat_str):
+ info = self._parse_json(info, display_id)
except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError) and e.cause.code in (400, 403):
info = self._parse_json(e.cause.read().decode('utf-8'), display_id)
except ExtractorError as e:
if isinstance(e.cause, compat_HTTPError) and e.cause.code in (400, 403):
info = self._parse_json(e.cause.read().decode('utf-8'), display_id)
@@
-337,6
+342,7
@@
class DPlayItIE(InfoExtractor):
formats = self._extract_m3u8_formats(
hls_url, display_id, ext='mp4', entry_protocol='m3u8_native',
m3u8_id='hls')
formats = self._extract_m3u8_formats(
hls_url, display_id, ext='mp4', entry_protocol='m3u8_native',
m3u8_id='hls')
+ self._sort_formats(formats)
series = self._html_search_regex(
r'(?s)<h1[^>]+class=["\'].*?\bshow_title\b.*?["\'][^>]*>(.+?)</h1>',
series = self._html_search_regex(
r'(?s)<h1[^>]+class=["\'].*?\bshow_title\b.*?["\'][^>]*>(.+?)</h1>',