eric: comparison eric6/MicroPython/MicroPythonFileManagerWidget.py

-:ec199ef0cfc6
+:217862c28319
 QWidget, QTreeWidgetItem, QHeaderView, QMenu, QInputDialog, QLineEdit
 )
 from E5Gui import E5MessageBox, E5PathPickerDialog
 from E5Gui.E5PathPicker import E5PathPickerModes
+from E5Gui.E5FileSaveConfirmDialog import confirmOverwrite
 from E5Gui.E5Application import e5App
 from .Ui_MicroPythonFileManagerWidget import Ui_MicroPythonFileManagerWidget
 from .MicroPythonFileSystem import MicroPythonFileManager
 self.localFileTreeWidget.header().setSortIndicator(
 0, Qt.AscendingOrder)
 self.deviceFileTreeWidget.header().setSortIndicator(
 0, Qt.AscendingOrder)
+self.__progressInfoDialog = None
 self.__fileManager = MicroPythonFileManager(port, self)
 self.__fileManager.longListFiles.connect(self.__handleLongListFiles)
 self.__fileManager.currentDir.connect(self.__handleCurrentDir)
 self.__fileManager.currentDirChanged.connect(self.__handleCurrentDir)
 self.__fileManager.putFileDone.connect(self.__newDeviceList)
 self.__fileManager.getFileDone.connect(self.__handleGetDone)
 self.__fileManager.rsyncDone.connect(self.__handleRsyncDone)
 self.__fileManager.rsyncMessages.connect(self.__handleRsyncMessages)
+self.__fileManager.rsyncProgressMessage.connect(
+self.__handleRsyncProgressMessage)
 self.__fileManager.removeDirectoryDone.connect(self.__newDeviceList)
 self.__fileManager.createDirectoryDone.connect(self.__newDeviceList)
 self.__fileManager.deleteFileDone.connect(self.__newDeviceList)
 self.__fileManager.synchTimeDone.connect(self.__timeSynchronized)
 self.__fileManager.showTimeDone.connect(self.__deviceTimeReceived)
 self.__showDeviceContextMenu)
 self.__localMenu = QMenu(self)
 self.__localMenu.addAction(self.tr("Change Directory"),
 self.__changeLocalDirectory)
+# TODO: add some more local entries
+# TODO: add entry to reload
 self.__deviceMenu = QMenu(self)
 self.__deviceMenu.addAction(
 self.tr("Change Directory"), self.__changeDeviceDirectory)
 self.__deviceMenu.addAction(
 self.tr("Delete Directory Tree"), self.__deleteDeviceDirectoryTree)
 self.__deviceMenu.addSeparator()
 self.__devDelFileAct = self.__deviceMenu.addAction(
 self.tr("Delete File"), self.__deleteDeviceFile)
 self.__deviceMenu.addSeparator()
+# TODO: add entry to reload
+self.__deviceMenu.addSeparator()
 self.__deviceMenu.addAction(
 self.tr("Synchronize Time"), self.__synchronizeTime)
 self.__deviceMenu.addAction(
 self.tr("Show Time"), self.__showDeviceTime)
 self.__deviceMenu.addSeparator()
 filename = selectedItems[0].text(0).strip()
 if not filename.endswith("/"):
 # it is really a file
 if self.__isFileInList(filename, self.deviceFileTreeWidget):
 # ask for overwrite permission
-ok = E5MessageBox.yesNo(
+# TODO: test this
-self,
+action, resultFilename = confirmOverwrite(
-self.tr("Copy File to Device"),
+filename, self.tr("Copy File to Device"),
-self.tr("<p>The file <b>{0}</b> exists on the"
+self.tr("The given file exists already"
-" connected device. Overwrite it?</p>")
+" (Enter file name only)."),
-.format(filename)
+False, self)
-)
+if action == "cancel":
-if ok:
+return
+elif action == "rename":
+deviceFilename = os.path.basename(resultFilename)
+else:
 deviceFilename = filename
