aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2018-11-10 23:37:27 +0700
committerSergey M․ <dstftw@gmail.com>2018-11-10 23:37:27 +0700
commit96a91b15513af2121be1dd93871cc3769c06da3e (patch)
treeb9fb05f72729050a43e0f62a93acf6b750e515f4
parentcab26223bf480553d67840fc9f46aa9ff89ec29f (diff)
[vivo] Fix extraction (closes #18139)
-rw-r--r--youtube_dl/extractor/shared.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/youtube_dl/extractor/shared.py b/youtube_dl/extractor/shared.py
index b2250afdd..931a0f70e 100644
--- a/youtube_dl/extractor/shared.py
+++ b/youtube_dl/extractor/shared.py
@@ -5,6 +5,7 @@ from ..compat import compat_b64decode
from ..utils import (
ExtractorError,
int_or_none,
+ url_or_none,
urlencode_postdata,
)
@@ -86,9 +87,16 @@ class VivoIE(SharedBaseIE):
}
def _extract_video_url(self, webpage, video_id, *args):
+ def decode_url(encoded_url):
+ return compat_b64decode(encoded_url).decode('utf-8')
+
+ stream_url = url_or_none(decode_url(self._search_regex(
+ r'data-stream\s*=\s*(["\'])(?P<url>(?:(?!\1).)+)\1', webpage,
+ 'stream url', default=None, group='url')))
+ if stream_url:
+ return stream_url
return self._parse_json(
self._search_regex(
r'InitializeStream\s*\(\s*(["\'])(?P<url>(?:(?!\1).)+)\1',
webpage, 'stream', group='url'),
- video_id,
- transform_source=lambda x: compat_b64decode(x).decode('utf-8'))[0]
+ video_id, transform_source=decode_url)[0]