Sun, 10 Mar 2024 16:39:54 +0100
Added the file size warning in the editor for remote files and removed some obsolete TODO markers.
--- a/src/eric7/Debugger/DebuggerInterfacePython.py Sun Mar 10 16:15:14 2024 +0100 +++ b/src/eric7/Debugger/DebuggerInterfacePython.py Sun Mar 10 16:39:54 2024 +0100 @@ -615,7 +615,6 @@ # remote shell command is missing return None, self.__isNetworked, "" - # TODO: add server debugging for projects elif startRemote and self.__ericServerDebuggerInterface is not None: # debugging via an eric-ide server self.translate = self.__ericServerTranslation
--- a/src/eric7/Project/Project.py Sun Mar 10 16:15:14 2024 +0100 +++ b/src/eric7/Project/Project.py Sun Mar 10 16:39:54 2024 +0100 @@ -4031,7 +4031,6 @@ self.ui.taskViewer.clearProjectTasks() self.ui.taskViewer.setProjectOpen(False) - # TODO: clear the file system cache for ppath if remote project if FileSystemUtilities.isRemoteFileName(self.ppath): self.__remotefsInterface.removeFromFsCache(self.ppath)
--- a/src/eric7/QScintilla/Editor.py Sun Mar 10 16:15:14 2024 +0100 +++ b/src/eric7/QScintilla/Editor.py Sun Mar 10 16:39:54 2024 +0100 @@ -449,11 +449,17 @@ if not Utilities.MimeTypes.isTextFile(self.fileName): raise OSError() - if ( - FileSystemUtilities.isPlainFileName(self.fileName) - and pathlib.Path(self.fileName).exists() - ): + if FileSystemUtilities.isRemoteFileName(self.fileName): + fileIsRemote = True + fileExists = self.__remotefsInterface.exists(self.fileName) + fileSizeKB = self.__remotefsInterface.stat( + self.fileName, ["st_size"] + )["st_size"] // 1024 + else: + fileIsRemote = False + fileExists = pathlib.Path(self.fileName).exists() fileSizeKB = pathlib.Path(self.fileName).stat().st_size // 1024 + if fileExists: if fileSizeKB > Preferences.getEditor("RejectFilesize"): EricMessageBox.warning( None, @@ -483,10 +489,7 @@ if not res: raise OSError() - self.readFile(self.fileName, createIt=True) - - elif FileSystemUtilities.isRemoteFileName(self.fileName): - self.readFile(self.fileName, createIt=True, isRemote=True) + self.readFile(self.fileName, createIt=True, isRemote=fileIsRemote) self.__bindLexer(self.fileName) self.__bindCompleter(self.fileName)
--- a/src/eric7/RemoteServerInterface/EricServerDebuggerInterface.py Sun Mar 10 16:15:14 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerDebuggerInterface.py Sun Mar 10 16:39:54 2024 +0100 @@ -15,7 +15,6 @@ from eric7.SystemUtilities import FileSystemUtilities -# TODO: sanitize all file names with FileSystemUtilities.plainFileName() class EricServerDebuggerInterface(QObject): """ Class implementing the file system interface to the eric-ide server.
--- a/src/eric7/RemoteServerInterface/EricServerFileSystemInterface.py Sun Mar 10 16:15:14 2024 +0100 +++ b/src/eric7/RemoteServerInterface/EricServerFileSystemInterface.py Sun Mar 10 16:39:54 2024 +0100 @@ -1392,7 +1392,6 @@ ## Remote file system cache methods. ####################################################################### - # TODO: change cache when file renamed/moved/deleted/... def populateFsCache(self, directory): """ Public method to populate the remote file system cache for a given directory.