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

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

Browse Source
This commit is contained in:
marco
2020-01-10 21:17:40 +01:00
parent 056a20c5b4 5d1fd6eaff
commit 03a6a992bc
5 changed files with 109 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platformcode/launcher.py
View File

@@ -469,13 +469,16 @@ def play_from_library(item):
xbmc.executebuiltin("Container.Update(" + sys.argv[0] + "?" + item.tourl() + ")")
else:
# Ventana emergente
item.play_from = 'window'
from specials import videolibrary
p_dialog = platformtools.dialog_progress_bg(config.get_localized_string(20000), config.get_localized_string(70004))
p_dialog.update(0, '')
itemlist = videolibrary.findvideos(item)
while platformtools.is_playing():
# Ventana convencional
sleep(5)
@@ -518,17 +521,21 @@ def play_from_library(item):
else:
cabecera = config.get_localized_string(30163)
if (not config.get_setting('autoplay') and not config.get_setting('hide_servers')) or item.no_window:
SHOW = True
if config.get_setting('autoplay') and config.get_setting('hide_servers'):
SHOW = False
if SHOW:
seleccion = platformtools.dialog_select(cabecera, opciones)
if seleccion == -1:
return
else:
item = videolibrary.play(itemlist[seleccion])[0]
item.play_from = 'window'
platformtools.play_video(item)
from specials import autoplay
if (platformtools.is_playing() and item.action) or item.server == 'torrent' or autoplay.is_active(item.contentChannel):
break

17
platformcode/platformtools.py
View File

@@ -12,7 +12,7 @@ import os
import sys
import urllib
import config
# import config
import xbmc
import xbmcaddon
import xbmcgui
@@ -22,7 +22,7 @@ from channelselector import get_thumb
from core import channeltools
from core import trakt_tools, scrapertools
from core.item import Item
from platformcode import logger, keymaptools
from platformcode import logger, keymaptools, config
from platformcode import unify
addon = xbmcaddon.Addon('plugin.video.kod')
@@ -683,8 +683,8 @@ def is_playing():
def play_video(item, strm=False, force_direct=False, autoplay=False):
logger.info()
if item.play_from == 'window':
force_direct=True
# if item.play_from == 'window':
# force_direct=True
# logger.debug(item.tostring('\n'))
logger.debug('item play: %s'%item)
xbmc_player = XBMCPlayer()
@@ -758,9 +758,6 @@ def play_video(item, strm=False, force_direct=False, autoplay=False):
# Reproduce
xbmc_player.play(playlist, xlistitem)
if not item.launcher and (strm or item.strm_path) and config.get_setting('next_ep') > 0 and item.contentType != 'movie':
from specials.nextep import afther_stop
afther_stop(item)
else:
set_player(item, xlistitem, mediaurl, view, strm)
@@ -1082,7 +1079,7 @@ def get_video_seleccionado(item, seleccion, video_urls):
def set_player(item, xlistitem, mediaurl, view, strm):
logger.info()
logger.debug("item:\n" + item.tostring('\n'))
# logger.debug("item:\n" + item.tostring('\n'))
# Movido del conector "torrent" aqui
if item.server == "torrent":
@@ -1104,7 +1101,7 @@ def set_player(item, xlistitem, mediaurl, view, strm):
download_and_play.download_and_play(mediaurl, "download_and_play.mp4", config.get_setting("downloadpath"))
return
elif config.get_setting("player_mode") == 0 or\
elif config.get_setting("player_mode") == 0 or item.play_from == 'window' or\
(config.get_setting("player_mode") == 3 and mediaurl.startswith("rtmp")):
# Añadimos el listitem a una lista de reproducción (playlist)
playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
@@ -1143,7 +1140,7 @@ def set_player(item, xlistitem, mediaurl, view, strm):
from platformcode import xbmc_videolibrary
xbmc_videolibrary.mark_auto_as_watched(item)
if not item.launcher and (strm or item.strm_path) and config.get_setting('next_ep') > 0 and item.contentType != 'movie':
if (strm or item.strm_path) and config.get_setting('next_ep') > 0 and item.contentType != 'movie' and item.play_from != 'window':
from specials.nextep import afther_stop
afther_stop(item)