From 8c725bcf7fe7bcac606344941e9d3b49d48ae3c9 Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 4 Nov 2019 20:42:08 +0100 Subject: [PATCH 1/7] ops --- platformcode/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platformcode/config.py b/platformcode/config.py index 26475709..ba6813fc 100644 --- a/platformcode/config.py +++ b/platformcode/config.py @@ -23,7 +23,7 @@ def get_addon_version(with_fix=True): Devuelve el número de versión del addon, y opcionalmente número de fix si lo hay ''' if with_fix: - return __settings__.getAddonInfo('version') + get_addon_version_fix() + return __settings__.getAddonInfo('version') + " " + get_addon_version_fix() else: return __settings__.getAddonInfo('version') From d2af1a86da44e5f9ae3013421fea5da35101d1de Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Mon, 4 Nov 2019 23:12:01 +0100 Subject: [PATCH 2/7] Fix VVVVID --- channels/vvvvid.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/channels/vvvvid.py b/channels/vvvvid.py index 983fa91d..9269cf2e 100644 --- a/channels/vvvvid.py +++ b/channels/vvvvid.py @@ -137,12 +137,12 @@ def episodios(item): episodes.append(episode['episodes']) for episode in episodes: for key in episode: - if 'stagione' in key['title'].lower(): - match = support.match(key['title'].encode('ascii', 'replace'), r'[Ss]tagione\s*(\d+) - [Ee]pisodio\s*(\d+)')[0][0] + if 'stagione' in key['title'].encode('utf8').lower(): + match = support.match(key['title'].encode('utf8'), r'[Ss]tagione\s*(\d+) - [Ee]pisodio\s*(\d+)')[0][0] title = match[0]+'x'+match[1] + ' - ' + item.fulltitle make_item = True elif int(key['season_id']) == int(season_id): - title = 'Episodio ' + key['number'] + ' - ' + key['title'].encode('ascii', 'replace'), + title = 'Episodio ' + key['number'] + ' - ' + key['title'].encode('utf8'), make_item = True else: make_item = False @@ -193,21 +193,21 @@ def make_itemlist(itemlist, item, data): search = item.search if item.search else '' infoLabels = {} for key in data['data']: - if search.lower() in key['title'].lower(): + if search.lower() in key['title'].encode('utf8').lower(): infoLabels['year'] = key['date_published'] infoLabels['title'] = infoLabels['tvshowtitle'] = key['title'] - support.log(infoLabels) + title = key['title'].encode('utf8') itemlist.append( Item( channel = item.channel, - title = support.typo(key['title'], 'bold'), - fulltitle= key['title'], - show= key['title'], + title = support.typo(title, 'bold'), + fulltitle= title, + show= title, url= host + str(key['show_id']) + '/seasons/', action= 'findvideos' if item.contentType == 'movie' else 'episodios', contentType = item.contentType, contentSerieName= key['title'] if item.contentType != 'movie' else '', - contentTitle= key['title'] if item.contentType == 'movie' else '', + contentTitle= title if item.contentType == 'movie' else '', infoLabels=infoLabels )) return itemlist \ No newline at end of file From 080ae3187d043079ddf584ae9a40c92026109167 Mon Sep 17 00:00:00 2001 From: greko17 Date: Mon, 4 Nov 2019 23:50:37 +0100 Subject: [PATCH 3/7] fix: servers/decrypters/zcrypt.py problema del caricamento infinito per link che rimandano a openload --- servers/decrypters/zcrypt.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/servers/decrypters/zcrypt.py b/servers/decrypters/zcrypt.py index a71e77bb..7a41230a 100644 --- a/servers/decrypters/zcrypt.py +++ b/servers/decrypters/zcrypt.py @@ -12,8 +12,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= encontrados = { 'https://vcrypt.net/images/logo', 'https://vcrypt.net/css/out', 'https://vcrypt.net/images/favicon', 'https://vcrypt.net/css/open', - 'http://linkup.pro/js/jquery', 'https://linkup.pro/js/jquery', - 'http://www.rapidcrypt.net/open' + 'http://linkup.pro/js/jquery', 'https://linkup.pro/js/jquery'#, + #'http://www.rapidcrypt.net/open' } devuelve = [] @@ -84,6 +84,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= for url in matches: if url not in encontrados: + if 'https://rapidcrypt.net/open/' in url: + continue logger.info(" url=" + url) encontrados.add(url) @@ -96,5 +98,3 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= ret = page_url+" "+str(devuelve) if devuelve else page_url logger.info(" RET=" + str(ret)) return ret - - From aaeeb2b32b1d4f84c336ed9e68ec892b9349a65d Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Tue, 5 Nov 2019 00:04:31 +0100 Subject: [PATCH 4/7] Fix Wstream?? --- servers/wstream.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/servers/wstream.json b/servers/wstream.json index 45e65004..79951474 100644 --- a/servers/wstream.json +++ b/servers/wstream.json @@ -6,12 +6,20 @@ "thumbnail": "http:\/\/media.tvalacarta.info\/servers\/server_wstream.png", "find_videos": { "patterns": [ + { + "pattern":"wstream.video\/(api\/vcmod\/fastredirect\/streaming.php\\?id=624173)", + "url": "http:\/\/wstream.video\/\\1" + }, { "pattern": "wstream\\.video/video\\.php\\?file_code=([a-z0-9A-Z]+)", "url": "http:\/\/wstream.video\/\\1" }, { - "pattern": "wstream\\.video/(?:embed-|videos/|video/|videow/|videoj/)?([a-z0-9A-Z]+)", + "pattern": "wstream\\.video\/(?:embed-|videos/|video/|videow/|videoj/)([a-z0-9A-Z]+)", + "url": "http:\/\/wstream.video\/\\1" + }, + { + "pattern": "wstream\\.video\/(?!api/)([a-z0-9A-Z]+)", "url": "http:\/\/wstream.video\/\\1" } ], From 462676144bbe713c1448131f133f00d2a2bfccbf Mon Sep 17 00:00:00 2001 From: greko17 Date: Tue, 5 Nov 2019 00:07:27 +0100 Subject: [PATCH 5/7] fix: servers/decrypters/zcrypt.py per link http://vcrypt.net/myfoldersakstream.php --- servers/decrypters/zcrypt.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/servers/decrypters/zcrypt.py b/servers/decrypters/zcrypt.py index 7a41230a..00416720 100644 --- a/servers/decrypters/zcrypt.py +++ b/servers/decrypters/zcrypt.py @@ -47,13 +47,17 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= data, status = unshortenit.unshorten(url) logger.info("Data - Status zcrypt xshield.net: [%s] [%s] " %(data, status)) elif 'vcrypt.net' in url: - from lib import unshortenit - data, status = unshortenit.unshorten(url) - logger.info("Data - Status zcrypt vcrypt.net: [%s] [%s] " %(data, status)) + if 'myfoldersakstream.php': continue #'very' in url or + else: + from lib import unshortenit + data, status = unshortenit.unshorten(url) + logger.info("Data - Status zcrypt vcrypt.net: [%s] [%s] " %(data, status)) elif 'linkup' in url or 'bit.ly' in url: - idata = httptools.downloadpage(url).data - data = scrapertoolsV2.find_single_match(idata, "]*src=\\'([^'>]*)\\'[^<>]*>") - #fix by greko inizio + if '/olink/' in url: continue + else: + idata = httptools.downloadpage(url).data + data = scrapertoolsV2.find_single_match(idata, "]*src=\\'([^'>]*)\\'[^<>]*>") + #fix by greko inizio if not data: data = scrapertoolsV2.find_single_match(idata, 'action="(?:[^/]+.*?/[^/]+/([a-zA-Z0-9_]+))">') from lib import unshortenit From e1d3ad0cce30f92ed8f49e4f51231fd5c754959c Mon Sep 17 00:00:00 2001 From: greko17 Date: Tue, 5 Nov 2019 00:37:15 +0100 Subject: [PATCH 6/7] fix: servers/decrypters/zcrypt.py corretto!!! OPS! [cit.] --- servers/decrypters/zcrypt.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/servers/decrypters/zcrypt.py b/servers/decrypters/zcrypt.py index 00416720..ad520aa8 100644 --- a/servers/decrypters/zcrypt.py +++ b/servers/decrypters/zcrypt.py @@ -47,7 +47,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password= data, status = unshortenit.unshorten(url) logger.info("Data - Status zcrypt xshield.net: [%s] [%s] " %(data, status)) elif 'vcrypt.net' in url: - if 'myfoldersakstream.php': continue #'very' in url or + if 'myfoldersakstream.php' in url: + continue #'very' in url or else: from lib import unshortenit data, status = unshortenit.unshorten(url) From f8398158555c7aa9401478160ba0a98e68d6de64 Mon Sep 17 00:00:00 2001 From: greko17 Date: Tue, 5 Nov 2019 01:18:41 +0100 Subject: [PATCH 7/7] fix: servers/wstream.json update --- servers/wstream.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/servers/wstream.json b/servers/wstream.json index 79951474..359a6bc0 100644 --- a/servers/wstream.json +++ b/servers/wstream.json @@ -7,7 +7,7 @@ "find_videos": { "patterns": [ { - "pattern":"wstream.video\/(api\/vcmod\/fastredirect\/streaming.php\\?id=624173)", + "pattern":"wstream.video\/(api\/vcmod\/fastredirect\/streaming.php\\?id=[0-9a-zA-Z]+)", "url": "http:\/\/wstream.video\/\\1" }, {