From 4dbf57e62626f24cb174319e65eec9e7d6060e68 Mon Sep 17 00:00:00 2001
From: et0h <etoh@syncplay.pl>
Date: Sun, 17 May 2020 19:41:36 +0100
Subject: [PATCH] Fix seamless playlist advancement for music (#302)

---
 syncplay/client.py      | 25 ++++++++++++++++++-------
 syncplay/constants.py   |  2 +-
 syncplay/players/mpv.py |  5 -----
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/syncplay/client.py b/syncplay/client.py
index 813f65c..af0158f 100755
--- a/syncplay/client.py
+++ b/syncplay/client.py
@@ -76,6 +76,7 @@ class SyncplayClient(object):
         self.serverFeatures = {}
 
         self.lastRewindTime = None
+        self.lastAdvanceTime = None
         self.lastLeftTime = 0
         self.lastPausedOnLeaveTime = None
         self.lastLeftUser = ""
@@ -206,6 +207,9 @@ class SyncplayClient(object):
                 if self.userlist.currentUser.file['name'].lower().endswith(musicFormat):
                     return True
 
+    def seamlessMusicOveride(self):
+        return self.isPlayingMusic() and self._recentlyAdvanced()
+
     def updatePlayerStatus(self, paused, position):
         position -= self.getUserOffset()
         pauseChange, seeked = self._determinePlayerStateChange(paused, position)
@@ -230,9 +234,7 @@ class SyncplayClient(object):
 
         if self._lastGlobalUpdate:
             self._lastPlayerUpdate = time.time()
-            if seeked and not pauseChange and self.isPlayingMusic() and abs(positionBeforeSeek - currentLength) < constants.PLAYLIST_LOAD_NEXT_FILE_TIME_FROM_END_THRESHOLD and self.playlist.notJustChangedPlaylist():
-                self.playlist.loadNextFileInPlaylist()
-            elif (pauseChange or seeked) and self._protocol:
+            if (pauseChange or seeked) and self._protocol:
                 if seeked:
                     self.playerPositionBeforeLastSeek = self.getGlobalPosition()
                 self._protocol.sendState(self.getPlayerPosition(), self.getPlayerPaused(), seeked, None, True)
@@ -240,13 +242,16 @@ class SyncplayClient(object):
     def prepareToAdvancePlaylist(self):
         if self.playlist.canSwitchToNextPlaylistIndex():
             self.ui.showDebugMessage("Preparing to advance playlist...")
-            if self.isPlayingMusic():
-                self._protocol.sendState(0, False, True, None, True)
-            else:
-                self._protocol.sendState(0, True, True, None, True)
+            self.lastAdvanceTime = time.time()
+            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 _recentlyAdvanced(self):
+        lastAdvandedDiff = time.time() - self.lastAdvanceTime if self.lastAdvanceTime else None
+        if lastAdvandedDiff is not None and lastAdvandedDiff < constants.LAST_PAUSED_DIFF_THRESHOLD:
+            return True
+
     def _toggleReady(self, pauseChange, paused):
         if not self.userlist.currentUser.canControl():
             self._player.setPaused(self._globalPaused)
@@ -257,6 +262,10 @@ class SyncplayClient(object):
                 self.ui.showMessage(getMessage("set-as-not-ready-notification"))
             else:
                 self.ui.showMessage(getMessage("set-as-ready-notification"))
+        elif self.seamlessMusicOveride():
+            self.ui.showDebugMessage("Readiness toggle ignored due to seamless music override")
+            self._player.setPaused(paused)
+            self._playerPaused = paused
         elif not paused and not self.instaplayConditionsMet():
             paused = True
             self._player.setPaused(paused)
@@ -886,6 +895,8 @@ class SyncplayClient(object):
             return False
 
     def autoplayConditionsMet(self):
+        if self.seamlessMusicOveride():
+            self.setPaused(False)
         recentlyReset = (self.lastRewindTime is not None and abs(time.time() - self.lastRewindTime) < 10) and self._playerPosition < 3
         return (
             self._playerPaused and (self.autoPlay or recentlyReset) and
diff --git a/syncplay/constants.py b/syncplay/constants.py
index b0b59b2..3c35acc 100755
--- a/syncplay/constants.py
+++ b/syncplay/constants.py
@@ -238,7 +238,7 @@ MPLAYER_SLAVE_ARGS = ['-slave', '--hr-seek=always', '-nomsgcolor', '-msglevel',
 MPV_ARGS = {'force-window': 'yes',
             'idle': 'yes',
             'hr-seek': 'always',
-            'keep-open': 'yes',
+            'keep-open': 'always',
             'input-terminal': 'no',
             'term-playing-msg': '<SyncplayUpdateFile>\nANS_filename=${filename}\nANS_length=${=duration:${=length:0}}\nANS_path=${path}\n</SyncplayUpdateFile>',
             'keep-open-pause': 'yes'
diff --git a/syncplay/players/mpv.py b/syncplay/players/mpv.py
index f3fea5a..cc22d84 100755
--- a/syncplay/players/mpv.py
+++ b/syncplay/players/mpv.py
@@ -216,11 +216,6 @@ class MpvPlayer(BasePlayer):
         if value is None:
             self._client.ui.showDebugMessage("NONE TYPE POSITION!")
             return
-
-        if self._client.isPlayingMusic() and self._paused == False and self._position == value and abs(self._position-self._position) < 0.5:
-            self._client.ui.showDebugMessage("EOF DETECTED!")
-            self._position = 0
-            self.setPosition(0)
         self.lastMPVPositionUpdate = time.time()
         if self._recentlyReset():
             self._client.ui.showDebugMessage("Recently reset, so storing position as 0")