eric: comparison src/eric7/MicroPython/MicroPythonFileManager.py

-:57496966803c
+:6378da868bb0
 createDirectoryDone = pyqtSignal()
 fsinfoDone = pyqtSignal(tuple)
 error = pyqtSignal(str, str)
-def __init__(self, commandsInterface, parent=None):
+def __init__(self, device, parent=None):
 """
 Constructor
-@param commandsInterface reference to the commands interface object
+@param device MicroPython device object
-@type MicroPythonCommandsInterface
+@type BaseDevice
 @param parent reference to the parent object
 @type QObject
 """
 super().__init__(parent)
-self.__commandsInterface = commandsInterface
+self.__device = device
 @pyqtSlot(str)
 def lls(self, dirname, showHidden=False):
 """
 Public slot to get a long listing of the given directory.
 @type str
 @param showHidden flag indicating to show hidden files as well
 @type bool
 """
 try:
-filesList = self.__commandsInterface.lls(dirname, showHidden=showHidden)
+filesList = self.__device.lls(dirname, showHidden=showHidden)
 result = [
 (
 decoratedName(name, mode),
 mode2string(mode),
 str(size),
 def pwd(self):
 """
 Public slot to get the current directory of the device.
 """
 try:
-pwd = self.__commandsInterface.pwd()
+pwd = self.__device.pwd()
 self.currentDir.emit(pwd)
 except Exception as exc:
 self.error.emit("pwd", str(exc))
 @pyqtSlot(str)
 @param dirname name of the desired current directory
 @type str
 """
 try:
-self.__commandsInterface.cd(dirname)
+self.__device.cd(dirname)
 self.currentDirChanged.emit(dirname)
 except Exception as exc:
 self.error.emit("cd", str(exc))
 @pyqtSlot(str)
 """
 if hostFileName and os.path.isdir(hostFileName):
 # only a local directory was given
 hostFileName = os.path.join(hostFileName, os.path.basename(deviceFileName))
 try:
-self.__commandsInterface.get(deviceFileName, hostFileName)
+self.__device.get(deviceFileName, hostFileName)
 self.getFileDone.emit(deviceFileName, hostFileName)
 except Exception as exc:
 self.error.emit("get", str(exc))
 def getData(self, deviceFileName):
 @type str
 @return data read from the device
 @rtype bytes
 """
 try:
-data = self.__commandsInterface.getData(deviceFileName)
+data = self.__device.getData(deviceFileName)
 return data
 except Exception as exc:
 self.error.emit("getData", str(exc))
 return b""
 @type str
 @param deviceFileName name of the file on the connected device
 @type str
 """
 try:
-self.__commandsInterface.put(hostFileName, deviceFileName)
+self.__device.put(hostFileName, deviceFileName)
 self.putFileDone.emit(hostFileName, deviceFileName)
 except Exception as exc:
 self.error.emit("put", str(exc))
 def putData(self, deviceFileName, data):
 """
 Public method to write data to the connected device.
 @param deviceFileName name of the file to write to
 @type str
-@param content data to write
+@param data data to write
 @type bytes
 """
 try:
-self.__commandsInterface.putData(deviceFileName, data)
+self.__device.putData(deviceFileName, data)
 self.putDataDone.emit(deviceFileName)
 except Exception as exc:
 self.error.emit("putData", str(exc))
 @pyqtSlot(str)
 @param deviceFileName name of the file on the connected device
 @type str
 """
 try:
-self.__commandsInterface.rm(deviceFileName)
+self.__device.rm(deviceFileName)
 self.deleteFileDone.emit(deviceFileName)
 except Exception as exc:
 self.error.emit("delete", str(exc))
 def __rsync(
 destinationFiles = listdirStat(deviceDirectory)
 for name, nstat in destinationFiles:
 destinationDict[name] = nstat
 else:
 try:
-destinationFiles = self.__commandsInterface.lls(
+destinationFiles = self.__device.lls(deviceDirectory, fullstat=True)
-deviceDirectory, fullstat=True
-)
 except Exception as exc:
 return [str(exc)]
 if destinationFiles is None:
 # the destination directory does not exist
 try:
-self.__commandsInterface.mkdir(deviceDirectory)
+self.__device.mkdir(deviceDirectory)
 except Exception as exc:
 return [str(exc)]
 else:
 for name, nstat in destinationFiles:
 destinationDict[name] = nstat
 self.rsyncProgressMessage.emit(
 self.tr("{1}Adding <b>{0}</b>...").format(destFilename, indentStr)
 )
 if os.path.isfile(sourceFilename):
 try:
-self.__commandsInterface.put(sourceFilename, destFilename)
+self.__device.put(sourceFilename, destFilename)
 except Exception as exc:
 # just note issues but ignore them otherwise
 errors.append(str(exc))
 elif os.path.isdir(sourceFilename):
 # recurse
 self.tr("{1}Removing <b>{0}</b>...").format(
 destFilename, indentStr
 )
 )
 try:
-self.__commandsInterface.rmrf(
+self.__device.rmrf(destFilename, recursive=True, force=True)
-destFilename, recursive=True, force=True
-)
 except Exception as exc:
 # just note issues but ignore them otherwise
 errors.append(str(exc))
 for sourceBasename in toUpdate:
 self.tr("{1}Updating <b>{0}</b>...").format(
 destFilename, indentStr
 )
 )
 try:
-self.__commandsInterface.put(
+self.__device.put(sourceFilename, destFilename)
-sourceFilename, destFilename
-)
 except Exception as exc:
 errors.append(str(exc))
 self.rsyncProgressMessage.emit(doneMessage)
 @param dirname name of the directory to create
 @type str
 """
 try:
-self.__commandsInterface.mkdir(dirname)
+self.__device.mkdir(dirname)
 self.createDirectoryDone.emit()
 except Exception as exc:
 self.error.emit("mkdir", str(exc))
 @pyqtSlot(str)
 @param recursive flag indicating a recursive removal
 @type bool
 """
 try:
 if recursive:
-self.__commandsInterface.rmrf(dirname, recursive=True, force=True)
+self.__device.rmrf(dirname, recursive=True, force=True)
 else:
-self.__commandsInterface.rmdir(dirname)
+self.__device.rmdir(dirname)
 self.removeDirectoryDone.emit()
 except Exception as exc:
 self.error.emit("rmdir", str(exc))
 def fileSystemInfo(self):
 """
 Public method to obtain information about the currently mounted file
 systems.
 """
 try:
-fsinfo = self.__commandsInterface.fileSystemInfo()
+fsinfo = self.__device.fileSystemInfo()
 self.fsinfoDone.emit(fsinfo)
 except Exception as exc:
 self.error.emit("fileSystemInfo", str(exc))

Mercurial Repositories > eric / file comparison

comparison: src/eric7/MicroPython/MicroPythonFileManager.py

src/eric7/MicroPython/MicroPythonFileManager.py