eric: comparison eric6/MicroPython/MicroPythonFileManagerWidget.py

-:6014d37d9683
+:f75e990caf99
 from __future__ import unicode_literals
 import os
 import shutil
-import time
 from PyQt5.QtCore import pyqtSlot, Qt, QPoint
 from PyQt5.QtWidgets import (
 QWidget, QTreeWidgetItem, QHeaderView, QMenu, QInputDialog, QLineEdit,
 QDialog
 self.__localDelDirTreeAct = self.__localMenu.addAction(
 self.tr("Delete Directory Tree"), self.__deleteLocalDirectoryTree)
 self.__localMenu.addSeparator()
 self.__localDelFileAct = self.__localMenu.addAction(
 self.tr("Delete File"), self.__deleteLocalFile)
-self.__localMenu.addSeparator()
-self.__localMenu.addAction(
-self.tr("Show Time"), self.__showLocalTime)
 self.__deviceMenu = QMenu(self)
 if not self.__repl.isMicrobit():
 self.__deviceMenu.addAction(
 self.tr("Change Directory"), self.__changeDeviceDirectory)
 self.__deviceMenu.addAction(
 self.tr("Create Directory"), self.__createDeviceDirectory)
-self.__devDelDirAct = self.__deviceMenu.addAction(
+if not self.__deviceWithLocalAccess:
-self.tr("Delete Directory"), self.__deleteDeviceDirectory)
+self.__devDelDirAct = self.__deviceMenu.addAction(
+self.tr("Delete Directory"), self.__deleteDeviceDirectory)
 self.__devDelDirTreeAct = self.__deviceMenu.addAction(
 self.tr("Delete Directory Tree"),
 self.__deleteDeviceDirectoryTree)
 self.__deviceMenu.addSeparator()
 self.__devDelFileAct = self.__deviceMenu.addAction(
 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.
 @type QTreeWidgetItem
 @param column column of the activation
 @type int
 """
 name = os.path.join(self.deviceCwd.text(), item.text(0))
-if name.endswith("/"):
+if self.__deviceWithLocalAccess:
-# directory names end with a '/'
+if name.endswith("/"):
-self.__fileManager.cd(name[:-1])
+# directory names end with a '/'
+self.__listLocalFiles(name[:-1], True)
+elif Utilities.MimeTypes.isTextFile(name):
+e5App().getObject("ViewManager").getEditor(name)
+else:
+if name.endswith("/"):
+# directory names end with a '/'
+self.__fileManager.cd(name[:-1])
 @pyqtSlot()
 def on_deviceFileTreeWidget_itemSelectionChanged(self):
 """
 Private slot handling a change of selection in the local pane.
 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)
+if self.__deviceWithLocalAccess:
+self.__listLocalFiles(dirname, True)
-# TODO:
+else:
+self.__fileManager.cd(dirname)
 @pyqtSlot()
 def on_deviceReloadButton_clicked(self):
 """
 Private slot to reload the device list.
 """
 dirname = self.deviceCwd.text()
-if dirname:
+if self.__deviceWithLocalAccess:
-self.__fileManager.lls(dirname)
+self.__listLocalFiles(dirname, True)
 else:
-self.__fileManager.pwd()
+if dirname:
+self.__fileManager.lls(dirname)
+else:
+self.__fileManager.pwd()
 def __isFileInList(self, filename, treeWidget):
 """
 Private method to check, if a file name is contained in a tree widget.
 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.
 if action == "cancel":
 return
 elif action == "rename":
 deviceFilename = os.path.basename(resultFilename)
-deviceCwd = self.deviceCwd.text()
+if self.__deviceWithLocalAccess:
-if deviceCwd:
+shutil.copy2(
-deviceFilename = deviceCwd + "/" + deviceFilename
+os.path.join(self.localCwd.text(), filename),
-self.__fileManager.put(
+os.path.join(self.deviceCwd.text(), deviceFilename)
-os.path.join(self.localCwd.text(), filename),
+)
-deviceFilename
+self.__listLocalFiles(self.deviceCwd.text(),
-)
+localDevice=True)
+else:
+deviceCwd = self.deviceCwd.text()
+if deviceCwd and deviceCwd != "/":
+deviceFilename = deviceCwd + "/" + deviceFilename
+self.__fileManager.put(
+os.path.join(self.localCwd.text(), filename),
+deviceFilename
+)
 @pyqtSlot()
 def on_putAsButton_clicked(self):
 """
 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.
 if action == "cancel":
 return
 elif action == "rename":
 localFilename = resultFilename
-deviceCwd = self.deviceCwd.text()
+if self.__deviceWithLocalAccess:
-if deviceCwd:
+shutil.copy2(
-filename = deviceCwd + "/" + filename
+os.path.join(self.deviceCwd.text(), filename),
-if not os.path.isabs(localFilename):
+os.path.join(self.localCwd.text(), localFilename)
-localFilename = os.path.join(self.localCwd.text(),
+)
-localFilename)
+self.__listLocalFiles(self.localCwd.text())
-self.__fileManager.get(
+else:
-filename,
+deviceCwd = self.deviceCwd.text()
-localFilename
+if deviceCwd:
-)
+filename = deviceCwd + "/" + filename
+self.__fileManager.get(
+filename,
+os.path.join(self.localCwd.text(), localFilename)
+)
 @pyqtSlot()
 def on_getAsButton_clicked(self):
 """
 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.__fileManager.rsync(
 self.localCwd.text(),
 self.deviceCwd.text(),
-mirror=True
+mirror=True,
+localDevice=self.__deviceWithLocalAccess,
 )
 @pyqtSlot(str, str)
 def __handleRsyncDone(self, localDir, deviceDir):
 """
 self.tr("""<p>The directory <b>{0}</b> could not be"""
 """ deleted.</p><p>Reason: {1}</p>""").format(
 dirname, str(exc))
 )
