eric: comparison eric6/MicroPython/MicroPythonFileManagerWidget.py

-:3cc19aec959a
+:6014d37d9683
 class MicroPythonFileManagerWidget(QWidget, Ui_MicroPythonFileManagerWidget):
 """
 Class implementing a file manager for MicroPython devices.
 """
-def __init__(self, commandsInterface, parent=None):
+def __init__(self, commandsInterface, deviceWithLocalAccess, parent=None):
 """
 Constructor
 @param commandsInterface reference to the commands interface object
 @type MicroPythonCommandsInterface
+@param deviceWithLocalAccess flag indicating the device supports file
+access via a local directory
+@type bool
 @param parent reference to the parent widget
 @type QWidget
 """
 super(MicroPythonFileManagerWidget, self).__init__(parent)
 self.setupUi(self)
 self.__repl = parent
+self.__deviceWithLocalAccess = deviceWithLocalAccess
 self.syncButton.setIcon(UI.PixmapCache.getIcon("2rightarrow"))
 self.putButton.setIcon(UI.PixmapCache.getIcon("1rightarrow"))
 self.putAsButton.setIcon(UI.PixmapCache.getIcon("putAs"))
 self.getButton.setIcon(UI.PixmapCache.getIcon("1leftarrow"))
 if not dirname:
 dirname = (Preferences.getMultiProject("Workspace") or
 os.path.expanduser("~"))
 self.__listLocalFiles(dirname)
-self.__fileManager.pwd()
+if self.__deviceWithLocalAccess:
+dirname = self.__repl.getDeviceWorkspace()
+if dirname:
+self.__listLocalFiles(dirname, True)
+else:
+self.__fileManager.pwd()
 def stop(self):
 """
 Public method to stop the widget.
 """
 itm.setTextAlignment(1, Qt.AlignHCenter)
 itm.setTextAlignment(2, Qt.AlignRight)
 self.deviceFileTreeWidget.header().resizeSections(
 QHeaderView.ResizeToContents)
-def __listLocalFiles(self, dirname=""):
+def __listLocalFiles(self, dirname="", localDevice=False):
 """
 Private method to populate the local files list.
 @param dirname name of the local directory to be listed
 @type str
-"""     # __IGNORE_WARNING_D234__
+@param localDevice flag indicating device access via local file system
+@type bool
+"""
 if not dirname:
 dirname = os.getcwd()
 if dirname.endswith(os.sep):
 dirname = dirname[:-1]
-self.localCwd.setText(dirname)
+if localDevice:
+self.deviceCwd.setText(dirname)
+else:
+self.localCwd.setText(dirname)
 filesStatList = listdirStat(dirname)
 filesList = [(
 decoratedName(f, s[0], os.path.isdir(os.path.join(dirname, f))),
 mode2string(s[0]),
 str(s[6]),
 mtime2string(s[8])) for f, s in filesStatList]
-self.localFileTreeWidget.clear()
+if localDevice:
+fileTreeWidget = self.deviceFileTreeWidget
+else:
+fileTreeWidget = self.localFileTreeWidget
+fileTreeWidget.clear()
 for item in filesList:
-itm = QTreeWidgetItem(self.localFileTreeWidget, item)
+itm = QTreeWidgetItem(fileTreeWidget, item)
 itm.setTextAlignment(1, Qt.AlignHCenter)
 itm.setTextAlignment(2, Qt.AlignRight)
-self.localFileTreeWidget.header().resizeSections(
+fileTreeWidget.header().resizeSections(
 QHeaderView.ResizeToContents)
 @pyqtSlot(QTreeWidgetItem, int)
 def on_localFileTreeWidget_itemActivated(self, item, column):
 """
 Private slot to reload the local list.
 """
 dirname = self.localCwd.text()
 self.__listLocalFiles(dirname)
+# TODO:
 @pyqtSlot(QTreeWidgetItem, int)
 def on_deviceFileTreeWidget_itemActivated(self, item, column):
 """
 Private slot to handle the activation of a device item.
 self.deviceFileTreeWidget.selectedItems()[0].text(0)
 .endswith("/"))
 self.getButton.setEnabled(enable)
 self.getAsButton.setEnabled(enable)
+# TODO:
 @pyqtSlot()
 def on_deviceUpButton_clicked(self):
 """
 Private slot to go up one directory level on the device.
 """
 cwd = self.deviceCwd.text()
 dirname = os.path.dirname(cwd)
 self.__fileManager.cd(dirname)
+# TODO:
 @pyqtSlot()
 def on_deviceReloadButton_clicked(self):
 """
 Private slot to reload the device list.
 """
 if treeWidget.topLevelItem(row).text(0) == filename:
 return True
 return False
+# TODO:
 @pyqtSlot()
 def on_putButton_clicked(self, putAs=False):
 """
 Private slot to copy the selected file to the connected device.
 Private slot to copy the selected file to the connected device
 with a different name.
 """
 self.on_putButton_clicked(putAs=True)
