Improve the code some more

Author: Et0h

syncplay/client.py

@@ -596,6 +596,9 @@ def _tryMovePendingWatchedFiles(self):
                 if not os.path.exists(pendingWatchedMove):
                     self._pendingWatchedMoves.remove(pendingWatchedMove)
                     continue
+                if not utils.canMarkAsWatched(pendingWatchedMove):
+                    self._pendingWatchedMoves.remove(pendingWatchedMove)
+                    continue
                 originalDir = os.path.dirname(pendingWatchedMove)
                 watchedDir = utils.getWatchedSubfolder(originalDir)
                 utils.createWatchedSubdirIfNeeded(watchedDir)

syncplay/resources/no_eye.png

@@ -555,7 +555,10 @@ def getCorrectedPathForFile(filePath):
         correctedDirectory = getCorrectedDirectoryForFile(filePath)
         filename = os.path.basename(filePath)
         correctedPath = os.path.join(correctedDirectory, filename)
-        return correctedPath
+        if os.path.isfile(correctedPath):
+            return correctedPath
+        else:
+            return filePath
 
 def isWatchedSubfolder(directoryPath):
     if not directoryPath: