eric: comparison src/eric7/MicroPython/Devices/CircuitPythonDevices.py

-:02a40e8bd135
+:011ae0edbcff
 import os
 import shutil
 from PyQt6.QtCore import QUrl, pyqtSlot
 from PyQt6.QtNetwork import QNetworkReply, QNetworkRequest
-from PyQt6.QtWidgets import QMenu
+from PyQt6.QtWidgets import QInputDialog, QMenu
 from eric7 import Globals, Preferences
 from eric7.EricGui.EricOverrideCursor import EricOverrideCursor, EricOverridenCursor
 from eric7.EricWidgets import EricFileDialog, EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
-from eric7.SystemUtilities import FileSystemUtilities
+from eric7.SystemUtilities import FileSystemUtilities, OSUtilities
 from ..EthernetDialogs import WiznetUtilities
 from ..MicroPythonWidget import HAS_QTCHART
 from . import FirmwareGithubUrls
 from .CircuitPythonUpdater.CircuitPythonUpdaterInterface import (
 self._submitMode = "paste"  # use 'paste' mode to avoid loosing state
 self.__boardName = boardName
 self.__vidpid = (vid, pid)
+self.__workspaceSelected = False
 self.__workspace = self.__findWorkspace() if hasWorkspace else None
 self.__updater = CircuitPythonUpdaterInterface(self)
 self.__createCPyMenu()
 @rtype bool
 """
 if self.__workspace and not os.path.exists(self.__workspace):
 self.__workspace = ""  # reset
-if self.__workspace and self.DeviceVolumeName not in self.__workspace:
+if (
+self.__workspace
+and self.DeviceVolumeName not in self.__workspace
+and not self.__workspaceSelected
+):
 self.__workspace = ""  # reset
-return self.DeviceVolumeName in self.getWorkspace(silent=True)
+return (
+self.__workspaceSelected
+or self.DeviceVolumeName in self.getWorkspace(silent=True)
+)
 def __findDeviceDirectories(self, directories):
 """
 Private method to find the device directories associated with the
 current board name.
 return self.__workspace
 else:
 self.__workspace = self.__findWorkspace(silent=silent)
 return self.__workspace
+def setWorkspace(self, workspacePath):
+"""
+Public method to set the device workspace directory.
+@param workspacePath directory to be used for saving files
+@type str
+"""
+self.__workspace = workspacePath
+self.__workspaceSelected = True
 def __createCPyMenu(self):
 """
 Private method to create the CircuitPython submenu.
 """
 self.__libraryMenu = QMenu(self.tr("Library Management"))
 self.__flashMenu = self.__createFlashMenus()
 self.__cpyMenu = QMenu(self.tr("CircuitPython Functions"))
 self.__cpyMenu.addAction(
 self.tr("Show CircuitPython Versions"), self.showCircuitPythonVersions
+)
+self.__cpyMenu.addSeparator()
+self.__cpyMenu.addAction(
+self.tr("Select Device Volume"), self.__selectDeviceVolume
 )
 self.__cpyMenu.addSeparator()
 self.__bootloaderAct = self.__cpyMenu.addAction(
 self.tr("Activate Bootloader"), self.__activateBootloader
 )
 (
 self.tr("CircuitPython Libraries"),
 Preferences.getMicroPython("CircuitPythonLibrariesUrl"),
 ),
 ]
+@pyqtSlot()
+def __selectDeviceVolume(self):
+"""
+Private slot to select the mounted device volume, if it could not be found
+automatically.
+"""
+userMounts = FileSystemUtilities.getUserMounts()
+msg = (
+self.tr("Select the drive letter of the device:")
+if OSUtilities.isWindowsPlatform()
+else self.tr("Select the path of the mounted device:")
+)
+selectedMount, ok = QInputDialog.getItem(
+None,
+self.tr("Select Device Volume"),
+msg,
+userMounts,
+0, False,
+)
+if ok and selectedMount:
+self.__workspace = selectedMount
+self.__workspaceSelected = self.DeviceVolumeName not in self.__workspace
 ##################################################################
 ## Methods below implement WiFi related methods
 ##################################################################

Mercurial Repositories > eric / file comparison

comparison: src/eric7/MicroPython/Devices/CircuitPythonDevices.py

src/eric7/MicroPython/Devices/CircuitPythonDevices.py