diff --git a/youtube_dl/extractor/streamsb.py b/youtube_dl/extractor/streamsb.py index fd2826e3e..bffcb3de1 100644 --- a/youtube_dl/extractor/streamsb.py +++ b/youtube_dl/extractor/streamsb.py @@ -1,10 +1,13 @@ # coding: utf-8 from __future__ import unicode_literals +import binascii import random +import re import string from .common import InfoExtractor +from ..utils import urljoin, url_basename def to_ascii_hex(str1): @@ -17,7 +20,7 @@ def generate_random_string(length): class StreamsbIE(InfoExtractor): _DOMAINS = ('viewsb.com', ) - _VALID_URL = r'https://' + domain + '/(?P.+)' + _VALID_URL = r'https://(?P%s)/(?P.+)' % '|'.join(_DOMAINS) _TEST = { 'url': 'https://viewsb.com/dxfvlu4qanjx', 'md5': '488d111a63415369bf90ea83adc8a325', @@ -29,21 +32,20 @@ class StreamsbIE(InfoExtractor): } def _real_extract(self, url): - video_id = self._match_id(url) + domain, video_id = re.match(self._VALID_URL, url).group('domain', 'id') webpage = self._download_webpage(url, video_id) iframe_rel_url = self._search_regex(r'''(?i)]+\bsrc\s*=\s*('|")(?P/.*\.html)\1''', webpage, 'iframe', group='path') - iframe_url = urljoin('https://' + self.domain, iframe_rel_url) + iframe_url = urljoin('https://' + domain, iframe_rel_url) iframe_data = self._download_webpage(iframe_url, video_id) - app_version = self._search_regex(r''']+\bsrc\s*=\s*("|')(?:(?!\1).)*/app\.min\.(\d+)\.js''', iframe_data, 'app version', fatal=False) or '50' + app_version = self._search_regex(r''']+\bsrc\s*=\s*["|'].*/app\.min\.(\d+)\.js''', iframe_data, 'app version', fatal=False) or '50' video_code = url_basename(iframe_url).rsplit('.')[0] length = 12 req = '||'.join((generate_random_string(length), video_code, generate_random_string(length), 'streamsb')) - ereq = 'https://{0}/sources{1}/{2}'.format( - self.domain, app_version, to_ascii_hex(req)) + ereq = 'https://{0}/sources{1}/{2}'.format(domain, app_version, to_ascii_hex(req)) video_data = self._download_webpage(ereq, video_id, headers={ 'Referer': iframe_url,