salfter/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2025-10-29 09:26:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

[dvtv] Simplify (closes #15442)

Browse Source
This commit is contained in:
Sergey M․
2018-02-09 02:14:49 +07:00
parent 6f4ad0db34
commit 8c5fafe29f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/extractor/dvtv.py
View File

@@ -104,8 +104,8 @@ class DVTVIE(InfoExtractor):
def _parse_video_metadata(self, js, video_id, live_js=None): def _parse_video_metadata(self, js, video_id, live_js=None):
data = self._parse_json(js, video_id, transform_source=js_to_json) data = self._parse_json(js, video_id, transform_source=js_to_json)
if live_js: if live_js:
data.update( data.update(self._parse_json(
self._parse_json(live_js, video_id, transform_source=js_to_json)) live_js, video_id, transform_source=js_to_json))
title = unescapeHTML(data['title']) title = unescapeHTML(data['title'])
@@ -156,12 +156,12 @@ class DVTVIE(InfoExtractor):
# live content # live content
live_item = self._search_regex( live_item = self._search_regex(
r'(?s)embedData[0-9a-f]{32}\.asset\.liveStarter\s*=\s*(\{.+?\});', r'(?s)embedData[0-9a-f]{32}\.asset\.liveStarter\s*=\s*(\{.+?\});',
webpage, 'video', default=None, fatal=False) webpage, 'video', default=None)
# single video # single video
item = self._search_regex( item = self._search_regex(
r'(?s)embedData[0-9a-f]{32}\[["\']asset["\']\]\s*=\s*(\{.+?\});', r'(?s)embedData[0-9a-f]{32}\[["\']asset["\']\]\s*=\s*(\{.+?\});',
webpage, 'video', default=None, fatal=False) webpage, 'video', default=None)
if item: if item:
return self._parse_video_metadata(item, video_id, live_item) return self._parse_video_metadata(item, video_id, live_item)