eric: comparison eric6/MicroPython/MicroPythonFileSystem.py

-:217862c28319
+:3eddfc540614
 copied to the connected device
 @signal deleteFileDone(deviceFile) emitted after the file has been deleted
 on the connected device
 @signal rsyncDone(localName, deviceName) emitted after the rsync operation
 has been completed
-@signal rsyncMessages(list) emitted with a list of messages
 @signal rsyncProgressMessage(msg) emitted to send a message about what
 rsync is doing
 @signal removeDirectoryDone() emitted after a directory has been deleted
 @signal createDirectoryDone() emitted after a directory was created
 @signal synchTimeDone() emitted after the time was synchronizde to the
 currentDirChanged = pyqtSignal(str)
 getFileDone = pyqtSignal(str, str)
 putFileDone = pyqtSignal(str, str)
 deleteFileDone = pyqtSignal(str)
 rsyncDone = pyqtSignal(str, str)
-rsyncMessages = pyqtSignal(list)
 rsyncProgressMessage = pyqtSignal(str)
 removeDirectoryDone = pyqtSignal()
 createDirectoryDone = pyqtSignal()
 synchTimeDone = pyqtSignal()
 showTimeDone = pyqtSignal(str)
 @param deviceDirectory name of the directory on the device
 @type str
 @param mirror flag indicating to mirror the local directory to
 the device directory
 @type bool
-@return tuple containing a list of messages and list of errors
+@return list of errors
-@rtype tuple of (list of str, list of str)
+@rtype list of str
 """
-# TODO: get rid of messages and replace by rsyncProgressMessage signal
-messages = []
 errors = []
 if not os.path.isdir(hostDirectory):
-return ([], [self.tr(
+return [self.tr(
 "The given name '{0}' is not a directory or does not exist.")
 .format(hostDirectory)
-])
+]
+self.rsyncProgressMessage.emit(
+self.tr("Synchronizing <b>{0}</b>.").format(deviceDirectory)
+)
 sourceDict = {}
 sourceFiles = listdirStat(hostDirectory)
 for name, nstat in sourceFiles:
 sourceDict[name] = nstat
 destinationDict = {}
 try:
 destinationFiles = self.__fs.lls(deviceDirectory, fullstat=True)
 except Exception as exc:
-return ([], [str(exc)])
+return [str(exc)]
 if destinationFiles is None:
 # the destination directory does not exist
 try:
 self.__fs.mkdir(deviceDirectory)
 except Exception as exc:
-return ([], [str(exc)])
+return [str(exc)]
 else:
 for name, nstat in destinationFiles:
 destinationDict[name] = nstat
 destinationSet = set(destinationDict.keys())
 for sourceBasename in toAdd:
 # name exists in source but not in device
 sourceFilename = os.path.join(hostDirectory, sourceBasename)
 destFilename = deviceDirectory + "/" + sourceBasename
+self.rsyncProgressMessage.emit(
+self.tr("Adding <b>{0}</b>...").format(destFilename))
 if os.path.isfile(sourceFilename):
 try:
 self.__fs.put(sourceFilename, destFilename)
 except Exception as exc:
-messages.append(str(exc))
+# just note issues but ignore them otherwise
+errors.append(str(exc))
 if os.path.isdir(sourceFilename):
 # recurse
-msg, err = self.__rsync(sourceFilename, destFilename,
+errs = self.__rsync(sourceFilename, destFilename,
 mirror=mirror)
-messages.extend(msg)
+# just note issues but ignore them otherwise
-errors.extend(err)
+errors.extend(errs)
 if mirror:
 for destBasename in toDelete:
 # name exists in device but not local, delete
 destFilename = deviceDirectory + "/" + destBasename
+self.rsyncProgressMessage.emit(
+self.tr("Removing <b>{0}</b>...").format(destFilename))
 try:
 self.__fs.rmrf(destFilename, recursive=True, force=True)
 except Exception as exc:
-# ignore errors here
+# just note issues but ignore them otherwise
-messages.append(str(exc))
+errors.append(str(exc))
 for sourceBasename in toUpdate:
 # names exist in both; do an update
 sourceStat = sourceDict[sourceBasename]
 destStat = destinationDict[sourceBasename]
 sourceFilename = os.path.join(hostDirectory, sourceBasename)
 destFilename = deviceDirectory + "/" + sourceBasename
 destMode = destStat[0]
 if os.path.isdir(sourceFilename):
 if stat.S_ISDIR(destMode):
-# both are directories => recurse
+# both are directories => recurs
-msg, err = self.__rsync(sourceFilename, destFilename,
+errs = self.__rsync(sourceFilename, destFilename,
 mirror=mirror)
-messages.extend(msg)
+# just note issues but ignore them otherwise
-errors.extend(err)
+errors.extend(errs)
 else:
-messages.append(self.tr(
+self.rsyncProgressMessage.emit(
-"Source '{0}' is a directory and destination '{1}'"
+self.tr("Source <b>{0}</b> is a directory and"
-" is a file. Ignoring it."
+" destination <b>{1}</b> is a file. Ignoring"
-).format(sourceFilename, destFilename))
+" it.")
+.format(sourceFilename, destFilename)
+)
 else:
 if stat.S_ISDIR(destMode):
-messages.append(self.tr(
+self.rsyncProgressMessage.emit(
-"Source '{0}' is a file and destination '{1}' is"
+self.tr("Source <b>{0}</b> is a file and destination"
-" a directory. Ignoring it."
+" <b>{1}</b> is a directory. Ignoring it.")
-).format(sourceFilename, destFilename))
+.format(sourceFilename, destFilename)
+)
 else:
 if sourceStat[8] > destStat[8]:     # mtime
-messages.append(self.tr(
+self.rsyncProgressMessage.emit(
-"'{0}' is newer than '{1}' - copying"
+self.tr("Updating <b>{0}</b>...")
-).format(sourceFilename, destFilename))
+.format(destFilename)
+)
 try:
 self.__fs.put(sourceFilename, destFilename)
 except Exception as exc:
-messages.append(str(exc))
+errors.append(str(exc))
-return messages, errors
+self.rsyncProgressMessage.emit(
+self.tr("Done synchronizing <b>{0}</b>.").format(deviceDirectory)
+)
+return errors
 @pyqtSlot(str, str)
 @pyqtSlot(str, str, bool)
 def rsync(self, hostDirectory, deviceDirectory, mirror=True):
 """
 @type str
 @param mirror flag indicating to mirror the local directory to
 the device directory
 @type bool
 """
-messages, errors = self.__rsync(hostDirectory, deviceDirectory,
+errors = self.__rsync(hostDirectory, deviceDirectory, mirror=mirror)
-mirror=mirror)
 if errors:
 self.error.emit("rsync", "\n".join(errors))
-if messages:
-self.rsyncMessages.emit(messages)
 self.rsyncDone.emit(hostDirectory, deviceDirectory)
 @pyqtSlot(str)
 def mkdir(self, dirname):

Mercurial Repositories > eric / file comparison

comparison: eric6/MicroPython/MicroPythonFileSystem.py

eric6/MicroPython/MicroPythonFileSystem.py