minor fixes

This commit is contained in:
alfa-addon
2017-08-22 18:22:23 -04:00
parent 8da966a9b1
commit 5b0f67d6ea
3 changed files with 38 additions and 28 deletions

8
plugin.video.alfa/channels/descargasmix.json Executable file → Normal file
View File

@@ -59,6 +59,14 @@
"Perfil 2",
"Perfil 1"
]
},
{
"id": "include_in_global_search",
"type": "bool",
"label": "Incluir en busqueda global",
"default": false,
"enabled": true,
"visible": true
}
]
}

54
plugin.video.alfa/channels/serieslan.py Executable file → Normal file
View File

@@ -85,14 +85,14 @@ def episodios(item):
total_episode += 1
season, episode = renumbertools.numbered_for_tratk(item.channel, item.show, 1, total_episode)
if len(name.split(pat)) == i:
title += "{0}x{1:02d} ".format(season, episode)
title += "%sx%s " % (season, str(episode).zfill(2))
else:
title += "{0}x{1:02d}_".format(season, episode)
title += "%sx%s_" % (season, str(episode).zfill(2))
else:
total_episode += 1
season, episode = renumbertools.numbered_for_tratk(item.channel, item.show, 1, total_episode)
title += "{0}x{1:02d} ".format(season, episode)
title += "%sx%s " % (season, str(episode).zfill(2))
url = host + "/" + link
if "disponible" in link:
@@ -110,21 +110,17 @@ def episodios(item):
return itemlist
# def getUrlVideo(item):
def findvideos(item):
## Kodi 17+
## Openload as default server
logger.info()
import base64
itemlist = []
## Urls
urlServer = "https://openload.co/embed/%s/"
urlApiGetKey = "https://serieslan.com/idv.php?i=%s"
url_server = "https://openload.co/embed/%s/"
url_api_get_key = "https://serieslan.com/ide.php?i=%s&k=%s"
## JS
def txc(key, str):
def txc(key, _str):
s = range(256)
j = 0
res = ''
@@ -135,13 +131,13 @@ def findvideos(item):
s[j] = x
i = 0
j = 0
for y in range(len(str)):
for y in range(len(_str)):
i = (i + 1) % 256
j = (j + s[i]) % 256
x = s[i]
s[i] = s[j]
s[j] = x
res += chr(ord(str[y]) ^ s[(s[i] + s[j]) % 256])
res += chr(ord(_str[y]) ^ s[(s[i] + s[j]) % 256])
return res
data = httptools.downloadpage(item.url).data
@@ -151,20 +147,26 @@ def findvideos(item):
'<div id="tab-1" class="tab-content current">.+?<img src="([^"]*)">')
show = scrapertools.find_single_match(data, '<span>Episodio: <\/span>([^"]*)<\/p><p><span>Idioma')
thumbnail = host + thumbnail
data = httptools.downloadpage(urlApiGetKey % idv, headers={'Referer': item.url}).data
video_url = urlServer % (txc(ide, base64.decodestring(data)))
server = "openload"
if " SUB" in item.title:
lang = "VOS"
elif " Sub" in item:
lang = "VOS"
else:
lang = "Latino"
title = "Enlace encontrado en " + server + " [" + lang + "]"
itemlist.append(Item(channel=item.channel, action="play", title=title, show=show, url=video_url, plot=item.plot,
thumbnail=thumbnail, server=server, folder=False))
data = httptools.downloadpage(url_api_get_key % (idv, ide), headers={'Referer': item.url}).data
data = eval(data)
return itemlist
if type(data) == list:
logger.debug("inside")
video_url = url_server % (txc(ide, base64.decodestring(data[2])))
server = "openload"
if " SUB" in item.title:
lang = "VOS"
elif " Sub" in item:
lang = "VOS"
else:
lang = "Latino"
title = "Enlace encontrado en " + server + " [" + lang + "]"
itemlist.append(Item(channel=item.channel, action="play", title=title, show=show, url=video_url, plot=item.plot,
thumbnail=thumbnail, server=server, folder=False))
return itemlist
else:
return []
def play(item):

4
plugin.video.alfa/servers/streamplay.py Executable file → Normal file
View File

@@ -17,7 +17,8 @@ def test_video_exists(page_url):
data = httptools.downloadpage(page_url, headers={'Referer': referer}).data
if data == "File was deleted":
return False, "[Streamplay] El archivo no existe o ha sido borrado"
elif "Video is processing now" in data:
return False, "[Streamplay] El archivo se está procesando"
return True, ""
@@ -26,7 +27,6 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
referer = re.sub(r"embed-|player-", "", page_url)[:-5]
data = httptools.downloadpage(page_url, headers={'Referer': referer}).data
matches = scrapertools.find_single_match(data, "<script type=[\"']text/javascript[\"']>(eval.*?)</script>")
data = jsunpack.unpack(matches).replace("\\", "")