From e7038d0e5842c97d68b76526cd519ab1dd892e4b Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Mon, 31 May 2021 18:39:43 +0200 Subject: [PATCH] Fix OkStream --- servers/okstream.json | 2 +- servers/okstream.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/servers/okstream.json b/servers/okstream.json index cbc34931..932b1bcc 100644 --- a/servers/okstream.json +++ b/servers/okstream.json @@ -4,7 +4,7 @@ "ignore_urls": [], "patterns": [ { - "pattern": "okstream.cc/([0-9a-zA-Z]+)", + "pattern": "okstream.cc/(?:e)?/([0-9a-zA-Z]+)", "url": "https://www.okstream.cc/e/\\1" } ] diff --git a/servers/okstream.py b/servers/okstream.py index 36e8be82..7d83d1c0 100644 --- a/servers/okstream.py +++ b/servers/okstream.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from core import httptools, scrapertools +from core import httptools, support from platformcode import logger, config def test_video_exists(page_url): @@ -8,7 +8,7 @@ def test_video_exists(page_url): logger.debug('page url=', page_url) response = httptools.downloadpage(page_url) - if response.code == 404: + if response.code == 404 or 'File has been removed or does not exist!' in response.data: return False, config.get_localized_string(70449) % 'OkStream' else: data = response.data @@ -19,8 +19,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= global data logger.debug("URL", page_url) video_urls = [] - keys = scrapertools.find_single_match(data, '>var keys="([^"]+)"') - protection = scrapertools.find_single_match(data, '>var protection="([^"]+)"') + keys = support.match(data, patron=r'>var keys="([^"]+)"').match + protection = support.match(data, patron=r'>var protection="([^"]+)"').match url = httptools.downloadpage("https://www.okstream.cc/request/", post='&morocco={}&mycountry={}'.format(keys, protection), headers={'Referer':page_url}).data url = url.strip() video_urls.append([url.split('.')[-1] + " [OkStream]", url])