+# TODO:
 @pyqtSlot()
 def on_getButton_clicked(self, getAs=False):
 """
 Private slot to copy the selected file from the connected device.
 @param localFile name of the local file
 @type str
 """
 self.__listLocalFiles(self.localCwd.text())
+# TODO:
 @pyqtSlot()
 def on_syncButton_clicked(self):
 """
 Private slot to synchronize the local directory to the device.
 """
 self.__localDelFileAct.setEnabled(isFile)
 self.__localMenu.exec_(self.localFileTreeWidget.mapToGlobal(pos))
 @pyqtSlot()
-def __changeLocalDirectory(self):
+def __changeLocalDirectory(self, localDevice=False):
 """
 Private slot to change the local directory.
-"""
+@param localDevice flag indicating device access via local file system
+@type bool
+"""
+if localDevice:
+cwdWidget = self.deviceCwd
+else:
+cwdWidget = self.localCwd
 dirPath, ok = E5PathPickerDialog.getPath(
 self,
 self.tr("Change Directory"),
 self.tr("Select Directory"),
 E5PathPickerModes.DirectoryShowFilesMode,
-defaultDirectory=self.localCwd.text(),
+path=cwdWidget.text(),
+defaultDirectory=cwdWidget.text(),
 )
 if ok and dirPath:
 if not os.path.isabs(dirPath):
-dirPath = os.path.join(self.localCwd.text(), dirPath)
+dirPath = os.path.join(cwdWidget.text(), dirPath)
-self.localCwd.setText(dirPath)
+cwdWidget.setText(dirPath)
-self.__listLocalFiles(dirPath)
+self.__listLocalFiles(dirPath, localDevice=localDevice)
 @pyqtSlot()
-def __createLocalDirectory(self):
+def __createLocalDirectory(self, localDevice=False):
 """
 Private slot to create a local directory.
-"""
+@param localDevice flag indicating device access via local file system
+@type bool
+"""
+if localDevice:
+cwdWidget = self.deviceCwd
+else:
+cwdWidget = self.localCwd
 dirPath, ok = QInputDialog.getText(
 self,
 self.tr("Create Directory"),
 self.tr("Enter directory name:"),
 QLineEdit.Normal)
 if ok and dirPath:
-dirPath = os.path.join(self.localCwd.text(), dirPath)
+dirPath = os.path.join(cwdWidget.text(), dirPath)
 try:
 os.mkdir(dirPath)
-self.__listLocalFiles(self.localCwd.text())
+self.__listLocalFiles(cwdWidget.text(),
+localDevice=localDevice)
 except (OSError, IOError) as exc:
 E5MessageBox.critical(
 self,
 self.tr("Create Directory"),
 self.tr("""<p>The directory <b>{0}</b> could not be"""
 """ created.</p><p>Reason: {1}</p>""").format(
 dirPath, str(exc))
 )
 @pyqtSlot()
-def __deleteLocalDirectoryTree(self):
+def __deleteLocalDirectoryTree(self, localDevice=False):
 """
 Private slot to delete a local directory tree.
-"""
-if bool(len(self.localFileTreeWidget.selectedItems())):
+@param localDevice flag indicating device access via local file system
-name = self.localFileTreeWidget.selectedItems()[0].text(0)
+@type bool
-dirname = os.path.join(self.localCwd.text(), name[:-1])
+"""
+if localDevice:
+cwdWidget = self.deviceCwd
+fileTreeWidget = self.deviceFileTreeWidget
+else:
+cwdWidget = self.localCwd
+fileTreeWidget = self.localFileTreeWidget
+if bool(len(fileTreeWidget.selectedItems())):
+name = fileTreeWidget.selectedItems()[0].text(0)
+dirname = os.path.join(cwdWidget.text(), name[:-1])
 dlg = DeleteFilesConfirmationDialog(
 self,
 self.tr("Delete Directory Tree"),
 self.tr(
 "Do you really want to delete this directory tree?"),
 [dirname])
 if dlg.exec_() == QDialog.Accepted:
 try:
 shutil.rmtree(dirname)
-self.__listLocalFiles(self.localCwd.text())
+self.__listLocalFiles(cwdWidget.text(),
+localDevice=localDevice)
 except Exception as exc:
 E5MessageBox.critical(
 self,
 self.tr("Delete Directory Tree"),
 self.tr("""<p>The directory <b>{0}</b> could not be"""
 """ deleted.</p><p>Reason: {1}</p>""").format(
 dirname, str(exc))
 )
+# TODO:
 @pyqtSlot()
 def __deleteLocalFile(self):
 """
 Private slot to delete a local file.
 """
 self.tr("Delete File"),
 self.tr("""<p>The file <b>{0}</b> could not be"""
 """ deleted.</p><p>Reason: {1}</p>""").format(
 filename, str(exc))
 )
+# TODO: move to repl widget super menu
 @pyqtSlot()
 def __showLocalTime(self):
 """
 Private slot to show the local date and time.
 """
 Private slot to change the current directory of the device.
 Note: This triggers a re-population of the device list for the new
 current directory.
 """
