Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix playerid not being retrieved for Kodi 18

Browse source
This commit is contained in:
croneter 2018-08-23 15:16:23 +02:00
parent ce4ca71766
commit e3a209c24b
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
resources/lib/kodimonitor.py
View file

@ -373,12 +373,27 @@ class KodiMonitor(xbmc.Monitor):
LOG.info('Aborting playback report - item invalid for updates %s', LOG.info('Aborting playback report - item invalid for updates %s',
data) data)
return return
kodi_id = data['item'].get('id') if 'item' in data else None
kodi_type = data['item'].get('type') if 'item' in data else None
path = data['item'].get('file') if 'item' in data else None
if playerid == -1: if playerid == -1:
# Kodi might return -1 for "last player" # Kodi might return -1 for "last player"
# Getting the playerid is really a PITA
try: try:
playerid = js.get_player_ids()[0] playerid = js.get_player_ids()[0]
except IndexError: except IndexError:
LOG.error('Could not retreive active player - aborting') # E.g. Kodi 18 doesn't tell us anything useful
if kodi_type in v.KODI_VIDEOTYPES:
playlist_type = v.KODI_TYPE_VIDEO_PLAYLIST
elif kodi_type in v.KODI_AUDIOTYPES:
playlist_type = v.KODI_TYPE_AUDIO_PLAYLIST
else:
LOG.error('Unexpected type %s, data %s', kodi_type, data)
return
playerid = js.get_playlist_id(playlist_type)
LOG.error('playerid found: %s', playerid)
if not playerid:
LOG.error('Coud not get playerid for data', data)
return return
playqueue = PQ.PLAYQUEUES[playerid] playqueue = PQ.PLAYQUEUES[playerid]
info = js.get_player_props(playerid) info = js.get_player_props(playerid)
@ -391,9 +406,6 @@ class KodiMonitor(xbmc.Monitor):
pos = info['position'] if info['position'] != -1 else 0 pos = info['position'] if info['position'] != -1 else 0
LOG.debug('Detected position %s for %s', pos, playqueue) LOG.debug('Detected position %s for %s', pos, playqueue)
status = state.PLAYER_STATES[playerid] status = state.PLAYER_STATES[playerid]
kodi_id = data['item'].get('id') if 'item' in data else None
kodi_type = data['item'].get('type') if 'item' in data else None
path = data['item'].get('file') if 'item' in data else None
try: try:
item = playqueue.items[pos] item = playqueue.items[pos]
except IndexError: except IndexError: