eric: comparison eric6/MicroPython/MicroPythonFileManager.py

-:6014d37d9683
+:f75e990caf99
 from __future__ import unicode_literals
 import os
 import stat
+import shutil
 from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject
 from .MicroPythonFileSystemUtilities import (
 mtime2string, mode2string, decoratedName, listdirStat
 self.__commandsInterface.rm(deviceFileName)
 self.deleteFileDone.emit(deviceFileName)
 except Exception as exc:
 self.error.emit("delete", str(exc))
-def __rsync(self, hostDirectory, deviceDirectory, mirror=True):
+def __rsync(self, hostDirectory, deviceDirectory, mirror=True,
+localDevice=False):
 """
 Private method to synchronize a local directory to the device.
 @param hostDirectory name of the local directory
 @type 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
+@param localDevice flag indicating device access via local file system
 @type bool
 @return list of errors
 @rtype list of str
 """
 errors = []
 self.rsyncProgressMessage.emit(
 self.tr("Synchronizing <b>{0}</b>.").format(deviceDirectory)
 )
+doneMessage = self.tr("Done synchronizing <b>{0}</b>.").format(
+deviceDirectory)
 sourceDict = {}
 sourceFiles = listdirStat(hostDirectory)
 for name, nstat in sourceFiles:
 sourceDict[name] = nstat
 destinationDict = {}
-try:
+if localDevice:
-destinationFiles = self.__commandsInterface.lls(deviceDirectory,
+if not os.path.isdir(deviceDirectory):
-fullstat=True)
+# simply copy destination to source
-except Exception as exc:
+shutil.copytree(hostDirectory, deviceDirectory)
-return [str(exc)]
+self.rsyncProgressMessage.emit(doneMessage)
-if destinationFiles is None:
+return errors
-# the destination directory does not exist
+else:
+destinationFiles = listdirStat(deviceDirectory)
+for name, nstat in destinationFiles:
+destinationDict[name] = nstat
+else:
 try:
-self.__commandsInterface.mkdir(deviceDirectory)
+destinationFiles = self.__commandsInterface.lls(deviceDirectory,
+fullstat=True)
 except Exception as exc:
 return [str(exc)]
-else:
+if destinationFiles is None:
-for name, nstat in destinationFiles:
+# the destination directory does not exist
-destinationDict[name] = nstat
+try:
+self.__commandsInterface.mkdir(deviceDirectory)
+except Exception as exc:
+return [str(exc)]
+else:
+for name, nstat in destinationFiles:
+destinationDict[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
-for sourceBasename in toAdd:
+if localDevice:
-# name exists in source but not in device
+for sourceBasename in toAdd:
-sourceFilename = os.path.join(hostDirectory, sourceBasename)
+# name exists in source but not in device
-destFilename = deviceDirectory + "/" + sourceBasename
+sourceFilename = os.path.join(hostDirectory, sourceBasename)
-self.rsyncProgressMessage.emit(
+destFilename = os.path.join(deviceDirectory, sourceBasename)
-self.tr("Adding <b>{0}</b>...").format(destFilename))
+self.rsyncProgressMessage.emit(
-if os.path.isfile(sourceFilename):
+self.tr("Adding <b>{0}</b>...").format(destFilename))
-try:
+if os.path.isfile(sourceFilename):
-self.__commandsInterface.put(sourceFilename, destFilename)
+shutil.copy2(sourceFilename, destFilename)
-except Exception as exc:
+elif os.path.isdir(sourceFilename):
+# recurse
+errs = self.__rsync(sourceFilename, destFilename,
+mirror=mirror, localDevice=localDevice)
 # just note issues but ignore them otherwise
-errors.append(str(exc))
+errors.extend(errs)
-if os.path.isdir(sourceFilename):
-# recurse
+if mirror:
-errs = self.__rsync(sourceFilename, destFilename,
+for destBasename in toDelete:
-mirror=mirror)
+# name exists in device but not local, delete
-# just note issues but ignore them otherwise
+destFilename = os.path.join(deviceDirectory, destBasename)
-errors.extend(errs)
+if os.path.isdir(destFilename):
+shutil.rmtree(destFilename, ignore_errors=True)
-if mirror:
+elif os.path.isfile(destFilename):
-for destBasename in toDelete:
+os.remove(destFilename)
-# name exists in device but not local, delete
-destFilename = deviceDirectory + "/" + destBasename
+for sourceBasename in toUpdate:
+# names exist in both; do an update
+sourceStat = sourceDict[sourceBasename]
+destStat = destinationDict[sourceBasename]
+sourceFilename = os.path.join(hostDirectory, sourceBasename)
+destFilename = os.path.join(deviceDirectory, sourceBasename)
+destMode = destStat[0]
+if os.path.isdir(sourceFilename):
+if os.path.isdir(destFilename):
+# both are directories => recurs
+errs = self.__rsync(sourceFilename, destFilename,
+mirror=mirror,
+localDevice=localDevice)
+# just note issues but ignore them otherwise
+errors.extend(errs)
+else:
+self.rsyncProgressMessage.emit(
+self.tr("Source <b>{0}</b> is a directory and"
+" destination <b>{1}</b> is a file."
+" Ignoring it.")
+.format(sourceFilename, destFilename)
+)
+else:
+if os.path.isdir(destFilename):
+self.rsyncProgressMessage.emit(
+self.tr("Source <b>{0}</b> is a file and"
+" destination <b>{1}</b> is a directory."
+" Ignoring it.")
+.format(sourceFilename, destFilename)
+)
+else:
+if sourceStat[8] > destStat[8]:     # mtime
+self.rsyncProgressMessage.emit(
+self.tr("Updating <b>{0}</b>...")
+.format(destFilename)
+)
+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
 self.rsyncProgressMessage.emit(
-self.tr("Removing <b>{0}</b>...").format(destFilename))
+self.tr("Adding <b>{0}</b>...").format(destFilename))
-try:
+if os.path.isfile(sourceFilename):
-self.__commandsInterface.rmrf(destFilename, recursive=True,
+try:
-force=True)
+self.__commandsInterface.put(sourceFilename,
-except Exception as exc:
+destFilename)
-# just note issues but ignore them otherwise
+except Exception as exc:
-errors.append(str(exc))
+# just note issues but ignore them otherwise
+errors.append(str(exc))
-for sourceBasename in toUpdate:
+elif os.path.isdir(sourceFilename):
-# names exist in both; do an update
+# recurse
-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 => recurs
 errs = self.__rsync(sourceFilename, destFilename,
 mirror=mirror)
 # 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
+self.rsyncProgressMessage.emit(
+self.tr("Removing <b>{0}</b>...").format(destFilename))
+try:
+self.__commandsInterface.rmrf(destFilename,
+recursive=True,
+force=True)
+except Exception as exc:
+# just note issues but ignore them otherwise
+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 => recurs
+errs = self.__rsync(sourceFilename, destFilename,
+mirror=mirror)
+# just note issues but ignore them otherwise
+errors.extend(errs)
+else:
+self.rsyncProgressMessage.emit(
+self.tr("Source <b>{0}</b> is a directory and"
+" destination <b>{1}</b> is a file."
+" Ignoring it.")
+.format(sourceFilename, destFilename)
+)
 else:
-self.rsyncProgressMessage.emit(
+if stat.S_ISDIR(destMode):
-self.tr("Source <b>{0}</b> is a directory and"
-" destination <b>{1}</b> is a file. Ignoring"
-" it.")
-.format(sourceFilename, destFilename)
-)
-else:
-if stat.S_ISDIR(destMode):
-self.rsyncProgressMessage.emit(
-self.tr("Source <b>{0}</b> is a file and destination"
-" <b>{1}</b> is a directory. Ignoring it.")
-.format(sourceFilename, destFilename)
-)
-else:
-if sourceStat[8] > destStat[8]:     # mtime
 self.rsyncProgressMessage.emit(
-self.tr("Updating <b>{0}</b>...")
+self.tr("Source <b>{0}</b> is a file and"
-.format(destFilename)
+" destination <b>{1}</b> is a directory."
+" Ignoring it.")
+.format(sourceFilename, destFilename)
 )
-try:
+else:
-self.__commandsInterface.put(sourceFilename,
+if sourceStat[8] > destStat[8]:     # mtime
-destFilename)
+self.rsyncProgressMessage.emit(
-except Exception as exc:
+self.tr("Updating <b>{0}</b>...")
-errors.append(str(exc))
+.format(destFilename)
+)
-self.rsyncProgressMessage.emit(
+try:
-self.tr("Done synchronizing <b>{0}</b>.").format(deviceDirectory)
+self.__commandsInterface.put(sourceFilename,
-)
+destFilename)
+except Exception as exc:
+errors.append(str(exc))
+self.rsyncProgressMessage.emit(doneMessage)
 return errors
 @pyqtSlot(str, str)
 @pyqtSlot(str, str, bool)
-def rsync(self, hostDirectory, deviceDirectory, mirror=True):
+@pyqtSlot(str, str, bool, bool)
+def rsync(self, hostDirectory, deviceDirectory, mirror=True,
+localDevice=False):
 """
 Public slot to synchronize a local directory to the device.
 @param hostDirectory name of the local directory
 @type 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
-"""
+@param localDevice flag indicating device access via local file system
-errors = self.__rsync(hostDirectory, deviceDirectory, mirror=mirror)
+@type bool
+"""
+errors = self.__rsync(hostDirectory, deviceDirectory, mirror=mirror,
+localDevice=localDevice)
 if errors:
 self.error.emit("rsync", "\n".join(errors))
 self.rsyncDone.emit(hostDirectory, deviceDirectory)

Mercurial Repositories > eric / file comparison

comparison: eric6/MicroPython/MicroPythonFileManager.py

eric6/MicroPython/MicroPythonFileManager.py