projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6aeba40
)
[ultimedia] keep direct support for ultimedia videos
author
remitamine
<remitamine@gmail.com>
Thu, 10 Dec 2015 22:04:28 +0000
(23:04 +0100)
committer
remitamine
<remitamine@gmail.com>
Thu, 10 Dec 2015 22:04:28 +0000
(23:04 +0100)
youtube_dl/extractor/ultimedia.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/ultimedia.py
b/youtube_dl/extractor/ultimedia.py
index 45201332d18ccbdf72949e19192b948d64aac105..60328123ce0a3bc1e386cc8cac88764149834ee1 100644
(file)
--- a/
youtube_dl/extractor/ultimedia.py
+++ b/
youtube_dl/extractor/ultimedia.py
@@
-8,10
+8,29
@@
from ..utils import int_or_none
class UltimediaIE(InfoExtractor):
class UltimediaIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?ultimedia\.com/deliver/(?P<type>generic|musique)(?:/[^/]+)*/(?:src|article)/(?P<id>[\d+a-z]+)'
+ _VALID_URL = r'''(?x)
+ https?://(?:www\.)?ultimedia\.com/
+ (?:
+ deliver/
+ (?P<embed_type>
+ generic|
+ musique
+ )
+ (?:/[^/]+)*/
+ (?:
+ src|
+ article
+ )|
+ default/index/video
+ (?P<site_type>
+ generic|
+ music
+ )
+ /id
+ )/(?P<id>[\d+a-z]+)'''
_TESTS = [{
# news
_TESTS = [{
# news
- 'url': 'https://www.ultimedia.com/de
liver/generic/iframe/mdtk/01601930/zone/1/src/s8uk0r/autoplay/yes/ad/no/width/714/height/435
',
+ 'url': 'https://www.ultimedia.com/de
fault/index/videogeneric/id/s8uk0r
',
'md5': '276a0e49de58c7e85d32b057837952a2',
'info_dict': {
'id': 's8uk0r',
'md5': '276a0e49de58c7e85d32b057837952a2',
'info_dict': {
'id': 's8uk0r',
@@
-25,7
+44,7
@@
class UltimediaIE(InfoExtractor):
},
}, {
# music
},
}, {
# music
- 'url': 'https://www.ultimedia.com/de
liver/musique/iframe/mdtk/01601930/zone/1/article/xvpfp8/autoplay/yes/ad/no/width/714/height/435
',
+ 'url': 'https://www.ultimedia.com/de
fault/index/videomusic/id/xvpfp8
',
'md5': '2ea3513813cf230605c7e2ffe7eca61c',
'info_dict': {
'id': 'xvpfp8',
'md5': '2ea3513813cf230605c7e2ffe7eca61c',
'info_dict': {
'id': 'xvpfp8',
@@
-48,7
+67,11
@@
class UltimediaIE(InfoExtractor):
return mobj.group('url')
def _real_extract(self, url):
return mobj.group('url')
def _real_extract(self, url):
- video_type, video_id = re.match(self._VALID_URL, url).groups()
+ mobj = re.match(self._VALID_URL, url)
+ video_id = mobj.group('id')
+ video_type = mobj.group('embed_type') or mobj.group('site_type')
+ if video_type == 'music':
+ video_type = 'musique'
deliver_info = self._download_json(
'http://www.ultimedia.com/deliver/video?video=%s&topic=%s' % (video_id, video_type),
deliver_info = self._download_json(
'http://www.ultimedia.com/deliver/video?video=%s&topic=%s' % (video_id, video_type),