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

Piccole migliorie

Browse Source
This commit is contained in:
Alhaziel01
2021-12-18 15:57:25 +01:00
parent 84b30d3be6
commit 0dd880537c
2 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
platformcode/platformtools.py
View File

@@ -1386,7 +1386,8 @@ def set_player(item, xlistitem, mediaurl, view, strm):
logger.info("mediaurl=" + mediaurl) logger.info("mediaurl=" + mediaurl)
prevent_busy() prevent_busy()
if player_mode in [0,1]: if player_mode in [0,1]:
xlistitem.addStreamInfo('video', {'duration':240}) if player_mode in [1]:
xlistitem.setProperty('StartOffset','{}'.format(resume_playback(get_played_time(item))))
logger.info('Player Mode:',['Direct', 'Bookmark'][player_mode]) logger.info('Player Mode:',['Direct', 'Bookmark'][player_mode])
# Add the listitem to a playlist # Add the listitem to a playlist
@@ -1419,11 +1420,11 @@ def set_player(item, xlistitem, mediaurl, view, strm):
xbmc_videolibrary.mark_auto_as_watched(item) xbmc_videolibrary.mark_auto_as_watched(item)
# for cases where the audio playback window appears in place of the video one # for cases where the audio playback window appears in place of the video one
if item.focusOnVideoPlayer: # if item.focusOnVideoPlayer:
while is_playing() and xbmcgui.getCurrentWindowId() != 12006: # while is_playing() and xbmcgui.getCurrentWindowId() != 12006:
continue # continue
xbmc.sleep(500) # xbmc.sleep(500)
xbmcgui.Window(12005).show() # xbmcgui.Window(12005).show()
@@ -1639,7 +1640,7 @@ def get_played_time(item):
import traceback import traceback
logger.error(traceback.format_exc()) logger.error(traceback.format_exc())
del db['viewed'][ID] del db['viewed'][ID]
db.close()
return played_time return played_time
@@ -1669,7 +1670,7 @@ def set_played_time(item):
import traceback import traceback
logger.error(traceback.format_exc()) logger.error(traceback.format_exc())
del db['viewed'][ID] del db['viewed'][ID]
db.close()
def prevent_busy(): def prevent_busy():
xbmc.executebuiltin('Dialog.Close(all,true)') xbmc.executebuiltin('Dialog.Close(all,true)')
@@ -1874,21 +1875,22 @@ def serverWindow(item, itemlist):
if reopen: if reopen:
xbmc.sleep(200) xbmc.sleep(200)
if not db['controls'].get('reopen', False): if not db['controls'].get('reopen', False):
return break
if config.get_setting('window_type') == 0: if config.get_setting('window_type') == 0:
selection = ServerSkinWindow("DialogSelect.xml", config.get_runtime_path()).start(item, itemlist) selection = ServerSkinWindow("DialogSelect.xml", config.get_runtime_path()).start(item, itemlist)
else: else:
selection = ServerWindow('Servers.xml', config.get_runtime_path()).start(item, itemlist) selection = ServerWindow('Servers.xml', config.get_runtime_path()).start(item, itemlist)
if selection == -1: if selection == -1:
return break
else: else:
from platformcode.launcher import run from platformcode.launcher import run
run(selection) run(selection)
reopen = True reopen = True
if not selection.server or selection.server == 'torrent': return if not selection.server or selection.server == 'torrent': break
db.close() db.close()
logger.debug('Server Window EXIT')
import threading import threading
threading.Thread(target=monitor, args=[itemlist]).start() threading.Thread(target=monitor, args=[itemlist]).start()

12
service.py
View File

@@ -513,8 +513,8 @@ if __name__ == "__main__":
# scan new info # scan new info
xbmc.executebuiltin('UpdateLibrary(video)') xbmc.executebuiltin('UpdateLibrary(video)')
xbmc.executebuiltin('CleanLibrary(video)') xbmc.executebuiltin('CleanLibrary(video)')
while xbmc.getCondVisibility('Library.IsScanningVideo()'): # while xbmc.getCondVisibility('Library.IsScanningVideo()'):
xbmc.sleep(1000) # xbmc.sleep(1000)
# check if the user has any connection problems # check if the user has any connection problems
from platformcode.checkhost import test_conn from platformcode.checkhost import test_conn
@@ -546,8 +546,12 @@ if __name__ == "__main__":
logger.debug(threading.enumerate()) logger.debug(threading.enumerate())
break break
if monitor.waitForAbort(1): # every second if monitor.waitForAbort(1): # every second
logger.debug('KoD service EXIT')
# db need to be closed when not used, it will cause freezes # db need to be closed when not used, it will cause freezes
db.close()
join_threads() join_threads()
logger.debug('Close Threads')
db.close()
logger.debug('Close DB')
break break
logger.debug('KoD service STOPPED')