diff options
| author | Ali Irani <irani.2007@gmail.com> | 2018-09-06 02:08:38 +0430 | 
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2018-10-29 23:31:24 +0700 | 
| commit | 9c4a83a1bec9d7abd066a89be40e62dd36ffa67d (patch) | |
| tree | b4815993e0612f9a8518c464de76c8a4e6812f8f /youtube_dl/extractor/aparat.py | |
| parent | 9ff558f67f2285a17d2a4214b5f74aeb6ce4d9b6 (diff) | |
[aparat] Fix extraction
Diffstat (limited to 'youtube_dl/extractor/aparat.py')
| -rw-r--r-- | youtube_dl/extractor/aparat.py | 36 | 
1 files changed, 18 insertions, 18 deletions
diff --git a/youtube_dl/extractor/aparat.py b/youtube_dl/extractor/aparat.py index 6eb8bbb6e..780439e17 100644 --- a/youtube_dl/extractor/aparat.py +++ b/youtube_dl/extractor/aparat.py @@ -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,  | 
