瀏覽代碼

[vidzi] Simplify

Philipp Hagemeister 11 年之前
父節點
當前提交
018e835594
共有 1 個文件被更改,包括 9 次插入6 次删除
  1. 9 6
      youtube_dl/extractor/vidzi.py

+ 9 - 6
youtube_dl/extractor/vidzi.py

@@ -1,6 +1,8 @@
-import re
+from __future__ import unicode_literals
+
 from .common import InfoExtractor
 from .common import InfoExtractor
 
 
+
 class VidziIE(InfoExtractor):
 class VidziIE(InfoExtractor):
     _VALID_URL = r'https?://(?:www\.)?vidzi\.tv/(?P<id>\w+)'
     _VALID_URL = r'https?://(?:www\.)?vidzi\.tv/(?P<id>\w+)'
     _TEST = {
     _TEST = {
@@ -14,12 +16,13 @@ class VidziIE(InfoExtractor):
     }
     }
 
 
     def _real_extract(self, url):
     def _real_extract(self, url):
-        mobj = re.match(self._VALID_URL, url)
-        video_id = mobj.group('id')
+        video_id = self._match_id(url)
         
         
-        webpage = self._download_webpage('http://vidzi.tv/' + video_id, video_id)
-        video_url = self._html_search_regex(r'{\s*file\s*:\s*"([^"]+)"\s*}', webpage, u'vidzi url')
-        title = self._html_search_regex(r'<Title>([^<]+)<\/Title>', webpage, u'vidzi title')
+        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'<Title>([^<]+)<\/Title>', webpage, 'title')
         
         
         return {
         return {
             'id': video_id,
             'id': video_id,