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

This commit is contained in:
marco
2020-07-12 22:58:37 +02:00
+13 -5
View File
@@ -2,11 +2,9 @@
# ------------------------------------------------------------ # ------------------------------------------------------------
# Canale per vvvvid # Canale per vvvvid
# ---------------------------------------------------------- # ----------------------------------------------------------
import requests, re import requests, sys
from core import support, tmdb from core import support, tmdb
from core.item import Item
from specials import autorenumber from specials import autorenumber
import sys
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
from concurrent import futures from concurrent import futures
else: else:
@@ -32,7 +30,6 @@ main_host = host
host += '/vvvvid/ondemand/' host += '/vvvvid/ondemand/'
@support.menu @support.menu
def mainlist(item): def mainlist(item):
if conn_id: if conn_id:
@@ -91,7 +88,7 @@ def search(item, text):
def newest(categoria): def newest(categoria):
item = Item() item = support.Item()
item.args = 'channel/10007/last/' item.args = 'channel/10007/last/'
if categoria == 'peliculas': if categoria == 'peliculas':
item.contentType = 'movie' item.contentType = 'movie'
@@ -198,6 +195,17 @@ def findvideos(item):
url= 'https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/' + url, url= 'https://or01.top-ix.org/videomg/_definst_/mp4:' + item.url + '/' + url,
server= 'directo') server= 'directo')
) )
else:
key_url = 'https://www.vvvvid.it/kenc?action=kt&conn_id=' + conn_id + '&url=' + item.url.replace(':','%3A').replace('/','%2F')
key = vvvvid_decoder.dec_ei(current_session.get(key_url, headers=headers, params=payload).json()['message'])
itemlist.append(
item.clone(action= 'play',
title='direct',
url= item.url + '?' + key,
server= 'directo')
)
return support.server(item, itemlist=itemlist, Download=False) return support.server(item, itemlist=itemlist, Download=False)
def make_itemlist(itemlist, item, data): def make_itemlist(itemlist, item, data):