-# TODO:
+@pyqtSlot()
-@pyqtSlot()
+def __deleteLocalFile(self, localDevice=False):
-def __deleteLocalFile(self):
 """
 Private slot to delete a local file.
-"""
-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
-filename = os.path.join(self.localCwd.text(), name)
+"""
+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)
+filename = os.path.join(cwdWidget.text(), name)
 dlg = DeleteFilesConfirmationDialog(
 self,
 self.tr("Delete File"),
 self.tr(
 "Do you really want to delete this file?"),
 [filename])
 if dlg.exec_() == QDialog.Accepted:
 try:
 os.remove(filename)
-self.__listLocalFiles(self.localCwd.text())
+self.__listLocalFiles(cwdWidget.text(),
+localDevice=localDevice)
 except (OSError, IOError) as exc:
 E5MessageBox.critical(
 self,
 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.
-"""
-localdatetime = time.localtime()
-loacldate = time.strftime('%Y-%m-%d', localdatetime)
-localtime = time.strftime('%H:%M:%S', localdatetime)
-E5MessageBox.information(
-self,
-self.tr("Local Date and Time"),
-self.tr("<h3>Local Date and Time</h3>"
-"<table>"
-"<tr><td><b>Date</b></td><td>{0}</td></tr>"
-"<tr><td><b>Time</b></td><td>{1}</td></tr>"
-"</table>"
-).format(loacldate, localtime)
-)
 ##################################################################
 ## Context menu methods for the device files below
 ##################################################################
 @pyqtSlot(QPoint)
 isFile = not isDir
 else:
 isDir = False
 isFile = False
 if not self.__repl.isMicrobit():
-self.__devDelDirAct.setEnabled(isDir)
+if not self.__deviceWithLocalAccess:
+self.__devDelDirAct.setEnabled(isDir)
 self.__devDelDirTreeAct.setEnabled(isDir)
 self.__devDelFileAct.setEnabled(isFile)
 self.__deviceMenu.exec_(self.deviceFileTreeWidget.mapToGlobal(pos))
 if self.__deviceWithLocalAccess:
 self.__deleteLocalDirectoryTree(True)
 else:
 if bool(len(self.deviceFileTreeWidget.selectedItems())):
 name = self.deviceFileTreeWidget.selectedItems()[0].text(0)
-dirname = self.deviceCwd.text() + "/" + name[:-1]
+cwd = self.deviceCwd.text()
+if cwd and cwd != "/":
+dirname = cwd + "/" + name[:-1]
+else:
+dirname = "/" + name[:-1]
 dlg = DeleteFilesConfirmationDialog(
 self,
 self.tr("Delete Directory"),
 self.tr(
 "Do you really want to delete this directory?"),
 if self.__deviceWithLocalAccess:
 self.__deleteLocalDirectoryTree(True)
 else:
 if bool(len(self.deviceFileTreeWidget.selectedItems())):
 name = self.deviceFileTreeWidget.selectedItems()[0].text(0)
-dirname = self.deviceCwd.text() + "/" + name[:-1]
+cwd = self.deviceCwd.text()
+if cwd and cwd != "/":
+dirname = cwd + "/" + name[:-1]
+else:
+dirname = "/" + 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:
 self.__fileManager.rmdir(dirname, recursive=True)
-# TODO:
 @pyqtSlot()
 def __deleteDeviceFile(self):
 """
 Private slot to delete a file.
 """
-if bool(len(self.deviceFileTreeWidget.selectedItems())):
+if self.__deviceWithLocalAccess:
-name = self.deviceFileTreeWidget.selectedItems()[0].text(0)
+self.__deleteLocalFile(True)
-dirname = self.deviceCwd.text()
+else:
-if dirname:
+if bool(len(self.deviceFileTreeWidget.selectedItems())):
-filename = dirname + "/" + name
+name = self.deviceFileTreeWidget.selectedItems()[0].text(0)
-else:
+dirname = self.deviceCwd.text()
-filename = name
+if dirname and dirname != "/":
-dlg = DeleteFilesConfirmationDialog(
+filename = dirname + "/" + name
-self,
+else:
-self.tr("Delete File"),
+filename = "/" + name
-self.tr(
+dlg = DeleteFilesConfirmationDialog(
-"Do you really want to delete this file?"),
+self,
-[filename])
+self.tr("Delete File"),
-if dlg.exec_() == QDialog.Accepted:
+self.tr(
-self.__fileManager.delete(filename)
+"Do you really want to delete this file?"),
+[filename])
+if dlg.exec_() == QDialog.Accepted:
+self.__fileManager.delete(filename)
 @pyqtSlot()
 def __showFileSystemInfo(self):
 """
 Private slot to show some file system information.

Mercurial Repositories > eric / file comparison

comparison: eric6/MicroPython/MicroPythonFileManagerWidget.py

eric6/MicroPython/MicroPythonFileManagerWidget.py