X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fvuclip.py;h=a6d9b5fee1f4864d82c7f8bb83e87884c96afe3b;hb=6dfa0602f059397d9a41ef382d9dfa8b432ff0fa;hp=c2aa497bfa39b99b4d233403ca274b4ff6d56595;hpb=59c03a9bfb59699ea76801f5b964a18b0cc5ee3d;p=youtube-dl
diff --git a/youtube_dl/extractor/vuclip.py b/youtube_dl/extractor/vuclip.py
index c2aa497bf..a6d9b5fee 100644
--- a/youtube_dl/extractor/vuclip.py
+++ b/youtube_dl/extractor/vuclip.py
@@ -3,8 +3,10 @@ from __future__ import unicode_literals
import re
from .common import InfoExtractor
-from ..utils import (
+from ..compat import (
compat_urllib_parse_urlparse,
+)
+from ..utils import (
ExtractorError,
parse_duration,
qualities,
@@ -25,12 +27,9 @@ class VuClipIE(InfoExtractor):
}
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(url, video_id)
- #webpage = self._download_webpage(url, video_id)
- import io
- webpage = io.open('922692425_http_-_m.vuclip.com_wcid=922692425_fid=70295_z=1010_nvar_frm=index.html.dump', encoding='utf-8').read()
ad_m = re.search(
r'''value="No.*?" onClick="location.href='([^"']+)'"''', webpage)
if ad_m:
@@ -50,12 +49,12 @@ class VuClipIE(InfoExtractor):
links_code = self._search_regex(
r'''(?xs)
(?:
- |
+ |
\s*
)
(.*?)
(?:
-
+
)
''', webpage, 'links')
title = self._html_search_regex(