projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6f4ad0d
)
[dvtv] Simplify (closes #15442)
author
Sergey M․
<dstftw@gmail.com>
Thu, 8 Feb 2018 19:14:49 +0000
(
02:14
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 8 Feb 2018 19:19:29 +0000
(
02:19
+0700)
youtube_dl/extractor/dvtv.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/dvtv.py
b/youtube_dl/extractor/dvtv.py
index 5decd995106a876d408932f47deea87c89fd731e..21f1d813febc5b024b21d1cb652cb1baa32d3556 100644
(file)
--- a/
youtube_dl/extractor/dvtv.py
+++ b/
youtube_dl/extractor/dvtv.py
@@
-104,8
+104,8
@@
class DVTVIE(InfoExtractor):
def _parse_video_metadata(self, js, video_id, live_js=None):
data = self._parse_json(js, video_id, transform_source=js_to_json)
if live_js:
def _parse_video_metadata(self, js, video_id, live_js=None):
data = self._parse_json(js, video_id, transform_source=js_to_json)
if live_js:
- data.update(
-
self._parse_json(
live_js, video_id, transform_source=js_to_json))
+ data.update(
self._parse_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_item = self._search_regex(
r'(?s)embedData[0-9a-f]{32}\.asset\.liveStarter\s*=\s*(\{.+?\});',
# live content
live_item = self._search_regex(
r'(?s)embedData[0-9a-f]{32}\.asset\.liveStarter\s*=\s*(\{.+?\});',
- webpage, 'video', default=None
, fatal=False
)
+ webpage, 'video', default=None)
# single video
item = self._search_regex(
r'(?s)embedData[0-9a-f]{32}\[["\']asset["\']\]\s*=\s*(\{.+?\});',
# single video
item = self._search_regex(
r'(?s)embedData[0-9a-f]{32}\[["\']asset["\']\]\s*=\s*(\{.+?\});',
- webpage, 'video', default=None
, fatal=False
)
+ webpage, 'video', default=None)
if item:
return self._parse_video_metadata(item, video_id, live_item)
if item:
return self._parse_video_metadata(item, video_id, live_item)