diff options
Diffstat (limited to 'youtube_dl/extractor/mangomolo.py')
| -rw-r--r-- | youtube_dl/extractor/mangomolo.py | 28 | 
1 files changed, 16 insertions, 12 deletions
diff --git a/youtube_dl/extractor/mangomolo.py b/youtube_dl/extractor/mangomolo.py index 1885ac7df..acee370e9 100644 --- a/youtube_dl/extractor/mangomolo.py +++ b/youtube_dl/extractor/mangomolo.py @@ -1,28 +1,30 @@  # coding: utf-8  from __future__ import unicode_literals -import base64 -  from .common import InfoExtractor -from ..compat import compat_urllib_parse_unquote -from ..utils import ( -    int_or_none, +from ..compat import ( +    compat_b64decode, +    compat_urllib_parse_unquote,  ) +from ..utils import int_or_none  class MangomoloBaseIE(InfoExtractor): +    _BASE_REGEX = r'https?://(?:admin\.mangomolo\.com/analytics/index\.php/customers/embed/|player\.mangomolo\.com/v1/)' +      def _get_real_id(self, page_id):          return page_id      def _real_extract(self, url):          page_id = self._get_real_id(self._match_id(url)) -        webpage = self._download_webpage(url, page_id) +        webpage = self._download_webpage( +            'https://player.mangomolo.com/v1/%s?%s' % (self._TYPE, url.split('?')[1]), page_id)          hidden_inputs = self._hidden_inputs(webpage)          m3u8_entry_protocol = 'm3u8' if self._IS_LIVE else 'm3u8_native'          format_url = self._html_search_regex(              [ -                r'file\s*:\s*"(https?://[^"]+?/playlist.m3u8)', +                r'(?:file|src)\s*:\s*"(https?://[^"]+?/playlist\.m3u8)',                  r'<a[^>]+href="(rtsp://[^"]+)"'              ], webpage, 'format url')          formats = self._extract_wowza_formats( @@ -40,15 +42,17 @@ class MangomoloBaseIE(InfoExtractor):  class MangomoloVideoIE(MangomoloBaseIE): -    IE_NAME = 'mangomolo:video' -    _VALID_URL = r'https?://admin\.mangomolo\.com/analytics/index\.php/customers/embed/video\?.*?\bid=(?P<id>\d+)' +    _TYPE = 'video' +    IE_NAME = 'mangomolo:' + _TYPE +    _VALID_URL = MangomoloBaseIE._BASE_REGEX + r'video\?.*?\bid=(?P<id>\d+)'      _IS_LIVE = False  class MangomoloLiveIE(MangomoloBaseIE): -    IE_NAME = 'mangomolo:live' -    _VALID_URL = r'https?://admin\.mangomolo\.com/analytics/index\.php/customers/embed/index\?.*?\bchannelid=(?P<id>(?:[A-Za-z0-9+/=]|%2B|%2F|%3D)+)' +    _TYPE = 'live' +    IE_NAME = 'mangomolo:' + _TYPE +    _VALID_URL = MangomoloBaseIE._BASE_REGEX + r'(live|index)\?.*?\bchannelid=(?P<id>(?:[A-Za-z0-9+/=]|%2B|%2F|%3D)+)'      _IS_LIVE = True      def _get_real_id(self, page_id): -        return base64.b64decode(compat_urllib_parse_unquote(page_id).encode()).decode() +        return compat_b64decode(compat_urllib_parse_unquote(page_id)).decode()  | 
