Doublecheck prev file watched on playlist advance, etc

Author: Et0h

syncplay/client.py

@@ -259,6 +259,10 @@ def updatePlayerStatus(self, paused, position):
                 self._tryMovePendingWatchedFiles()
             except Exception:
                 pass
+        self.currentlyPlayingFilename = self.userlist.currentUser.file["name"] if self.userlist.currentUser.file else None
+        playingCurrentIndex = not self.playlist._notPlayingCurrentIndex()
+        if playingCurrentIndex:
+            self.playlist.recordPlayedNearEOF(paused, position)
         if self._lastGlobalUpdate:
             self._lastPlayerUpdate = time.time()
             if (pauseChange or seeked) and self._protocol:
@@ -534,10 +538,16 @@ def getGlobalPaused(self):
             return True
         return self._globalPaused
 
-    def markWatchedFilePendingMove(self):
+    def markWatchedFilePendingMove(self, oldFilePath=None):
+        self.playlist.lastNearEOFName = None
+        self.playlist.lastNearEOFPath = None
+
         try:
-            currentFile = self.userlist.currentUser.file if self.userlist and self.userlist.currentUser else None
-            currentFilePath = currentFile.get("path") if currentFile else None
+            if oldFilePath:
+                currentFilePath = oldFilePath
+            else:
+                currentFile = self.userlist.currentUser.file if self.userlist and self.userlist.currentUser else None
+                currentFilePath = currentFile.get("path") if currentFile else None
             if currentFilePath and not utils.isURL(currentFilePath) and currentFilePath not in self._pendingWatchedMoves:
                 self._pendingWatchedMoves.append(currentFilePath)
                 self.ui.showDebugMessage("Marked for watched move: {}".format(currentFilePath))
@@ -645,6 +655,7 @@ def updateFile(self, filename, duration, path):
         self.userlist.currentUser.setFile(filename, duration, size, path)
         self.sendFile()
         self.playlist.changeToPlaylistIndexFromFilename(filename)
+        self.playlist.doubleCheckForWatchedPreviousFile()
 
     def setTrustedDomains(self, newTrustedDomains):
         from syncplay.ui.ConfigurationGetter import ConfigurationGetter
@@ -727,16 +738,19 @@ def openFile(self, filePath, resetPosition=False, fromUser=False):
             self.establishRewindDoubleCheck()
             self.lastRewindTime = time.time()
             self.autoplayCheck()
+        self.playlist.doubleCheckForWatchedPreviousFile()
 
     def fileSwitchFoundFiles(self):
         self.ui.fileSwitchFoundFiles()
         self.playlist.loadCurrentPlaylistIndex()
 
     def setPlaylistIndex(self, index):
         self._protocol.setPlaylistIndex(index)
+        self.playlist.doubleCheckForWatchedPreviousFile()
 
     def changeToPlaylistIndex(self, *args, **kwargs):
         self.playlist.changeToPlaylistIndex(*args, **kwargs)
+        self.playlist.doubleCheckForWatchedPreviousFile()
 
     def loopSingleFiles(self):
         return self._config["loopSingleFiles"] or self.isPlayingMusic()
@@ -1879,6 +1893,10 @@ def __init__(self, client):
         self.addedChangeListCallback = False
         self.switchToNewPlaylistItem = False
         self._lastPlaylistIndexChange = time.time()
+        self.lastNearEOFName = None
+        self.lastNearEOFPath = None
+        self.lastNearEOFFirstTime = 0.0
+        self.lastNearEOFLastTime = 0.0
 
     def needsSharedPlaylistsEnabled(f):  # @NoSelf
         @wraps(f)
@@ -2000,6 +2018,7 @@ def changeToPlaylistIndex(self, index, username=None, resetPosition=False):
                     self._client._protocol.sendMessage({"State": state})
                     self._playerPaused = True
                     self._client.autoplayCheck()
+                    self.doubleCheckForWatchedPreviousFile()
         elif index is not None:
             filename = self._playlist[index]
             self._ui.setPlaylistIndexFilename(filename)
@@ -2150,6 +2169,7 @@ def changePlaylist(self, files, username=None, resetIndex=False):
         else:
             self._ui.setPlaylist(self._playlist)
             self._ui.showMessage(getMessage("playlist-contents-changed-notification").format(username))
+        self.doubleCheckForWatchedPreviousFile()
 
     def addToPlaylist(self, file):
         self.changePlaylist([*self._playlist, file])
@@ -2207,6 +2227,48 @@ def advancePlaylistCheck(self):
             self._client.markWatchedFilePendingMove()
             self.loadNextFileInPlaylist()
 
+    @needsSharedPlaylistsEnabled
+    def recordPlayedNearEOF(self, paused, position):
+        if not self._client.userlist.currentUser.file:
+            return
+        if position == None:
+            return
+        currentLength = self._client.userlist.currentUser.file["duration"] if self._client.userlist.currentUser.file else 0
+        isPlaying = paused is False
+        remainingTime = currentLength - position
+
+        if (
+            isPlaying and
+            remainingTime < constants.PLAYLIST_NEAR_EOF_WINDOW and
+            currentLength > (constants.PLAYLIST_NEAR_EOF_WINDOW * 2) and  # The EOF window must represent at least the last half of the video to avoid misdetection when playing start of a short file
+            currentLength > constants.PLAYLIST_LOAD_NEXT_FILE_MINIMUM_LENGTH and
+            self.notJustChangedPlaylist()
+        ):
+            now_monotime = time.monotonic()
+            if self.lastNearEOFName != self._client.userlist.currentUser.file['name']:
+                self.lastNearEOFName = self._client.userlist.currentUser.file['name']
+                self.lastNearEOFPath = self._client.userlist.currentUser.file['path']
+                self.lastNearEOFFirstTime = now_monotime
+            self.lastNearEOFLastTime = now_monotime
+
+    @needsSharedPlaylistsEnabled
+    def doubleCheckForWatchedPreviousFile(self):
+        if not self.lastNearEOFName or not self.lastNearEOFPath:
+            return False
+
+        if self._playingSpecificFilename(self.lastNearEOFName):
+            return False
+
+        now_monotime = time.monotonic()
+        dwell = max(0.0, self.lastNearEOFLastTime - self.lastNearEOFFirstTime)
+        if dwell < constants.PLAYLIST_NEAR_EOF_MIN_DWELL:
+            return False
+
+        age = now_monotime - self.lastNearEOFLastTime
+        if age > constants.PLAYLIST_NEAR_EOF_LATCH_TTL:
+            return False
+        self._client.markWatchedFilePendingMove(self.lastNearEOFPath)
+
     def notJustChangedPlaylist(self):
         secondsSinceLastChange = time.time() - self._lastPlaylistIndexChange
         return secondsSinceLastChange > constants.PLAYLIST_LOAD_NEXT_FILE_TIME_FROM_END_THRESHOLD
@@ -2246,6 +2308,12 @@ def _notPlayingCurrentIndex(self):
             self._ui.showDebugMessage("Not playing current index - Filename mismatch or no file")
             return True
 
+    def _playingSpecificFilename(self, filenameToCompare):
+        if self._client.userlist.currentUser.file:
+            return self._client.userlist.currentUser.file['name'] == filenameToCompare
+        else:
+            return False
+
     def _thereIsNextPlaylistIndex(self):
         if self._playlistIndex is None:
             return False
@@ -2324,6 +2392,7 @@ def checkForFileSwitchUpdate(self):
         if self.directorySearchError:
             self._client.ui.showErrorMessage(self.directorySearchError)
             self.directorySearchError = None
+        self._client.playlist.doubleCheckForWatchedPreviousFile()
 
     def updateInfo(self):
         if not self.currentlyUpdating and self.mediaDirectories:

syncplay/constants.py

@@ -45,6 +45,9 @@ def getValueForOS(constantDict):
     ['syncplay.pl:8999 (France)', 'syncplay.pl:8999']]
 PLAYLIST_LOAD_NEXT_FILE_MINIMUM_LENGTH = 10  # Seconds
 PLAYLIST_LOAD_NEXT_FILE_TIME_FROM_END_THRESHOLD = 5  # Seconds (only triggered if file is paused, e.g. due to EOF)
+PLAYLIST_NEAR_EOF_WINDOW = 270  # seconds
+PLAYLIST_NEAR_EOF_MIN_DWELL = 120  # seconds
+PLAYLIST_NEAR_EOF_LATCH_TTL = 60  # seconds
 EXECUTABLE_COMBOBOX_MINIMUM_LENGTH = 30 # Minimum number of characters that the combobox will make visible
 
 # Overriden by config