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

Possibile fix Busy dialog

Browse Source
This commit is contained in:
Alhaziel01
2020-12-10 11:03:53 +01:00
parent 36dcb2bf01
commit 91b6cf6691
4 changed files with 31 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platformcode/globalsearch.py
View File

@@ -650,6 +650,7 @@ class SearchWindow(xbmcgui.WindowXML):
elif control_id in [SERVERLIST]:
server = Item().fromurl(self.getControl(control_id).getSelectedItem().getProperty('item'))
server.new_search=True
return run(server)
def Back(self):

2
platformcode/launcher.py
View File

@@ -506,7 +506,7 @@ def play_from_library(item):
if config.get_setting("max_links", "videolibrary") != 0: itemlist = limit_itemlist(itemlist)
# The list of links is slightly "cleaned"
if config.get_setting("replace_VD", "videolibrary") == 1: itemlist = reorder_itemlist(itemlist)
from core.support import dbg;dbg()
# from core.support import dbg;dbg()
if len(itemlist) > 0:
while not xbmc.Monitor().abortRequested():
# The user chooses the mirror

61
platformcode/platformtools.py
View File

@@ -1009,7 +1009,14 @@ def get_video_seleccionado(item, seleccion, video_urls):
def set_player(item, xlistitem, mediaurl, view, strm):
logger.debug()
item.options = {'strm':False, 'continue':False}
# logger.debug("item:\n" + item.tostring('\n'))
if item.new_search: xbmc.executebuiltin("PlayMedia(" + os.path.join(config.get_runtime_path(), "resources", "kod.mp4") + ")")
# Prevent Busy
else: xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xbmcgui.ListItem(path=os.path.join(config.get_runtime_path(), "resources", "kod.mp4")))
xbmc.Player().stop()
# Moved del conector "torrent" here
if item.server == "torrent":
play_torrent(item, xlistitem, mediaurl)
@@ -1030,36 +1037,19 @@ def set_player(item, xlistitem, mediaurl, view, strm):
elif "megacrypter.com" in mediaurl: player_mode = 3
logger.info("mediaurl=" + mediaurl)
if player_mode == 0:
logger.info('Player Mode: Direct')
if player_mode in [0,1]:
logger.info('Player Mode:' + ['Direct', 'Bookmark'][player_mode])
# Add the listitem to a playlist
playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
playlist.clear()
playlist.add(mediaurl, xlistitem)
# Reproduce
xbmc_player.play(playlist, xlistitem)
if config.get_setting('trakt_sync'):
from core import trakt_tools
trakt_tools.wait_for_update_trakt()
# elif player_mode == 1:
# logger.info('Player Mode: setResolvedUrl')
# xlistitem.setPath(mediaurl)
# xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xlistitem)
# # xbmc.sleep(2500)
elif player_mode == 1:
logger.info('Player Mode: Bookmark')
# Add the listitem to a playlist
playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO)
playlist.clear()
playlist.add(mediaurl, xlistitem)
played_time = resume_playback(get_played_time(item))
# played_time = resume_playback(get_played_time(item))
# Reproduce
xbmc_player.play(playlist, xlistitem)
viewed(item, played_time)
# viewed(item, played_time)
if config.get_setting('trakt_sync'):
from core import trakt_tools
trakt_tools.wait_for_update_trakt()
@@ -1081,35 +1071,18 @@ def set_player(item, xlistitem, mediaurl, view, strm):
xbmc_player.setSubtitles(item.subtitle)
# if it is a video library file send to mark as seen
if strm or item.strm_path:
from platformcode import xbmc_videolibrary
xbmc_videolibrary.mark_auto_as_watched(item)
if strm or item.strm_path: item.options['strm'] = True
if player_mode == 1: item.options['continue'] = True
from platformcode import xbmc_videolibrary
xbmc_videolibrary.mark_auto_as_watched(item)
# for cases where the audio playback window appears in place of the video one
if item.focusOnVideoPlayer:
while is_playing and xbmcgui.getCurrentWindowId() != 12006:
while is_playing() and xbmcgui.getCurrentWindowId() != 12006:
continue
xbmc.sleep(500)
xbmcgui.Window(12005).show()
def viewed(item, played_time):
from core import filetools, jsontools
def viewedThread(item, played_time):
while is_playing():
total_time = xbmc.Player().getTotalTime()
actual_time = xbmc.Player().getTime()
if played_time and xbmcgui.getCurrentWindowId() == 12005 and actual_time < played_time:
xbmc.Player().seekTime(played_time)
played_time = 0
# xbmc.sleep(500)
if 120 < actual_time < (total_time / 100) * 80:
item.played_time = actual_time
else: item.played_time = 0
set_played_time(item)
from threading import Thread
Thread(target=viewedThread, args=(item, played_time)).start()
def torrent_client_installed(show_tuple=False):
# External plugins found in servers / torrent.json node clients

20
platformcode/xbmc_videolibrary.py
View File

@@ -39,14 +39,15 @@ def mark_auto_as_watched(item):
next_dialogs = ['NextDialog.xml', 'NextDialogExtended.xml', 'NextDialogCompact.xml']
next_ep_type = config.get_setting('next_ep_type')
ND = next_dialogs[next_ep_type]
next_episode = next_ep(item)
try: next_episode = next_ep(item)
except: next_episode = False
while platformtools.is_playing():
actual_time = xbmc.Player().getTime()
total_time = xbmc.Player().getTotalTime()
# if item_nfo.played_time and xbmcgui.getCurrentWindowId() == 12005:
# xbmc.Player().seekTime(item_nfo.played_time)
# item_nfo.played_time = 0 # Fix for Slow Devices
if item.played_time and xbmcgui.getCurrentWindowId() == 12005:
xbmc.Player().seekTime(item.played_time)
item.played_time = 0 # Fix for Slow Devices
mark_time = total_time * percentage
difference = total_time - actual_time
@@ -55,7 +56,7 @@ def mark_auto_as_watched(item):
if actual_time > mark_time and not marked:
logger.info("Marked as Watched")
item.playcount = 1
marked = True
if item.options['strm'] : marked = True
show_server = False
from specials import videolibrary
videolibrary.mark_content_as_watched2(item)
@@ -75,9 +76,11 @@ def mark_auto_as_watched(item):
break
xbmc.sleep(1000)
# # Set played time
# item_nfo.played_time = int(actual_time) if not marked else 0
# filetools.write(nfo_path, head_nfo + item_nfo.tojson())
if item.options['continue']:
if 120 < actual_time < (total_time / 100) * 80:
item.played_time = actual_time
else: item.played_time = 0
platformtools.set_played_time(item)
# Silent sync with Trakt
if marked and config.get_setting("trakt_sync"): sync_trakt_kodi()
@@ -94,6 +97,7 @@ def mark_auto_as_watched(item):
# If it is configured to mark as seen
if config.get_setting("mark_as_watched", "videolibrary"):
if item.options['continue']: item.played_time = platformtools.resume_playback(platformtools.get_played_time(item))
threading.Thread(target=mark_as_watched_subThread, args=[item]).start()