R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

be consistent with quotes

Browse Source
This commit is contained in:
iamevn 2017-05-07 19:10:29 -04:00
parent feff838741
commit 8f37417d83
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
youtube_dl/extractor/full30.py
View File

@ -33,20 +33,20 @@ class Full30IE(InfoExtractor):
vid_path = self._html_search_regex(r'<input id=.video-path[^>]*value=["\']([^"\']*)["\'][^>]*>', webpage, 'video_path', fatal=False, default=None) vid_path = self._html_search_regex(r'<input id=.video-path[^>]*value=["\']([^"\']*)["\'][^>]*>', webpage, 'video_path', fatal=False, default=None)
if not vid_path: if not vid_path:
channel_slug = self._html_search_regex(r'<input id=.channel-slug[^>]*value=["\']([^"\']*)["\'][^>]*>', webpage, 'channel_slug', fatal=True) channel_slug = self._html_search_regex(r'<input id=.channel-slug[^>]*value=["\']([^"\']*)["\'][^>]*>', webpage, 'channel_slug', fatal=True)
vid_path = "https://www.full30.com/cdn/videos/" + channel_slug + "/" + video_id + "/" vid_path = 'https://www.full30.com/cdn/videos/' + channel_slug + '/' + video_id + '/'
vid_json = self._download_webpage(vid_path, video_id) vid_json = self._download_webpage(vid_path, video_id)
# turn sequence of json entries into an actual list # turn sequence of json entries into an actual list
vid_json = vid_json.rstrip() vid_json = vid_json.rstrip()
vid_json = "[" + vid_json + "]" vid_json = '[' + vid_json + ']'
vid_json = vid_json.replace("}", "},").replace(",]", "]") vid_json = vid_json.replace('}', '},').replace(',]', ']')
parsed = self._parse_json(vid_json, video_id) parsed = self._parse_json(vid_json, video_id)
formats = [{ formats = [{
"url": vid_path + entry["name"], 'url': vid_path + entry['name'],
"resolution": entry["name"][:entry["name"].rfind(".")], 'resolution': entry['name'][:entry['name'].rfind('.')],
"filesize": int_or_none(entry["size"]), 'filesize': int_or_none(entry['size']),
} for entry in parsed if entry.get("type") == "object"] } for entry in parsed if entry.get('type') == 'object']
self._sort_formats(formats) self._sort_formats(formats)