|
@@ -34,32 +34,32 @@ class AparatIE(InfoExtractor):
|
|
|
'http://www.aparat.com/video/video/embed/vt/frame/showvideo/yes/videohash/' + video_id,
|
|
|
video_id)
|
|
|
|
|
|
- title = self._search_regex(r'\s+title:\s*"([^"]+)"', webpage, 'title')
|
|
|
-
|
|
|
file_list = self._parse_json(
|
|
|
self._search_regex(
|
|
|
- r'fileList\s*=\s*JSON\.parse\(\'([^\']+)\'\)', webpage,
|
|
|
+ r'var options\s*=\s*JSON\.parse\(\'([^\']+)\'\)', webpage,
|
|
|
'file list'),
|
|
|
video_id)
|
|
|
|
|
|
+ title = file_list['plugins']['sabaPlayerPlugin']['title']
|
|
|
+
|
|
|
formats = []
|
|
|
- for item in file_list[0]:
|
|
|
- file_url = url_or_none(item.get('file'))
|
|
|
- if not file_url:
|
|
|
- continue
|
|
|
- ext = mimetype2ext(item.get('type'))
|
|
|
- label = item.get('label')
|
|
|
- formats.append({
|
|
|
- 'url': file_url,
|
|
|
- 'ext': ext,
|
|
|
- 'format_id': label or ext,
|
|
|
- 'height': int_or_none(self._search_regex(
|
|
|
- r'(\d+)[pP]', label or '', 'height', default=None)),
|
|
|
- })
|
|
|
+ for list in file_list['plugins']['sabaPlayerPlugin']['multiSRC']:
|
|
|
+ for item in list:
|
|
|
+ file_url = url_or_none(item.get('src'))
|
|
|
+ if not file_url:
|
|
|
+ continue
|
|
|
+ ext = mimetype2ext(item.get('type'))
|
|
|
+ label = item.get('label')
|
|
|
+ formats.append({
|
|
|
+ 'url': file_url,
|
|
|
+ 'ext': ext,
|
|
|
+ 'format_id': label or ext,
|
|
|
+ 'height': int_or_none(self._search_regex(
|
|
|
+ r'(\d+)[pP]', label or '', 'height', default=None)),
|
|
|
+ })
|
|
|
self._sort_formats(formats)
|
|
|
|
|
|
- thumbnail = self._search_regex(
|
|
|
- r'image:\s*"([^"]+)"', webpage, 'thumbnail', fatal=False)
|
|
|
+ thumbnail = file_list['poster']
|
|
|
|
|
|
return {
|
|
|
'id': video_id,
|