From 89183498ef1a9f7a5819d6a56cd66933fb266709 Mon Sep 17 00:00:00 2001 From: Maxim Rubis Date: Mon, 13 Apr 2020 23:20:26 -0400 Subject: [PATCH] [cloudflarestream] fix JSON parsing of video_id --- youtube_dl/extractor/cloudflarestream.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/cloudflarestream.py b/youtube_dl/extractor/cloudflarestream.py index 2fdcfbb3a..64e877e7d 100644 --- a/youtube_dl/extractor/cloudflarestream.py +++ b/youtube_dl/extractor/cloudflarestream.py @@ -29,6 +29,17 @@ class CloudflareStreamIE(InfoExtractor): 'params': { 'skip_download': True, }, + }, { + 'url': 'https://embed.videodelivery.net/embed/r4xu.fla9.latest.js?video=eyJhbGciOiJSUzI1NiIsImtpZCI6IjEyMzQ1Njc4OTAxMjM0NTY3ODkwMTIzNDU2Nzg5MDEyIn0.eyJzdWIiOiI1ZDViYzM3ZmZjZjU0YzliODJlOTk2ODIzYmZmYmI4MSIsImtpZCI6IjVkNWJjMzdmZmNmNTRjOWI4MmU5OTY4MjNiZmZiYjgxIiwiZXhwIjoiMTYxNzM0NjgwMCIsIm5iZiI6IjE1ODU4MTA4MDAifQ.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ', + 'info_dict': { + 'id': '5d5bc37ffcf54c9b82e996823bffbb81', + 'ext': 'mp4', + 'title': '5d5bc37ffcf54c9b82e996823bffbb81', + }, + 'params': { + 'format': 'bestvideo', + 'skip_download': True, + }, }, { 'url': 'https://watch.cloudflarestream.com/9df17203414fd1db3e3ed74abbe936c1', 'only_matching': True, @@ -53,8 +64,9 @@ class CloudflareStreamIE(InfoExtractor): domain = 'bytehighway.net' if 'bytehighway.net/' in url else 'videodelivery.net' base_url = 'https://%s/%s/' % (domain, video_id) if '.' in video_id: - video_id = self._parse_json(base64.urlsafe_b64decode( - video_id.split('.')[1]), video_id)['sub'] + video_id = video_id.split('.')[1] + '====' + video_id = self._parse_json(base64.b64decode( + video_id), video_id)['sub'] manifest_base_url = base_url + 'manifest/video.' formats = self._extract_m3u8_formats(