From 7eec8ffbc07b03bef8ffb015c6e61091da92c5fc Mon Sep 17 00:00:00 2001 From: marco <10120390+mac12m99@users.noreply.github.com> Date: Wed, 9 Feb 2022 20:30:22 +0100 Subject: [PATCH] Fix streamlare --- servers/streamlare.json | 2 +- servers/streamlare.py | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/servers/streamlare.json b/servers/streamlare.json index a217d121..3ed6c586 100644 --- a/servers/streamlare.json +++ b/servers/streamlare.json @@ -4,7 +4,7 @@ "ignore_urls": [], "patterns": [ { - "pattern": "https://streamlare.com/(?:v|e)/(\\w+)", + "pattern": "https://streamlare.com/[ve]/(\\w+)", "url": "https://streamlare.com/e/\\1" } ] diff --git a/servers/streamlare.py b/servers/streamlare.py index 8972fd10..67ca71fc 100644 --- a/servers/streamlare.py +++ b/servers/streamlare.py @@ -2,6 +2,7 @@ # -------------------------------------------------------- # Conector streamlare By Alfa development Group # -------------------------------------------------------- +import base64 from core import httptools from core import scrapertools @@ -9,21 +10,26 @@ from platformcode import logger, config def test_video_exists(page_url): + global data logger.info("(page_url='%s')" % page_url) response = httptools.downloadpage(page_url) - if not response.success or "Not Found" in response.data or "File was deleted" in response.data \ - or "is no longer available" in response.data: + data = response.data + if not response.success or "Not Found" in response.data or "File was deleted" in data \ + or "is no longer available" in data: return False, config.get_localized_string(70449) % "Streamlare" return True, "" def get_video_url(page_url, premium=False, user="", password="", video_password=""): + global data logger.info("(page_url='%s')" % page_url) video_urls = [] id = scrapertools.find_single_match(page_url, '/e/(\w+)') post = {"id": id} - data = httptools.downloadpage("https://streamlare.com/api/video/get", post=post).json - media_url = data["result"]["Original"]["src"] + token = scrapertools.find_single_match(data, '