From d14d9d8903a532e346dffc3b83730045f18f2c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergey=20M=E2=80=A4?= <dstftw@gmail.com>
Date: Fri, 18 Aug 2017 23:31:42 +0700
Subject: [PATCH] [mixcloud] Fix extraction (closes #13958)
---
youtube_dl/extractor/mixcloud.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/youtube_dl/extractor/mixcloud.py b/youtube_dl/extractor/mixcloud.py
index fcf7beeb2..798968ae3 100644
--- a/youtube_dl/extractor/mixcloud.py
+++ b/youtube_dl/extractor/mixcloud.py
@@ -91,12 +91,14 @@ class MixcloudIE(InfoExtractor):
if js_url:
js = self._download_webpage(js_url, track_id, fatal=False)
if js:
- key = self._search_regex(
- r'player\s*:\s*{.*?\bvalue\s*:\s*(["\'])(?P<key>(?:(?!\1).)+)\1',
- js, 'key', default=None, group='key')
- if key and isinstance(key, compat_str):
- self._keys.insert(0, key)
- self._current_key = key
+ KEY_RE_TEMPLATE = r'player\s*:\s*{.*?\b%s\s*:\s*(["\'])(?P<key>(?:(?!\1).)+)\1'
+ for key_name in ('value', 'key_value'):
+ key = self._search_regex(
+ KEY_RE_TEMPLATE % key_name, js, 'key',
+ default=None, group='key')
+ if key and isinstance(key, compat_str):
+ self._keys.insert(0, key)
+ self._current_key = key
message = self._html_search_regex(
r'(?s)<div[^>]+class="global-message cloudcast-disabled-notice-light"[^>]*>(.+?)<(?:a|/div)',