Merge branch 'Rudloff-unistra_hd'

This commit is contained in:
Sergey M․ 2014-09-06 15:22:01 +07:00
commit ba92ab3d05

View File

@ -1,32 +1,66 @@
from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import qualities
class UnistraIE(InfoExtractor): class UnistraIE(InfoExtractor):
_VALID_URL = r'http://utv\.unistra\.fr/(?:index|video)\.php\?id_video\=(\d+)' _VALID_URL = r'http://utv\.unistra\.fr/(?:index|video)\.php\?id_video\=(?P<id>\d+)'
_TEST = { _TESTS = [
u'url': u'http://utv.unistra.fr/video.php?id_video=154', {
u'file': u'154.mp4', 'url': 'http://utv.unistra.fr/video.php?id_video=154',
u'md5': u'736f605cfdc96724d55bb543ab3ced24', 'md5': '736f605cfdc96724d55bb543ab3ced24',
u'info_dict': { 'info_dict': {
u'title': u'M!ss Yella', 'id': '154',
u'description': u'md5:104892c71bd48e55d70b902736b81bbf', 'ext': 'mp4',
'title': 'M!ss Yella',
'description': 'md5:104892c71bd48e55d70b902736b81bbf',
},
}, },
} {
'url': 'http://utv.unistra.fr/index.php?id_video=437',
'md5': '1ddddd6cccaae76f622ce29b8779636d',
'info_dict': {
'id': '437',
'ext': 'mp4',
'title': 'Prix Louise Weiss 2014',
'description': 'md5:cc3a8735f079f4fb6b0b570fc10c135a',
},
}
]
def _real_extract(self, url): def _real_extract(self, url):
id = re.match(self._VALID_URL, url).group(1) mobj = re.match(self._VALID_URL, url)
webpage = self._download_webpage(url, id) video_id = mobj.group('id')
file = re.search(r'file: "(.*?)",', webpage).group(1)
title = self._html_search_regex(r'<title>UTV - (.*?)</', webpage, u'title')
video_url = 'http://vod-flash.u-strasbg.fr:8080/' + file webpage = self._download_webpage(url, video_id)
return {'id': id, files = set(re.findall(r'file\s*:\s*"([^"]+)"', webpage))
'title': title,
'ext': 'mp4', quality = qualities(['SD', 'HD'])
'url': video_url, formats = []
'description': self._html_search_regex(r'<meta name="Description" content="(.*?)"', webpage, u'description', flags=re.DOTALL), for file_path in files:
'thumbnail': self._search_regex(r'image: "(.*?)"', webpage, u'thumbnail'), format_id = 'HD' if file_path.endswith('-HD.mp4') else 'SD'
} formats.append({
'url': 'http://vod-flash.u-strasbg.fr:8080%s' % file_path,
'format_id': format_id,
'quality': quality(format_id)
})
title = self._html_search_regex(
r'<title>UTV - (.*?)</', webpage, 'title')
description = self._html_search_regex(
r'<meta name="Description" content="(.*?)"', webpage, 'description', flags=re.DOTALL)
thumbnail = self._search_regex(
r'image: "(.*?)"', webpage, 'thumbnail')
return {
'id': video_id,
'title': title,
'description': description,
'thumbnail': thumbnail,
'formats': formats
}