-dirPath, ok = QInputDialog.getText(
+if self.__deviceWithLocalAccess:
-self,
+self.__changeLocalDirectory(True)
-self.tr("Change Directory"),
+else:
-self.tr("Enter the directory path on the device:"),
+dirPath, ok = QInputDialog.getText(
-QLineEdit.Normal,
+self,
-self.deviceCwd.text())
+self.tr("Change Directory"),
-if ok and dirPath:
+self.tr("Enter the directory path on the device:"),
-if not dirPath.startswith("/"):
+QLineEdit.Normal,
-dirPath = self.deviceCwd.text() + "/" + dirPath
+self.deviceCwd.text())
-self.__fileManager.cd(dirPath)
+if ok and dirPath:
+if not dirPath.startswith("/"):
+dirPath = self.deviceCwd.text() + "/" + dirPath
+self.__fileManager.cd(dirPath)
 @pyqtSlot()
 def __createDeviceDirectory(self):
 """
 Private slot to create a directory on the device.
 """
-dirPath, ok = QInputDialog.getText(
+if self.__deviceWithLocalAccess:
-self,
+self.__createLocalDirectory(True)
-self.tr("Create Directory"),
+else:
-self.tr("Enter directory name:"),
+dirPath, ok = QInputDialog.getText(
-QLineEdit.Normal)
+self,
-if ok and dirPath:
+self.tr("Create Directory"),
-self.__fileManager.mkdir(dirPath)
+self.tr("Enter directory name:"),
+QLineEdit.Normal)
+if ok and dirPath:
+self.__fileManager.mkdir(dirPath)
 @pyqtSlot()
 def __deleteDeviceDirectory(self):
 """
 Private slot to delete an empty directory on the device.
 """
-if bool(len(self.deviceFileTreeWidget.selectedItems())):
+if self.__deviceWithLocalAccess:
-name = self.deviceFileTreeWidget.selectedItems()[0].text(0)
+self.__deleteLocalDirectoryTree(True)
-dirname = self.deviceCwd.text() + "/" + name[:-1]
+else:
-dlg = DeleteFilesConfirmationDialog(
+if bool(len(self.deviceFileTreeWidget.selectedItems())):
-self,
+name = self.deviceFileTreeWidget.selectedItems()[0].text(0)
-self.tr("Delete Directory"),
+dirname = self.deviceCwd.text() + "/" + name[:-1]
-self.tr(
+dlg = DeleteFilesConfirmationDialog(
-"Do you really want to delete this directory?"),
+self,
-[dirname])
+self.tr("Delete Directory"),
-if dlg.exec_() == QDialog.Accepted:
+self.tr(
-self.__fileManager.rmdir(dirname)
+"Do you really want to delete this directory?"),
+[dirname])
+if dlg.exec_() == QDialog.Accepted:
+self.__fileManager.rmdir(dirname)
 @pyqtSlot()
 def __deleteDeviceDirectoryTree(self):
 """
 Private slot to delete a directory and all its subdirectories
 recursively.
 """
-if bool(len(self.deviceFileTreeWidget.selectedItems())):
+if self.__deviceWithLocalAccess:
-name = self.deviceFileTreeWidget.selectedItems()[0].text(0)
+self.__deleteLocalDirectoryTree(True)
-dirname = self.deviceCwd.text() + "/" + name[:-1]
+else:
-dlg = DeleteFilesConfirmationDialog(
+if bool(len(self.deviceFileTreeWidget.selectedItems())):
-self,
+name = self.deviceFileTreeWidget.selectedItems()[0].text(0)
-self.tr("Delete Directory Tree"),
+dirname = self.deviceCwd.text() + "/" + name[:-1]
-self.tr(
+dlg = DeleteFilesConfirmationDialog(
-"Do you really want to delete this directory tree?"),
+self,
-[dirname])
+self.tr("Delete Directory Tree"),
-if dlg.exec_() == QDialog.Accepted:
+self.tr(
-self.__fileManager.rmdir(dirname, recursive=True)
+"Do you really want to delete this directory tree?"),
+[dirname])
+if dlg.exec_() == QDialog.Accepted:
+self.__fileManager.rmdir(dirname, recursive=True)
+# TODO:
 @pyqtSlot()
 def __deleteDeviceFile(self):
 """
 Private slot to delete a file.
 """

Mercurial Repositories > eric / file comparison

comparison: eric6/MicroPython/MicroPythonFileManagerWidget.py

eric6/MicroPython/MicroPythonFileManagerWidget.py