import xml.etree.ElementTree
from .common import InfoExtractor
-from ..utils import (
- compat_HTTPError,
+from ..compat import (
compat_urllib_request,
+)
+from ..utils import (
ExtractorError,
+ int_or_none,
)
class VevoIE(InfoExtractor):
"""
Accepts urls from vevo.com or in the format 'vevo:{id}'
- (currently used by MTVIE)
+ (currently used by MTVIE and MySpaceIE)
"""
_VALID_URL = r'''(?x)
(?:https?://www\.vevo\.com/watch/(?:[^/]+/(?:[^/]+/)?)?|
_TESTS = [{
'url': 'http://www.vevo.com/watch/hurts/somebody-to-die-for/GB1101300280',
- "md5": "06bea460acb744eab74a9d7dcb4bfd61",
+ "md5": "95ee28ee45e70130e3ab02b0f579ae23",
'info_dict': {
'id': 'GB1101300280',
'ext': 'mp4',
}, {
'note': 'v3 SMIL format',
'url': 'http://www.vevo.com/watch/cassadee-pope/i-wish-i-could-break-your-heart/USUV71302923',
- 'md5': '893ec0e0d4426a1d96c01de8f2bdff58',
+ 'md5': 'f6ab09b034f8c22969020b042e5ac7fc',
'info_dict': {
'id': 'USUV71302923',
'ext': 'mp4',
f for f in video_info['videoVersions']
if f['sourceType'] == 13),
key=lambda f: f['version'])
-
smil_url = '%s/Video/V2/VFILE/%s/%sr.smil' % (
self._SMIL_BASE_URL, video_id, video_id.lower())
if smil_blocks:
smil_url_m = self._search_regex(
r'url="([^"]+)"', smil_blocks[-1]['data'], 'SMIL URL',
- fatal=False)
+ default=None)
if smil_url_m is not None:
smil_url = smil_url_m
- try:
- smil_xml = self._download_webpage(smil_url, video_id,
- 'Downloading SMIL info')
- formats.extend(self._formats_from_smil(smil_xml))
- except ExtractorError as ee:
- if not isinstance(ee.cause, compat_HTTPError):
- raise
- self._downloader.report_warning(
- 'Cannot download SMIL information, falling back to JSON ..')
+ if smil_url:
+ smil_xml = self._download_webpage(
+ smil_url, video_id, 'Downloading SMIL info', fatal=False)
+ if smil_xml:
+ formats.extend(self._formats_from_smil(smil_xml))
self._sort_formats(formats)
- timestamp_ms = int(self._search_regex(
- r'/Date\((\d+)\)/', video_info['launchDate'], 'launch date'))
+ timestamp_ms = int_or_none(self._search_regex(
+ r'/Date\((\d+)\)/',
+ video_info['launchDate'], 'launch date', fatal=False))
return {
'id': video_id,