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

Encode listitem paths

Browse source
This commit is contained in:
croneter 2018-01-28 15:24:41 +01:00
parent 8c4d00da3d
commit 0e3a7a1673
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
resources/lib/playback.py
View file

@ -16,7 +16,7 @@ from playutils import PlayUtils
from PKC_listitem import PKC_ListItem from PKC_listitem import PKC_ListItem
from pickler import pickle_me, Playback_Successful from pickler import pickle_me, Playback_Successful
import json_rpc as js import json_rpc as js
from utils import window, settings, dialog, language as lang from utils import window, settings, dialog, language as lang, tryEncode
from plexbmchelper.subscribers import LOCKER from plexbmchelper.subscribers import LOCKER
import variables as v import variables as v
import state import state
@ -99,7 +99,7 @@ def play_resume(playqueue, xml, stack):
api.CreateListItemFromPlexItem(listitem) api.CreateListItemFromPlexItem(listitem)
playutils = PlayUtils(api, item) playutils = PlayUtils(api, item)
playurl = playutils.getPlayUrl() playurl = playutils.getPlayUrl()
listitem.setPath(playurl) listitem.setPath(tryEncode(playurl))
if item.playmethod in ('DirectStream', 'DirectPlay'): if item.playmethod in ('DirectStream', 'DirectPlay'):
listitem.setSubtitles(api.externalSubs()) listitem.setSubtitles(api.externalSubs())
else: else:
@ -202,7 +202,7 @@ def _prep_playlist_stack(xml):
path = ('plugin://plugin.video.plexkodiconnect?%s' path = ('plugin://plugin.video.plexkodiconnect?%s'
% urlencode(params)) % urlencode(params))
listitem = api.CreateListItemFromPlexItem() listitem = api.CreateListItemFromPlexItem()
listitem.setPath(path) listitem.setPath(tryEncode(path))
else: else:
# Will add directly via the Kodi DB # Will add directly via the Kodi DB
path = None path = None
@ -277,12 +277,11 @@ def conclude_playback(playqueue, pos):
playurl = playutils.getPlayUrl() playurl = playutils.getPlayUrl()
else: else:
playurl = item.file playurl = item.file
listitem.setPath(playurl) listitem.setPath(tryEncode(playurl))
if item.playmethod in ('DirectStream', 'DirectPlay'): if item.playmethod in ('DirectStream', 'DirectPlay'):
listitem.setSubtitles(api.externalSubs()) listitem.setSubtitles(api.externalSubs())
else: else:
playutils.audio_subtitle_prefs(listitem) playutils.audio_subtitle_prefs(listitem)
listitem.setPath(playurl)
if state.RESUME_PLAYBACK is True: if state.RESUME_PLAYBACK is True:
state.RESUME_PLAYBACK = False state.RESUME_PLAYBACK = False
LOG.info('Resuming playback at %s', item.offset) LOG.info('Resuming playback at %s', item.offset)