This commit is contained in:
Alhaziel01
2021-02-05 15:27:42 +01:00
parent d1bf89a4c3
commit 9c8f33f7cf
2 changed files with 6 additions and 7 deletions
+6 -6
View File
@@ -4,13 +4,14 @@
# ------------------------------------------------------------ # ------------------------------------------------------------
import requests, sys, inspect import requests, sys, inspect
from core import support from core import support, channeltools
from platformcode import autorenumber, logger, platformtools from platformcode import autorenumber, logger, platformtools
from collections import OrderedDict from collections import OrderedDict
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
from concurrent import futures from concurrent import futures
else: else:
from concurrent_py2 import futures from concurrent_py2 import futures
current_session = requests.Session() current_session = requests.Session()
host = support.config.get_channel_url() host = support.config.get_channel_url()
onair = host + '/palinsesto/onAir.json' onair = host + '/palinsesto/onAir.json'
@@ -341,7 +342,7 @@ def findvideos(item):
else: else:
url = item.url url = item.url
itemlist.append(item.clone(server = 'directo', title = support.config.get_localized_string(30137), fanart = item.json, url = getUrl(url), action = 'play' )) itemlist.append(item.clone(server = 'directo', title = 'Rai Play', url = getUrl(url), action = 'play'))
return support.server(item, itemlist=itemlist, Download=False) return support.server(item, itemlist=itemlist, Download=False)
@@ -418,10 +419,9 @@ def load_episodes(key, item):
def play(item): def play(item):
item.forcethumb=True
item.no_return=True
if item.filter: if item.filter:
d = liveDict() d = liveDict()
item.clone(fulltitle = item.filter, url = d[item.filter]['url'], plot = d[item.filter]['plot'], forcethumb=True, no_return=True) item = item.clone(server='directo', fulltitle=item.filter, url=d[item.filter]['url'], plot=d[item.filter]['plot'], forcethumb=True, no_return=True)
support.thumb(item, live=True) support.thumb(item, live=True)
return platformtools.play_video(item) logger.debug('PLAY URL', item.url)
return [item]
-1
View File
@@ -200,7 +200,6 @@ def run(item=None):
if hasattr(channel, 'play'): if hasattr(channel, 'play'):
logger.debug("Executing channel 'play' method") logger.debug("Executing channel 'play' method")
itemlist = channel.play(item) itemlist = channel.play(item)
if not itemlist: return
b_favourite = item.isFavourite b_favourite = item.isFavourite
# Play should return a list of playable URLS # Play should return a list of playable URLS
if len(itemlist) > 0 and isinstance(itemlist[0], Item): if len(itemlist) > 0 and isinstance(itemlist[0], Item):