Improve the code

Author: Et0h

syncplay/client.py

@@ -556,11 +556,11 @@ def userInitiatedMarkWatched(self, fileSourcePath):
             watchedDirectoryFilepath = os.path.join(watchedDirectory, filename)
             watchedDirectoryName = os.path.basename(os.path.dirname(watchedDirectoryFilepath))
             if os.path.isfile(watchedDirectoryFilepath):
-                self.ui.showErrorMessage("A file with the same name already exists in '{}' subfolder.".format(watchedDirectoryName)) # TODO: Move to Language
+                self.ui.showErrorMessage(getMessage("cannot-move-file-due-to-name-conflict-error").format(watchedDirectoryName)) # TODO: Move to Language
                 return
             utils.moveFile(fileSourcePath, watchedDirectoryFilepath)
             self.fileSwitch.updateInfo()
-            self.ui.showMessage("Moved file '{}' to '\{}\\'".format(fileSourcePath, watchedDirectoryName))
+            self.ui.showMessage(getMessage("moved-file-to-subfolder-notification").format(fileSourcePath, watchedDirectoryName))
         except Exception as e:
             self.ui.showErrorMessage("Could not mark as watched: {}".format(e)) # TODO: Move to language
 
@@ -579,7 +579,7 @@ def userInitiatedMarkUnwatched(self, fileSourcePath):
                 return
             utils.moveFile(fileSourcePath, unwatchedFilePath)
             self.fileSwitch.updateInfo()
-            self.ui.showMessage("Moved file '{}' to '\{}\\'".format(fileSourcePath, unwatchedDirectoryPathName))  # TODO: Move to Language
+            self.ui.showMessage(getMessage("moved-file-to-subfolder-notification").format(fileSourcePath, unwatchedDirectoryPathName))
         except Exception as e:
             self.ui.showErrorMessage("Could not mark as unwatched: {}".format(e)) # TODO: Move to Language
 
@@ -610,7 +610,7 @@ def _tryMovePendingWatchedFiles(self):
                 utils.moveFile(pendingWatchedMove, destFilepath)
                 self.fileSwitch.updateInfo()
                 try:
-                    self.ui.showMessage("Moved '{}' to '{}' sub-folder".format(pendingWatchedMove, constants.WATCHED_SUBFOLDER))
+                    self.ui.showMessage(getMessage("moved-file-to-subfolder-notification").format(pendingWatchedMove, constants.WATCHED_SUBFOLDER))
                     self._pendingWatchedMoves.remove(pendingWatchedMove)
                 except Exception:
                     pass

syncplay/ui/gui.py

@@ -18,7 +18,7 @@
 from syncplay.utils import resourcespath
 from syncplay.utils import isLinux, isWindows, isMacOS
 from syncplay.utils import formatTime, sameFilename, sameFilesize, sameFileduration, RoomPasswordProvider, formatSize, isURL
-from syncplay.utils import isWatchedFile, getWatchedSubfolder, getCorrectedDirectoryForFile, getCorrectedPathForFile, canMarkAsUnwatched
+from syncplay.utils import isWatchedFile, getCorrectedPathForFile, canMarkAsWatched
 from syncplay.vendor import Qt
 from syncplay.vendor.Qt import QtCore, QtWidgets, QtGui, __binding__, __binding_version__, __qt_version__, IsPySide, IsPySide2, IsPySide6
 from syncplay.vendor.Qt.QtCore import Qt, QSettings, QSize, QPoint, QUrl, QLine, QDateTime
@@ -754,10 +754,10 @@ def addSeenUnseenItems(pathFound, menu):
             filename = os.path.basename(pathFound)
             if len(constants.WATCHED_SUBFOLDER) > 0:
                 pathFound = getCorrectedPathForFile(pathFound)
-                if canMarkAsUnwatched(pathFound):
-                    menu.addAction(QtGui.QPixmap(resourcespath + "yes_eye.png"), getMessage("mark-as-watched-menu-label"), lambda p=pathFound: self._markFileWatchedViaContext(p))  # TODO: Move to language
-                elif isWatchedFile(pathFound):
+                if isWatchedFile(pathFound):
                     menu.addAction(QtGui.QPixmap(resourcespath + "no_eye.png"), getMessage("mark-as-unwatched-menu-label"), lambda p=pathFound: self._markFileUnwatchedViaContext(p))  # TODO: Move to language
+                elif canMarkAsWatched(pathFound):
+                    menu.addAction(QtGui.QPixmap(resourcespath + "yes_eye.png"), getMessage("mark-as-watched-menu-label"), lambda p=pathFound: self._markFileWatchedViaContext(p))  # TODO: Move to language
 
         indexes = self.playlist.selectedIndexes()
         if len(indexes) > 0:

syncplay/utils.py

@@ -506,15 +506,19 @@ def getListOfPublicServers():
             raise IOError(getMessage("failed-to-load-server-list-error"))
 
 def isWatchedFile(filePath):
+    if len(constants.WATCHED_SUBFOLDER) == 0:
+        return False
     directoryPath = getCorrectedDirectoryForFile(filePath)
     return isWatchedSubfolder(directoryPath) and os.path.exists(filePath)
 
-def canMarkAsUnwatched(filePath):
+def canMarkAsWatched(filePath):
+    if len(constants.WATCHED_SUBFOLDER) == 0:
+        return False
     directory = getCorrectedDirectoryForFile(filePath)
     if isWatchedSubfolder(directory):
         return False
     watchedDirectory = getWatchedSubfolder(directory)
-    return len(constants.WATCHED_SUBFOLDER) > 0 and ((watchedDirectory and os.path.isdir(watchedDirectory)) or constants.WATCHED_AUTOCREATESUBFOLDERS)
+    return bool((watchedDirectory and os.path.isdir(watchedDirectory)) or constants.WATCHED_AUTOCREATESUBFOLDERS)
 
 def getUnwatchedParentfolder(watchedDirectoryPath):
     if not watchedDirectoryPath: