projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tox.ini: Add python 3.4
[youtube-dl]
/
youtube_dl
/
extractor
/
vuclip.py
diff --git
a/youtube_dl/extractor/vuclip.py
b/youtube_dl/extractor/vuclip.py
index c2aa497bfa39b99b4d233403ca274b4ff6d56595..c3fde53f5ef06a56b54e94b20b72a7e98c1992a5 100644
(file)
--- 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
import re
from .common import InfoExtractor
-from ..
utils
import (
+from ..
compat
import (
compat_urllib_parse_urlparse,
compat_urllib_parse_urlparse,
+)
+from ..utils import (
ExtractorError,
parse_duration,
qualities,
ExtractorError,
parse_duration,
qualities,
@@
-25,12
+27,9
@@
class VuClipIE(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(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:
ad_m = re.search(
r'''value="No.*?" onClick="location.href='([^"']+)'"''', webpage)
if ad_m:
@@
-55,7
+54,7
@@
class VuClipIE(InfoExtractor):
)
(.*?)
(?:
)
(.*?)
(?:
- <a\s+href="fblike
'
|<div\s+class="social">
+ <a\s+href="fblike|<div\s+class="social">
)
''', webpage, 'links')
title = self._html_search_regex(
)
''', webpage, 'links')
title = self._html_search_regex(