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

Don't warn of being alone if only just connected

Browse Source
This commit is contained in:
et0h 2020-05-17 19:55:51 +01:00
parent 4dbf57e626
commit fea3432dd5
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
syncplay/client.py
View File

@ -77,6 +77,7 @@ class SyncplayClient(object):
self.lastRewindTime = None self.lastRewindTime = None
self.lastAdvanceTime = None self.lastAdvanceTime = None
self.lastConnectTime = None
self.lastLeftTime = 0 self.lastLeftTime = 0
self.lastPausedOnLeaveTime = None self.lastPausedOnLeaveTime = None
self.lastLeftUser = "" self.lastLeftUser = ""
@ -252,6 +253,11 @@ class SyncplayClient(object):
if lastAdvandedDiff is not None and lastAdvandedDiff < constants.LAST_PAUSED_DIFF_THRESHOLD: if lastAdvandedDiff is not None and lastAdvandedDiff < constants.LAST_PAUSED_DIFF_THRESHOLD:
return True return True
def recentlyConnected(self):
connectDiff = time.time() - self.lastConnectTime if self.lastConnectTime else None
if connectDiff is None or connectDiff < constants.LAST_PAUSED_DIFF_THRESHOLD:
return True
def _toggleReady(self, pauseChange, paused): def _toggleReady(self, pauseChange, paused):
if not self.userlist.currentUser.canControl(): if not self.userlist.currentUser.canControl():
self._player.setPaused(self._globalPaused) self._player.setPaused(self._globalPaused)
@ -691,6 +697,7 @@ class SyncplayClient(object):
return sharedPlaylistEnabled return sharedPlaylistEnabled
def connected(self): def connected(self):
self.lastConnectTime = time.time()
readyState = self._config['readyAtStart'] if self.userlist.currentUser.isReady() is None else self.userlist.currentUser.isReady() readyState = self._config['readyAtStart'] if self.userlist.currentUser.isReady() is None else self.userlist.currentUser.isReady()
self._protocol.setReady(readyState, manuallyInitiated=False) self._protocol.setReady(readyState, manuallyInitiated=False)
self.reIdentifyAsController() self.reIdentifyAsController()
@ -1414,6 +1421,8 @@ class SyncplayUserlist(object):
return True return True
def areYouAloneInRoom(self): def areYouAloneInRoom(self):
if self._client.recentlyConnected():
return False
for user in self._users.values(): for user in self._users.values():
if user.room == self.currentUser.room: if user.room == self.currentUser.room:
return False return False