projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube:watchlater] Respect --no-playlist
[youtube-dl]
/
youtube_dl
/
extractor
/
vidzi.py
diff --git
a/youtube_dl/extractor/vidzi.py
b/youtube_dl/extractor/vidzi.py
index 669979e13660b55d8c6f426aaab2b888007b8c5b..7c6e98026823e0df415664ad0b4d6995c9e2f673 100644
(file)
--- a/
youtube_dl/extractor/vidzi.py
+++ b/
youtube_dl/extractor/vidzi.py
@@
-1,7
+1,8
@@
-#coding: utf-8
+#
coding: utf-8
from __future__ import unicode_literals
from .common import InfoExtractor
from __future__ import unicode_literals
from .common import InfoExtractor
+from ..utils import smuggle_url
class VidziIE(InfoExtractor):
class VidziIE(InfoExtractor):
@@
-13,21
+14,26
@@
class VidziIE(InfoExtractor):
'id': 'cghql9yq6emu',
'ext': 'mp4',
'title': 'youtube-dl test video 1\\\\2\'3/4<5\\\\6ä7↭',
'id': 'cghql9yq6emu',
'ext': 'mp4',
'title': 'youtube-dl test video 1\\\\2\'3/4<5\\\\6ä7↭',
+ 'uploader': 'vidzi.tv',
+ },
+ 'params': {
+ # m3u8 download
+ 'skip_download': True,
},
}
def _real_extract(self, url):
video_id = self._match_id(url)
},
}
def _real_extract(self, url):
video_id = self._match_id(url)
-
+
webpage = self._download_webpage(url, video_id)
webpage = self._download_webpage(url, video_id)
- video_url = self._html_search_regex(
- r'{\s*file\s*:\s*"([^"]+)"\s*}', webpage, 'video url')
title = self._html_search_regex(
r'(?s)<h2 class="video-title">(.*?)</h2>', webpage, 'title')
title = self._html_search_regex(
r'(?s)<h2 class="video-title">(.*?)</h2>', webpage, 'title')
-
+
+ # Vidzi now uses jwplayer, which can be handled by GenericIE
return {
return {
+ '_type': 'url_transparent',
'id': video_id,
'title': title,
'id': video_id,
'title': title,
- 'url': video_url,
+ 'url': smuggle_url(url, {'to_generic': True}),
+ 'ie_key': 'Generic',
}
}
-
\ No newline at end of file