eric: comparison eric6/MicroPython/MicroPythonFileManager.py

-:f611c3b7313f
+:de8175253dfc
 self.deleteFileDone.emit(deviceFileName)
 except Exception as exc:
 self.error.emit("delete", str(exc))
 def __rsync(self, hostDirectory, deviceDirectory, mirror=True,
-localDevice=False):
+localDevice=False, indentLevel=0):
 """
 Private method to synchronize a local directory to the device.
 @param hostDirectory name of the local directory
 @type str
 @param mirror flag indicating to mirror the local directory to
 the device directory
 @type bool
 @param localDevice flag indicating device access via local file system
 @type bool
+@param indentLevel indentation level for progress messages
+@type int
 @return list of errors
 @rtype list of str
 """
+indent = 4 * "&nbsp;"
 errors = []
 if not os.path.isdir(hostDirectory):
 return [self.tr(
 "The given name '{0}' is not a directory or does not exist.")
 .format(hostDirectory)
 ]
+indentStr = indentLevel * indent
 self.rsyncProgressMessage.emit(
-self.tr("Synchronizing <b>{0}</b>.").format(deviceDirectory)
+self.tr("{1}Synchronizing <b>{0}</b>.")
+.format(deviceDirectory, indentStr)
 )
-doneMessage = self.tr("Done synchronizing <b>{0}</b>.").format(
+doneMessage = self.tr("{1}Done synchronizing <b>{0}</b>.").format(
-deviceDirectory)
+deviceDirectory, indentStr)
 sourceDict = {}
 sourceFiles = listdirStat(hostDirectory)
 for name, nstat in sourceFiles:
 sourceDict[name] = nstat
 destinationSet = set(destinationDict.keys())
 sourceSet = set(sourceDict.keys())
 toAdd = sourceSet - destinationSet                  # add to dev
 toDelete = destinationSet - sourceSet               # delete from dev
 toUpdate = destinationSet.intersection(sourceSet)   # update files
+indentStr = (indentLevel + 1) * indent
 if localDevice:
 for sourceBasename in toAdd:
 # name exists in source but not in device
 sourceFilename = os.path.join(hostDirectory, sourceBasename)
 destFilename = os.path.join(deviceDirectory, sourceBasename)
 self.rsyncProgressMessage.emit(
-self.tr("Adding <b>{0}</b>...").format(destFilename))
+self.tr("{1}Adding <b>{0}</b>...")
+.format(destFilename, indentStr))
 if os.path.isfile(sourceFilename):
 shutil.copy2(sourceFilename, destFilename)
 elif os.path.isdir(sourceFilename):
 # recurse
 errs = self.__rsync(sourceFilename, destFilename,
-mirror=mirror, localDevice=localDevice)
+mirror=mirror, localDevice=localDevice,
+indentLevel=indentLevel + 1)
 # just note issues but ignore them otherwise
 errors.extend(errs)
 if mirror:
 for destBasename in toDelete:
 if os.path.isdir(sourceFilename):
 if os.path.isdir(destFilename):
 # both are directories => recurs
 errs = self.__rsync(sourceFilename, destFilename,
 mirror=mirror,
-localDevice=localDevice)
+localDevice=localDevice,
+indentLevel=indentLevel + 1)
 # just note issues but ignore them otherwise
 errors.extend(errs)
 else:
 self.rsyncProgressMessage.emit(
 self.tr("Source <b>{0}</b> is a directory and"
 shutil.copy2(sourceFilename, destFilename)
 else:
 for sourceBasename in toAdd:
 # name exists in source but not in device
 sourceFilename = os.path.join(hostDirectory, sourceBasename)
-destFilename = deviceDirectory + "/" + sourceBasename
+if deviceDirectory == "/":
+destFilename = "/" + sourceBasename
+else:
+destFilename = deviceDirectory + "/" + sourceBasename
 self.rsyncProgressMessage.emit(
-self.tr("Adding <b>{0}</b>...").format(destFilename))
+self.tr("{1}Adding <b>{0}</b>...")
+.format(destFilename, indentStr))
 if os.path.isfile(sourceFilename):
 try:
 self.__commandsInterface.put(sourceFilename,
 destFilename)
 except Exception as exc:
 # just note issues but ignore them otherwise
 errors.append(str(exc))
 elif os.path.isdir(sourceFilename):
 # recurse
 errs = self.__rsync(sourceFilename, destFilename,
-mirror=mirror)
+mirror=mirror,
+indentLevel=indentLevel + 1)
 # just note issues but ignore them otherwise
 errors.extend(errs)
 if mirror:
 for destBasename in toDelete:
 # name exists in device but not local, delete
-destFilename = deviceDirectory + "/" + destBasename
+if deviceDirectory == "/":
+destFilename = "/" + sourceBasename
+else:
+destFilename = deviceDirectory + "/" + destBasename
 self.rsyncProgressMessage.emit(
-self.tr("Removing <b>{0}</b>...").format(destFilename))
+self.tr("{1}Removing <b>{0}</b>...")
+.format(destFilename, indentStr))
 try:
 self.__commandsInterface.rmrf(destFilename,
 recursive=True,
 force=True)
 except Exception as 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
+if deviceDirectory == "/":
+destFilename = "/" + sourceBasename
+else:
+destFilename = deviceDirectory + "/" + sourceBasename
 destMode = destStat[0]
 if os.path.isdir(sourceFilename):
 if stat.S_ISDIR(destMode):
 # both are directories => recurs
 errs = self.__rsync(sourceFilename, destFilename,
-mirror=mirror)
+mirror=mirror,
+indentLevel=indentLevel + 1)
 # just note issues but ignore them otherwise
 errors.extend(errs)
 else:
 self.rsyncProgressMessage.emit(
 self.tr("Source <b>{0}</b> is a directory and"
 .format(sourceFilename, destFilename)
 )
 else:
 if sourceStat[8] > destStat[8]:     # mtime
 self.rsyncProgressMessage.emit(
-self.tr("Updating <b>{0}</b>...")
+self.tr("{1}Updating <b>{0}</b>...")
-.format(destFilename)
+.format(destFilename, indentStr)
 )
 try:
 self.__commandsInterface.put(sourceFilename,
 destFilename)
 except Exception as exc:

Mercurial Repositories > eric / file comparison

comparison: eric6/MicroPython/MicroPythonFileManager.py

eric6/MicroPython/MicroPythonFileManager.py