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

Move propertiesPlayback from window to state.py

Browse source
This commit is contained in:
tomkat83 2018-01-03 17:50:01 +01:00
parent ec4a5d2b7c
commit 546e79d925
4 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
resources/lib/playbackutils.py
View file

@ -97,7 +97,6 @@ class PlaybackUtils():
startPos = max(playqueue.kodi_pl.getposition(), 0) startPos = max(playqueue.kodi_pl.getposition(), 0)
self.currentPosition = startPos self.currentPosition = startPos
propertiesPlayback = window('plex_playbackProps') == "true"
introsPlaylist = False introsPlaylist = False
dummyPlaylist = False dummyPlaylist = False
@ -114,8 +113,8 @@ class PlaybackUtils():
# We need to ensure we add the intro and additional parts only once. # We need to ensure we add the intro and additional parts only once.
# Otherwise we get a loop. # Otherwise we get a loop.
if not propertiesPlayback: if not v.PLAYBACK_SETUP_DONE:
window('plex_playbackProps', value="true") v.PLAYBACK_SETUP_DONE = True
LOG.info("Setting up properties in playlist.") LOG.info("Setting up properties in playlist.")
# Where will the player need to start? # Where will the player need to start?
# Do we need to get trailers? # Do we need to get trailers?
@ -232,9 +231,9 @@ class PlaybackUtils():
return result return result
# We just skipped adding properties. Reset flag for next time. # We just skipped adding properties. Reset flag for next time.
elif propertiesPlayback: elif v.PLAYBACK_SETUP_DONE:
LOG.debug("Resetting properties playback flag.") LOG.debug("Resetting properties playback flag.")
window('plex_playbackProps', clear=True) v.PLAYBACK_SETUP_DONE = False
# SETUP MAIN ITEM ########## # SETUP MAIN ITEM ##########
# For transcoding only, ask for audio/subs pref # For transcoding only, ask for audio/subs pref
@ -277,7 +276,7 @@ class PlaybackUtils():
Play all items contained in the xml passed in. Called by Plex Companion Play all items contained in the xml passed in. Called by Plex Companion
""" """
LOG.info("Playbackutils play_all called") LOG.info("Playbackutils play_all called")
window('plex_playbackProps', value="true") v.PLAYBACK_SETUP_DONE = True
self.currentPosition = 0 self.currentPosition = 0
for item in self.xml: for item in self.xml:
api = API(item) api = API(item)

2
resources/lib/player.py
View file

@ -263,12 +263,12 @@ class PKC_Player(Player):
for item in ('plex_currently_playing_itemid', for item in ('plex_currently_playing_itemid',
'plex_customplaylist', 'plex_customplaylist',
'plex_customplaylist.seektime', 'plex_customplaylist.seektime',
'plex_playbackProps',
'plex_forcetranscode'): 'plex_forcetranscode'):
window(item, clear=True) window(item, clear=True)
# We might have saved a transient token from a user flinging media via # We might have saved a transient token from a user flinging media via
# Companion (if we could not use the playqueue to store the token) # Companion (if we could not use the playqueue to store the token)
state.PLEX_TRANSIENT_TOKEN = None state.PLEX_TRANSIENT_TOKEN = None
v.PLAYBACK_SETUP_DONE = False
LOG.debug("Cleared playlist properties.") LOG.debug("Cleared playlist properties.")
def onPlayBackEnded(self): def onPlayBackEnded(self):

4
resources/lib/state.py
View file

@ -117,6 +117,10 @@ PLAYER_STATES = {
# paths for playback (since we're not receiving a Kodi id) # paths for playback (since we're not receiving a Kodi id)
PLEX_IDS = {} PLEX_IDS = {}
PLAYED_INFO = {} PLAYED_INFO = {}
# Former playbackProps; used by playbackutils.py and set to True if initial
# playback setup has been done (and playbackutils will be called again
# subsequently)
PLAYBACK_SETUP_DONE = False
# Kodi webserver details # Kodi webserver details
WEBSERVER_PORT = 8080 WEBSERVER_PORT = 8080

2
service.py
View file

@ -108,7 +108,7 @@ class Service():
"plex_online", "plex_serverStatus", "plex_onWake", "plex_online", "plex_serverStatus", "plex_onWake",
"plex_kodiScan", "plex_kodiScan",
"plex_shouldStop", "plex_dbScan", "plex_shouldStop", "plex_dbScan",
"plex_initialScan", "plex_customplayqueue", "plex_playbackProps", "plex_initialScan", "plex_customplayqueue",
"pms_token", "plex_token", "pms_token", "plex_token",
"pms_server", "plex_machineIdentifier", "plex_servername", "pms_server", "plex_machineIdentifier", "plex_servername",
"plex_authenticated", "PlexUserImage", "useDirectPaths", "plex_authenticated", "PlexUserImage", "useDirectPaths",