From 0256004beccb54e3a845d6426331aaeb6ff46df8 Mon Sep 17 00:00:00 2001 From: mac12m99 Date: Fri, 24 Jan 2020 20:52:08 +0100 Subject: [PATCH 1/3] fix cinemalibero --- channels/cinemalibero.py | 6 +++++- lib/unshortenit.py | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py index a237bab1..c3329868 100644 --- a/channels/cinemalibero.py +++ b/channels/cinemalibero.py @@ -14,7 +14,11 @@ list_quality = ['default'] def findhost(): permUrl = httptools.downloadpage('https://www.cinemalibero.online/', follow_redirects=False).headers - return 'https://www.' + permUrl['location'].replace('https://www.google.com/search?q=site:', '') + import urlparse + p = list(urlparse.urlparse(permUrl['location'].replace('https://www.google.com/search?q=site:', ''))) + if not p[0]: + p[0] = 'https' + return urlparse.urlunparse(p) host = config.get_channel_url(findhost) headers = [['Referer', host]] diff --git a/lib/unshortenit.py b/lib/unshortenit.py index 224e5adf..f6509c2b 100644 --- a/lib/unshortenit.py +++ b/lib/unshortenit.py @@ -515,7 +515,8 @@ class UnshortenIt(object): return uri, r.code if r else 200 except Exception as e: - return uri, str(e) + logger.error(e) + return uri, 0 def _unshorten_linkup(self, uri): From 01545db6c4dbd3dec3ad728bb18b2cd0c937aeb5 Mon Sep 17 00:00:00 2001 From: marco Date: Fri, 24 Jan 2020 21:04:21 +0100 Subject: [PATCH 2/3] fix altadefinizioneclick --- core/httptools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/httptools.py b/core/httptools.py index aa141e57..5e858835 100755 --- a/core/httptools.py +++ b/core/httptools.py @@ -253,7 +253,7 @@ def downloadpage(url, **opt): load_cookies() domain = urlparse.urlparse(url).netloc CF = False - if domain in ['www.guardaserie.media', 'casacinema.space', 'wstream.video', 'akvideo.stream', 'backin.net', 'dreamsub.stream']: + if domain in ['www.guardaserie.media', 'casacinema.space', 'wstream.video', 'akvideo.stream', 'backin.net', 'dreamsub.stream', 'altadefinizione-nuovo.link']: from lib import cloudscraper session = cloudscraper.create_scraper() CF = True From 898d237e1c67a4f849cd8ce4507addeff42cf0a3 Mon Sep 17 00:00:00 2001 From: mac12m99 Date: Sat, 25 Jan 2020 11:59:23 +0100 Subject: [PATCH 3/3] fix mixdrop --- servers/mixdrop.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/servers/mixdrop.py b/servers/mixdrop.py index 53961beb..49ac80d0 100644 --- a/servers/mixdrop.py +++ b/servers/mixdrop.py @@ -25,7 +25,15 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= packed = scrapertools.find_single_match(data, r'(eval.*?)') unpacked = jsunpack.unpack(packed) - media_url = scrapertools.find_single_match(unpacked, r'MDCore\.furl\s*=\s*"([^"]+)"') + + # mixdrop like to change var name very often, hoping that will catch every + list_vars = scrapertools.find_multiple_matches(unpacked, r'MDCore\.\w+\s*=\s*"([^"]+)"') + for var in list_vars: + if '.mp4' in var: + media_url = var + break + else: + media_url = '' if not media_url.startswith('http'): media_url = 'http:%s' % media_url video_urls.append(["%s [Mixdrop]" % ext, media_url])