aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorYen Chi Hsuan <yan12125@gmail.com>2016-02-01 15:40:42 +0800
committerYen Chi Hsuan <yan12125@gmail.com>2016-02-01 15:40:42 +0800
commit92769650fae8827f242a1517565cceef5604eeb0 (patch)
treebe057ae249afd3af18404339886fad73a116a34d /youtube_dl
parentdc4fe5c6d713ac09cd35f8b8dbfbe46a67a67f10 (diff)
downloadyoutube-dl-92769650fae8827f242a1517565cceef5604eeb0.tar.xz
[vidzi] Fix extraction
Closes #8386. Vidzi.tv now uses jwplayer, which can be handled by GenericIE
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/vidzi.py14
1 files changed, 5 insertions, 9 deletions
diff --git a/youtube_dl/extractor/vidzi.py b/youtube_dl/extractor/vidzi.py
index 2ba9f31df..210a738a6 100644
--- a/youtube_dl/extractor/vidzi.py
+++ b/youtube_dl/extractor/vidzi.py
@@ -2,6 +2,7 @@
from __future__ import unicode_literals
from .common import InfoExtractor
+from ..utils import smuggle_url
class VidziIE(InfoExtractor):
@@ -20,19 +21,14 @@ class VidziIE(InfoExtractor):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
- video_host = self._html_search_regex(
- r'id=\'vplayer\'><img src="http://(.*?)/i', webpage,
- 'video host')
- video_hash = self._html_search_regex(
- r'\|([a-z0-9]+)\|hls\|type', webpage, 'video_hash')
- ext = self._html_search_regex(
- r'\|tracks\|([a-z0-9]+)\|', webpage, 'video ext')
- video_url = 'http://' + video_host + '/' + video_hash + '/v.' + ext
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 {
+ '_type': 'url_transparent',
'id': video_id,
'title': title,
- 'url': video_url,
+ 'url': smuggle_url(url, {'to_generic': True}),
+ 'ie_key': 'Generic',
}