diff --git a/servers/streamsb.py b/servers/streamsb.py index d1bdfcd1..41ed4123 100644 --- a/servers/streamsb.py +++ b/servers/streamsb.py @@ -19,20 +19,23 @@ def test_video_exists(page_url): def get_video_url(page_url, premium=False, user="", password="", video_password=""): video_urls = [] global data + dl_url = 'https://{}/dl?op=download_orig&id={}&mode={}&hash={}' + host = scrapertools.get_domain_from_url(page_url) sources = scrapertools.find_multiple_matches(data, r'download_video([^"]+)[^\d]+\d+x(\d+)') + hash = scrapertools.find_single_match(data, r"file_id',\s'(\d+)") + if sources: sources.sort(key=lambda x: int(x[1]), reverse=True) sources = [(x[1] + 'p', x[0]) for x in sources] s = sources[0] # only the first to reduce the number of requests to google recaptcha - code, mode, hash = eval(s[1]) - dl_url = 'https://{0}/dl?op=download_orig&id={1}&mode={2}&hash={3}'.format(host, code, mode, hash) - data = httptools.downloadpage(dl_url).data + code, mode, null = eval(s[1]) + data = httptools.downloadpage(dl_url.format(host, code, mode, hash)).data captcha = scrapertools.girc(data, 'https://{0}/'.format(host), base64.b64encode('https://{0}:443'.format(host).encode('utf-8')).decode('utf-8').replace('=', '')) if captcha: - data = httptools.downloadpage(dl_url, post={'op': 'download_orig', 'id': code, 'mode': mode, - 'hash': hash, 'g-recaptcha-response': captcha}, timeout=10).data - media_url = scrapertools.find_single_match(data, 'href="([^"]+)"[^>]+>Download') + hash = scrapertools.find_single_match(data, r'"hash" value="([^"]+)') + data = httptools.downloadpage(dl_url.format(host, code, mode, hash), post={'op': 'download_orig', 'id': code, 'mode': mode, 'hash': hash, 'g-recaptcha-response': captcha}, timeout=10, header={'Referer':dl_url}).data + media_url = scrapertools.find_single_match(data, r'href="([^"]+)"[^>]+>Download') if media_url: video_urls.append([s[0], media_url]) return video_urls