RepoMirrors/syncplay
1
0
Fork 0
mirror of https://github.com/Syncplay/syncplay synced 2025-02-21 13:36:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't prepare to advance playlist if playlist can't be advanced

Browse Source
This commit is contained in:
Et0h 2016-10-19 00:23:08 +01:00
parent 7f0ffb90d2
commit 7fe7639c56
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
syncplay/client.py
View File

@ -214,8 +214,11 @@ class SyncplayClient(object):
self._protocol.sendState(self.getPlayerPosition(), self.getPlayerPaused(), seeked, None, True)
def prepareToAdvancePlaylist(self):
self.ui.showDebugMessage("Preparing to advance playlist...")
self._protocol.sendState(0, True, True, None, True)
if self.playlist.canSwitchToNextPlaylistIndex():
self.ui.showDebugMessage("Preparing to advance playlist...")
self._protocol.sendState(0, True, True, None, True)
else:
self.ui.showDebugMessage("Not preparing to advance playlist because the next file cannot be switched to")
def _toggleReady(self, pauseChange, paused):
if not self.userlist.currentUser.canControl():
@ -1428,6 +1431,22 @@ class SyncplayPlaylist():
self._ui.showMessage(getMessage("playlist-selection-changed-notification").format(username))
self.switchToNewPlaylistIndex(index)
def canSwitchToNextPlaylistIndex(self):
if self._thereIsNextPlaylistIndex() and self._client.sharedPlaylistIsEnabled():
try:
index = self._nextPlaylistIndex()
if index is None:
return False
filename = self._playlist[index]
if utils.isURL(filename):
return True if self._client.isURITrusted(filename) else False
else:
path = self._client.fileSwitch.findFilepath(filename, highPriority=True)
return True if path else False
except:
return False
return False
@needsSharedPlaylistsEnabled
def switchToNewPlaylistIndex(self, index, resetPosition=False):
self._lastPlaylistIndexChange = time.time()