projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[expressen] Add extractor
[youtube-dl]
/
youtube_dl
/
extractor
/
tv2.py
diff --git
a/youtube_dl/extractor/tv2.py
b/youtube_dl/extractor/tv2.py
index e4b4ac0e7acc3b1f74b53611a84f8e099207aaf2..d5071e8a5faf72a25c6b21cdfb2987b6a731fb32 100644
(file)
--- a/
youtube_dl/extractor/tv2.py
+++ b/
youtube_dl/extractor/tv2.py
@@
-1,4
+1,4
@@
-#
en
coding: utf-8
+# coding: utf-8
from __future__ import unicode_literals
import re
from __future__ import unicode_literals
import re
@@
-55,10
+55,11
@@
class TV2IE(InfoExtractor):
ext = determine_ext(video_url)
if ext == 'f4m':
formats.extend(self._extract_f4m_formats(
ext = determine_ext(video_url)
if ext == 'f4m':
formats.extend(self._extract_f4m_formats(
- video_url, video_id, f4m_id=format_id))
+ video_url, video_id, f4m_id=format_id
, fatal=False
))
elif ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
elif ext == 'm3u8':
formats.extend(self._extract_m3u8_formats(
- video_url, video_id, 'mp4', m3u8_id=format_id))
+ video_url, video_id, 'mp4', entry_protocol='m3u8_native',
+ m3u8_id=format_id, fatal=False))
elif ext == 'ism' or video_url.endswith('.ism/Manifest'):
pass
else:
elif ext == 'ism' or video_url.endswith('.ism/Manifest'):
pass
else:
@@
-125,7
+126,7
@@
class TV2ArticleIE(InfoExtractor):
if not assets:
# New embed pattern
if not assets:
# New embed pattern
- for v in re.findall('TV2ContentboxVideo\(({.+?})\)', webpage):
+ for v in re.findall(
r
'TV2ContentboxVideo\(({.+?})\)', webpage):
video = self._parse_json(
v, playlist_id, transform_source=js_to_json, fatal=False)
if not video:
video = self._parse_json(
v, playlist_id, transform_source=js_to_json, fatal=False)
if not video: