stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'master' of https://github.com/kodiondemand/addon

Browse Source
This commit is contained in:
Alhaziel
2019-11-05 17:18:41 +01:00
parent a6f5cb2061 f839815855
commit 5edaa9ae4e
4 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
channels/vvvvid.py
View File

@@ -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

2
platformcode/config.py
View File

@@ -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')

25
servers/decrypters/zcrypt.py
View File

@@ -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 = []
@@ -47,13 +47,18 @@ 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' in url:
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, "<iframe[^<>]*src=\\'([^'>]*)\\'[^<>]*>")
#fix by greko inizio
if '/olink/' in url: continue
else:
idata = httptools.downloadpage(url).data
data = scrapertoolsV2.find_single_match(idata, "<iframe[^<>]*src=\\'([^'>]*)\\'[^<>]*>")
#fix by greko inizio
if not data:
data = scrapertoolsV2.find_single_match(idata, 'action="(?:[^/]+.*?/[^/]+/([a-zA-Z0-9_]+))">')
from lib import unshortenit
@@ -84,6 +89,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 +103,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

10
servers/wstream.json
View File

@@ -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=[0-9a-zA-Z]+)",
"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"
}
],