Jellyfin
/
jellyfin-kodi
mirror of https://github.com/jellyfin/jellyfin-kodi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix resume issue & Small caching issue

This commit is contained in:
angelblue05 2018-05-10 04:06:18 -05:00
parent d30701956b
commit 7e928a8fc5
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
resources/lib/kodimonitor.py
View File

@ -105,11 +105,15 @@ class KodiMonitor(xbmc.Monitor):
kodi_id = None kodi_id = None
if KODI >= 17 and xbmc.Player().isPlayingVideo(): if KODI >= 17 and xbmc.Player().isPlayingVideo():
''' Seems to misbehave when playback is not terminated prior to playing new content.
The kodi id remains that of the previous title. Maybe onPlay happens before
this information is updated. Added a failsafe further below.
'''
item = xbmc.Player().getVideoInfoTag() item = xbmc.Player().getVideoInfoTag()
kodi_id = item.getDbId() kodi_id = item.getDbId()
item_type = item.getMediaType() item_type = item.getMediaType()
if kodi_id is None or int(kodi_id) == -1: if kodi_id is None or int(kodi_id) == -1 or 'item' in data and data['item'].get('id') != kodi_id:
item = data['item'] item = data['item']
kodi_id = item['id'] kodi_id = item['id']
item_type = item['type'] item_type = item['type']
@ -227,13 +231,14 @@ class SpecialMonitor(threading.Thread):
isPlaying = player.isPlaying() isPlaying = player.isPlaying()
if (not isPlaying and xbmc.getCondVisibility('Window.IsVisible(DialogContextMenu.xml)') and if (not isPlaying and xbmc.getCondVisibility('Window.IsVisible(DialogContextMenu.xml)') and
xbmc.getInfoLabel('Control.GetLabel(1002)') == xbmc.getLocalizedString(12021)): xbmc.getInfoLabel('Control.GetLabel(1002)').decode('utf-8') == xbmc.getLocalizedString(12021)):
control = int(xbmcgui.Window(10106).getFocusId()) control = int(xbmcgui.Window(10106).getFocusId())
if control == 1002: # Start from beginning if control == 1002: # Start from beginning
log.info("Resume dialog: Start from beginning selected.") log.info("Resume dialog: Start from beginning selected.")
window('emby.resume', clear=True) window('emby.resume', clear=True)
else: else:
log.info("Resume dialog: Resume selected.")
window('emby.resume', value="true") window('emby.resume', value="true")
elif isPlaying and not window('emby.external_check'): elif isPlaying and not window('emby.external_check'):