v/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2020-11-18 19:53:54 -08:00
Code Issues Releases Wiki Activity

Fix issue: #18008 Update aparat.py

Browse Source 
aparat.com change their code and and fix regular expression
This commit is contained in:
mobin shaterian 2018-10-29 14:58:41 +03:30 committed by GitHub
parent 9ff558f67f
commit b749b0fded
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
youtube_dl/extractor/aparat.py
View File

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