-else:
-deviceFilename, ok = QInputDialog.getText(
-self,
-self.tr("Copy File to Device"),
-self.tr("Enter a new name:"),
-QLineEdit.Normal,
-filename)
-if not ok or not bool(deviceFilename):
-return
 else:
 deviceFilename = filename
 self.__fileManager.put(
 os.path.join(self.localCwd.text(), filename),
 filename = selectedItems[0].text(0).strip()
 if not filename.endswith("/"):
 # it is really a file
 if self.__isFileInList(filename, self.localFileTreeWidget):
 # ask for overwrite permission
-ok = E5MessageBox.yesNo(
+# TODO: test this
-self,
+action, resultFilename = confirmOverwrite(
-self.tr("Copy File from Device"),
+filename, self.tr("Copy File from Device"),
-self.tr("<p>The file <b>{0}</b> exists locally."
+self.tr("The given file exists already."),
-" Overwrite it?</p>")
+True, self)
-.format(filename)
+if action == "cancel":
-)
+return
-if ok:
+elif action == "rename":
+localFilename = resultFilename
+else:
 localFilename = filename
-else:
-localFilename, ok = QInputDialog.getText(
-self,
-self.tr("Copy File from Device"),
-self.tr("Enter a new name:"),
-QLineEdit.Normal,
-filename)
-if not ok or not bool(localFilename):
-return
 else:
 localFilename = filename
+if not os.path.isabs(localFilename):
+localFilename = os.path.join(self.localCwd.text(),
+localFilename)
 self.__fileManager.get(
 os.path.join(self.deviceCwd.text(), filename),
-os.path.join(self.localCwd.text(), localFilename)
+localFilename
 )
 @pyqtSlot(str, str)
 def __handleGetDone(self, deviceFile, localFile):
 """
 @param localFile name of the local file
 @type str
 """
 self.__listLocalFiles(self.localCwd.text())
+# TODO: test this
 @pyqtSlot()
 def on_syncButton_clicked(self):
 """
 Private slot to synchronize the local directory to the device.
 """
 """<ul><li>{0}</li></ul>""").format(
 "</li><li>".join(messages)
 )
 )
+@pyqtSlot(str)
+def __handleRsyncProgressMessage(self, message):
+"""
+Private slot handling progress messages sent by the file manager.
+"""
+# TODO: not implemented yet
+#   create and open the info dialog, if it is None
+#   connect to the dialog finished(int) signal to set the memeber variable to None
+#   add messages to dialog
 @pyqtSlot()
 def __newDeviceList(self):
 """
 Private slot to initiate a new long list of the device directory.
 """
 @pyqtSlot()
 def __changeLocalDirectory(self):
 """
 Private slot to change the local directory.
 """
-path, ok = E5PathPickerDialog.getPath(
+dirPath, ok = E5PathPickerDialog.getPath(
 self,
 self.tr("Change Directory"),
 self.tr("Select Directory"),
 E5PathPickerModes.DirectoryShowFilesMode,
 defaultDirectory=self.localCwd.text(),
 )
-if ok and path:
+if ok and dirPath:
-self.localCwd.setText(path)
+if not os.path.isabs(dirPath):
-self.__listLocalFiles(path)
+dirPath = os.path.join(self.localCwd.text(), dirPath)
+self.localCwd.setText(dirPath)
+self.__listLocalFiles(dirPath)
 ##################################################################
 ## Context menu methods for the device files below
 ##################################################################
 current directory.
 """
 dirPath, ok = QInputDialog.getText(
 self,
 self.tr("Change Directory"),
-self.tr("Enter the full directory path on the device:"),
+self.tr("Enter the directory path on the device:"),
 QLineEdit.Normal,
 self.deviceCwd.text())
 if ok and dirPath:
+if not dirPath.startswith("/"):
+dirPath = self.deviceCwd.text() + "/" + dirPath
 self.__fileManager.cd(dirPath)
+# TODO: test this
 @pyqtSlot()
 def __createDeviceDirectory(self):
 """
 Private slot to create a directory on the device.
 """
 self.tr("Enter directory name:"),
 QLineEdit.Normal)
 if ok and dirPath:
 self.__fileManager.mkdir(dirPath)
+# TODO: test this
 @pyqtSlot()
 def __deleteDeviceDirectory(self):
 """
 Private slot to delete an empty directory on the device.
 """
 if bool(len(self.deviceFileTreeWidget.selectedItems())):
 name = self.deviceFileTreeWidget.selectedItems()[0].text(0)
 dirname = self.deviceCwd.text() + "/" + name[:-1]
+# TODO: add confirmation
 self.__fileManager.rmdir(dirname)
 @pyqtSlot()
 def __deleteDeviceDirectoryTree(self):
 """
 recursively.
 """
 if bool(len(self.deviceFileTreeWidget.selectedItems())):
 name = self.deviceFileTreeWidget.selectedItems()[0].text(0)
 dirname = self.deviceCwd.text() + "/" + name[:-1]
+# TODO: add confirmation
 self.__fileManager.rmdir(dirname, recursive=True)
 @pyqtSlot()
 def __deleteDeviceFile(self):
 """
 Private slot to delete a file
 """
 if bool(len(self.deviceFileTreeWidget.selectedItems())):
 name = self.deviceFileTreeWidget.selectedItems()[0].text(0)
 filename = self.deviceCwd.text() + "/" + name
+# TODO: add confirmation
 self.__fileManager.delete(filename)
 @pyqtSlot()
 def __synchronizeTime(self):
 """
 "<h3>Device Version Information</h3>"
 )
 msg += "<table>"
 for key, value in versionInfo.items():
 msg += "<tr><td><b>{0}</b></td><td>{1}</td></tr>".format(
-key, value)
+key.capitalize(), value)
 msg += "</table>"
 else:
 msg = self.tr("No version information available.")
 E5MessageBox.information(
 self,

Mercurial Repositories > eric / file comparison

comparison: eric6/MicroPython/MicroPythonFileManagerWidget.py

eric6/MicroPython/MicroPythonFileManagerWidget.py