Merge branch 'unistra_hd' of https://github.com/Rudloff/youtube-dl into Rudloff-unistra_hd

This commit is contained in:
Sergey M․ 2014-09-05 22:26:31 +07:00
commit 70a1ecd2c1

View File

@ -16,17 +16,29 @@ class UnistraIE(InfoExtractor):
} }
def _real_extract(self, url): def _real_extract(self, url):
id = re.match(self._VALID_URL, url).group(1) video_id = re.match(self._VALID_URL, url).group(1)
webpage = self._download_webpage(url, id) webpage = self._download_webpage(url, video_id)
file = re.search(r'file: "(.*?)",', webpage).group(1) width = re.search(r'width: "(\d*?)",', webpage).group(1)
height = re.search(r'height: "(\d*?)",', webpage).group(1)
files = re.findall(r'file: "(.*?)"', webpage)
video_url = 'http://vod-flash.u-strasbg.fr:8080'
formats = [{
'format_id': 'SD',
'url': video_url + files[0],
'ext': 'mp4',
'resolution': width + 'x' + height
}]
if files[1] != files[0]:
formats.append({
'format_id': 'HD',
'url': video_url + files[1],
'ext': 'mp4'
})
title = self._html_search_regex(r'<title>UTV - (.*?)</', webpage, u'title') title = self._html_search_regex(r'<title>UTV - (.*?)</', webpage, u'title')
video_url = 'http://vod-flash.u-strasbg.fr:8080/' + file return {'id': video_id,
return {'id': id,
'title': title, 'title': title,
'ext': 'mp4',
'url': video_url,
'description': self._html_search_regex(r'<meta name="Description" content="(.*?)"', webpage, u'description', flags=re.DOTALL), 'description': self._html_search_regex(r'<meta name="Description" content="(.*?)"', webpage, u'description', flags=re.DOTALL),
'thumbnail': self._search_regex(r'image: "(.*?)"', webpage, u'thumbnail'), 'thumbnail': self._search_regex(r'image: "(.*?)"', webpage, u'thumbnail'),
'formats': formats
} }