Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Improve undo playlist handling when room is changed

Browse Source
This commit is contained in:
Et0h 2015-10-15 16:40:32 +01:00
parent bf1825196c
commit 34f4509380
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
syncplay/client.py
View File

@ -115,6 +115,7 @@ class SyncplayClient(object):
self._playlist = [] self._playlist = []
self._previousPlaylist = None self._previousPlaylist = None
self._previousPlaylistRoom = None
self._playlistIndex = None self._playlistIndex = None
self.__playerReady = defer.Deferred() self.__playerReady = defer.Deferred()
@ -505,9 +506,10 @@ class SyncplayClient(object):
newIndex = files.index(filename) newIndex = files.index(filename)
except: except:
newIndex = 0 newIndex = 0
if self._previousPlaylist is None:
if self._playlist <> None and self._playlist <> []: if self._previousPlaylistRoom <> self.userlist.currentUser.room:
self._previousPlaylist = self._playlist self._previousPlaylist = None
self._previousPlaylistRoom = self.userlist.currentUser.room
elif self._previousPlaylist <> self._playlist and self._playlist <> files: elif self._previousPlaylist <> self._playlist and self._playlist <> files:
self._previousPlaylist = self._playlist self._previousPlaylist = self._playlist
self._playlist = files self._playlist = files
@ -570,7 +572,6 @@ class SyncplayClient(object):
return self.userlist.currentUser.username return self.userlist.currentUser.username
def setRoom(self, roomName, resetAutoplay=False): def setRoom(self, roomName, resetAutoplay=False):
self._previousPlaylist = None
self.userlist.currentUser.room = roomName self.userlist.currentUser.room = roomName
if resetAutoplay: if resetAutoplay:
self.resetAutoPlayState() self.resetAutoPlayState()