Fix Kodi add-on Up Next
crashing by removing code that has become obsolete on the PKC-side
This commit is contained in:
parent
fb57e633e3
commit
bff6305d22
1 changed files with 0 additions and 58 deletions
|
@ -104,8 +104,6 @@ class KodiMonitor(xbmc.Monitor):
|
||||||
elif method == "System.OnQuit":
|
elif method == "System.OnQuit":
|
||||||
LOG.info('Kodi OnQuit detected - shutting down')
|
LOG.info('Kodi OnQuit detected - shutting down')
|
||||||
app.APP.stop_pkc = True
|
app.APP.stop_pkc = True
|
||||||
elif method == 'Other.plugin.video.plexkodiconnect_play_action':
|
|
||||||
self._start_next_episode(data)
|
|
||||||
|
|
||||||
def _playlist_onadd(self, data):
|
def _playlist_onadd(self, data):
|
||||||
"""
|
"""
|
||||||
|
@ -205,18 +203,6 @@ class KodiMonitor(xbmc.Monitor):
|
||||||
json_item.get('type'),
|
json_item.get('type'),
|
||||||
json_item.get('file'))
|
json_item.get('file'))
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _start_next_episode(data):
|
|
||||||
"""
|
|
||||||
Used for the add-on Upnext to start playback of the next episode
|
|
||||||
"""
|
|
||||||
LOG.info('Upnext: Start playback of the next episode')
|
|
||||||
play_info = binascii.unhexlify(data[0])
|
|
||||||
play_info = json.loads(play_info)
|
|
||||||
app.APP.player.stop()
|
|
||||||
handle = 'RunPlugin(%s)' % play_info.get('handle')
|
|
||||||
xbmc.executebuiltin(handle)
|
|
||||||
|
|
||||||
def PlayBackStart(self, data):
|
def PlayBackStart(self, data):
|
||||||
"""
|
"""
|
||||||
Called whenever playback is started. Example data:
|
Called whenever playback is started. Example data:
|
||||||
|
@ -363,10 +349,6 @@ class KodiMonitor(xbmc.Monitor):
|
||||||
status['external_player'] = app.APP.player.isExternalPlayer() == 1
|
status['external_player'] = app.APP.player.isExternalPlayer() == 1
|
||||||
LOG.debug('Set the player state: %s', status)
|
LOG.debug('Set the player state: %s', status)
|
||||||
|
|
||||||
# Workaround for the Kodi add-on Up Next
|
|
||||||
if not app.SYNC.direct_paths:
|
|
||||||
_notify_upnext(item)
|
|
||||||
|
|
||||||
if playerid == v.KODI_VIDEO_PLAYER_ID:
|
if playerid == v.KODI_VIDEO_PLAYER_ID:
|
||||||
task = InitVideoStreams(item)
|
task = InitVideoStreams(item)
|
||||||
backgroundthread.BGThreader.addTask(task)
|
backgroundthread.BGThreader.addTask(task)
|
||||||
|
@ -574,46 +556,6 @@ def _complete_artwork_keys(info):
|
||||||
info['art'][key] = ''
|
info['art'][key] = ''
|
||||||
|
|
||||||
|
|
||||||
def _notify_upnext(item):
|
|
||||||
"""
|
|
||||||
Signals to the Kodi add-on Upnext that there is another episode after this
|
|
||||||
one.
|
|
||||||
Needed for add-on paths in order to prevent crashes when Upnext does this
|
|
||||||
by itself
|
|
||||||
"""
|
|
||||||
if not item.plex_type == v.PLEX_TYPE_EPISODE:
|
|
||||||
return
|
|
||||||
this_api = item.api
|
|
||||||
next_api = _next_episode(this_api)
|
|
||||||
if next_api is None:
|
|
||||||
return
|
|
||||||
info = {}
|
|
||||||
for key, api in (('current_episode', this_api),
|
|
||||||
('next_episode', next_api)):
|
|
||||||
info[key] = {
|
|
||||||
'episodeid': api.plex_id,
|
|
||||||
'tvshowid': api.grandparent_id(),
|
|
||||||
'title': api.title(),
|
|
||||||
'showtitle': api.grandparent_title(),
|
|
||||||
'plot': api.plot(),
|
|
||||||
'playcount': api.viewcount(),
|
|
||||||
'season': api.season_number(),
|
|
||||||
'episode': api.index(),
|
|
||||||
'firstaired': api.year(),
|
|
||||||
'rating': api.rating(),
|
|
||||||
'art': api.artwork(kodi_id=api.kodi_id,
|
|
||||||
kodi_type=api.kodi_type,
|
|
||||||
full_artwork=True)
|
|
||||||
}
|
|
||||||
_complete_artwork_keys(info[key])
|
|
||||||
info['play_info'] = {'handle': next_api.fullpath(force_addon=True)[0]}
|
|
||||||
sender = v.ADDON_ID
|
|
||||||
method = 'upnext_data'
|
|
||||||
data = binascii.hexlify(json.dumps(info).encode('utf-8'))
|
|
||||||
data = '\\"[\\"{0}\\"]\\"'.format(data)
|
|
||||||
xbmc.executebuiltin(f'NotifyAll({sender}, {method}, {data})')
|
|
||||||
|
|
||||||
|
|
||||||
def _videolibrary_onupdate(data):
|
def _videolibrary_onupdate(data):
|
||||||
"""
|
"""
|
||||||
A specific Kodi library item has been updated. This seems to happen if the
|
A specific Kodi library item has been updated. This seems to happen if the
|
||||||
|
|
Loading…
Reference in a new issue