Mercurial Repositories > eric / file diff

diff -r c4f503f40caf -r 622e59b51640 src/eric7/RemoteServerInterface/EricServerFileSystemInterface.py
--- a/src/eric7/RemoteServerInterface/EricServerFileSystemInterface.py	Wed Feb 14 10:24:23 2024 +0100
+++ b/src/eric7/RemoteServerInterface/EricServerFileSystemInterface.py	Thu Feb 15 13:59:02 2024 +0100
@@ -13,6 +13,7 @@
 from PyQt6.QtCore import QEventLoop, QObject
 
 from eric7.RemoteServer.EricRequestCategory import EricRequestCategory
+from eric7.SystemUtilities import FileSystemUtilities
 
 
 # TODO: sanitize all file names with FileSystemUtilities.plainFileName()
@@ -100,7 +101,7 @@
         self.__serverInterface.sendJson(
             category=EricRequestCategory.FileSystem,
             request="Chdir",
-            params={"directory": directory},
+            params={"directory": FileSystemUtilities.plainFileName(directory)},
             callback=callback,
         )
 
@@ -155,7 +156,7 @@
         self.__serverInterface.sendJson(
             category=EricRequestCategory.FileSystem,
             request="Listdir",
-            params={"directory": directory},
+            params={"directory": FileSystemUtilities.plainFileName(directory)},
             callback=callback,
         )
 
@@ -204,7 +205,10 @@
         self.__serverInterface.sendJson(
             category=EricRequestCategory.FileSystem,
             request="Stat",
-            params={"filename": filename, "st_names": stNames},
+            params={
+                "filename": FileSystemUtilities.plainFileName(filename),
+                "st_names": stNames,
+            },
             callback=callback,
         )
 
@@ -244,7 +248,7 @@
         self.__serverInterface.sendJson(
             category=EricRequestCategory.FileSystem,
             request="Exists",
-            params={"name": name},
+            params={"name": FileSystemUtilities.plainFileName(name)},
             callback=callback,
         )
 
@@ -295,7 +299,7 @@
         self.__serverInterface.sendJson(
             category=EricRequestCategory.FileSystem,
             request="Access",
-            params={"name": name, "modes": modes},
+            params={"name": FileSystemUtilities.plainFileName(name), "modes": modes},
             callback=callback,
         )
 
@@ -335,7 +339,7 @@
         self.__serverInterface.sendJson(
             category=EricRequestCategory.FileSystem,
             request="Mkdir",
-            params={"directory": directory},
+            params={"directory": FileSystemUtilities.plainFileName(directory)},
             callback=callback,
         )
 
@@ -375,7 +379,7 @@
         self.__serverInterface.sendJson(
             category=EricRequestCategory.FileSystem,
             request="Rmdir",
-            params={"directory": directory},
+            params={"directory": FileSystemUtilities.plainFileName(directory)},
             callback=callback,
         )
 
@@ -417,7 +421,10 @@
         self.__serverInterface.sendJson(
             category=EricRequestCategory.FileSystem,
             request="Replace",
-            params={"old_name": oldName, "new_name": newName},
+            params={
+                "old_name": FileSystemUtilities.plainFileName(oldName),
+                "new_name": FileSystemUtilities.plainFileName(newName),
+            },
             callback=callback,
         )
 
@@ -457,7 +464,7 @@
         self.__serverInterface.sendJson(
             category=EricRequestCategory.FileSystem,
             request="Remove",
-            params={"filename": filename},
+            params={"filename": FileSystemUtilities.plainFileName(filename)},
             callback=callback,
         )
 
@@ -510,7 +517,10 @@
         self.__serverInterface.sendJson(
             category=EricRequestCategory.FileSystem,
             request="ReadFile",
-            params={"filename": filename, "create": create},
+            params={
+                "filename": FileSystemUtilities.plainFileName(filename),
+                "create": create,
+            },
             callback=callback,
         )
 
@@ -558,7 +568,7 @@
             category=EricRequestCategory.FileSystem,
             request="WriteFile",
             params={
-                "filename": filename,
+                "filename": FileSystemUtilities.plainFileName(filename),
                 "filedata": str(base64.b85encode(data), encoding="ascii"),
                 "with_backup": withBackup,
             },