projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[facebook] Support videos in groups
[youtube-dl]
/
youtube_dl
/
extractor
/
vice.py
diff --git
a/youtube_dl/extractor/vice.py
b/youtube_dl/extractor/vice.py
index ae1faca1cd6ece5d33a7950b858ec078b55b29e7..3db6286e48c1402ff210d8f4cc666dac1a918a86 100644
(file)
--- a/
youtube_dl/extractor/vice.py
+++ b/
youtube_dl/extractor/vice.py
@@
-1,5
+1,4
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
-import re
from .common import InfoExtractor
from .ooyala import OoyalaIE
from .common import InfoExtractor
from .ooyala import OoyalaIE
@@
-7,7
+6,7
@@
from ..utils import ExtractorError
class ViceIE(InfoExtractor):
class ViceIE(InfoExtractor):
- _VALID_URL = r'https?://(?:.+?\.)?vice\.com/
.*?/(?P<name
>.+)'
+ _VALID_URL = r'https?://(?:.+?\.)?vice\.com/
(?:[^/]+/)+(?P<id
>.+)'
_TESTS = [
{
_TESTS = [
{
@@
-16,6
+15,7
@@
class ViceIE(InfoExtractor):
'id': '43cW1mYzpia9IlestBjVpd23Yu3afAfp',
'ext': 'mp4',
'title': 'VICE_COWBOYCAPITALISTS_PART01_v1_VICE_WM_1080p.mov',
'id': '43cW1mYzpia9IlestBjVpd23Yu3afAfp',
'ext': 'mp4',
'title': 'VICE_COWBOYCAPITALISTS_PART01_v1_VICE_WM_1080p.mov',
+ 'duration': 725.983,
},
'params': {
# Requires ffmpeg (m3u8 manifest)
},
'params': {
# Requires ffmpeg (m3u8 manifest)
@@
-28,9
+28,8
@@
class ViceIE(InfoExtractor):
]
def _real_extract(self, url):
]
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- name = mobj.group('name')
- webpage = self._download_webpage(url, name)
+ video_id = self._match_id(url)
+ webpage = self._download_webpage(url, video_id)
try:
embed_code = self._search_regex(
r'embedCode=([^&\'"]+)', webpage,
try:
embed_code = self._search_regex(
r'embedCode=([^&\'"]+)', webpage,