diff --git a/src/revpicommander/backgroundworker.py b/src/revpicommander/backgroundworker.py index 2eba87f..ae04926 100644 --- a/src/revpicommander/backgroundworker.py +++ b/src/revpicommander/backgroundworker.py @@ -18,7 +18,8 @@ class BackgroundWorker(QtCore.QThread): steps_done = QtCore.pyqtSignal(int) status_message = QtCore.pyqtSignal(str) - def __init__(self, parent=None): + def __init__(self, parent=None, interruption_text: str = None): + self._interruption_text = interruption_text or self.tr("User requested cancellation...") super(BackgroundWorker, self).__init__(parent) def check_cancel(self) -> bool: @@ -28,33 +29,67 @@ class BackgroundWorker(QtCore.QThread): :return: True, if interruption was requested """ if self.isInterruptionRequested(): - self.status_message.emit(self.tr("User requested cancellation...")) + self.status_message.emit(self._interruption_text) self.msleep(750) return True return False - def exec_dialog(self) -> int: + def exec_dialog(self, window_title="", can_cancel=True) -> int: + """ + Show dialog with progress bar. + + :param window_title: Title of Dialog window + :param can_cancel: If False, the cancel button is deactivated + :return: Dialog result + """ diag = WorkerDialog(self, self.parent()) + diag.setWindowTitle(window_title) + diag.btn_box.setEnabled(can_cancel) rc = diag.exec() diag.deleteLater() return rc - def wait_interruptable(self, seconds=-1) -> None: - """Save function to wait and get the cancel buttons.""" + def wait_interruptable(self, seconds=-1) -> bool: + """ + Save function to wait and get the cancel buttons. + + :param seconds: Wait this amount of seconds + :return: True, if interruption was requested + """ counter = seconds * 4 while counter != 0: counter -= 1 self.msleep(250) if self.check_cancel(): - break + return True + return False def run(self) -> None: - """Worker thread to import pictures from camera.""" - log.debug("BackgroundWorker.run") - self.status_message.emit("Started dummy thread...") - self.wait_interruptable(5) - self.status_message.emit("Completed dummy thread.") - self.wait_interruptable(2) + """Override this function with your logic.""" + raise NotImplementedError() + + +class BackgroundWaiter(BackgroundWorker): + """Just wait an amount of time and show progress bar.""" + + def __init__(self, seconds: int, status_message: str, parent=None, interruption_text: str = None): + self._status_message = status_message + self._wait_steps = seconds * 4 + super().__init__(parent, interruption_text) + + def run(self) -> None: + log.debug("BackgroundWaiter.run") + self.steps_todo.emit(self._wait_steps) + self.status_message.emit(self._status_message) + counter = 0 + while counter <= self._wait_steps: + counter += 1 + self.msleep(250) + if self.isInterruptionRequested(): + self.steps_done.emit(self._wait_steps) + if self.check_cancel(): + return + self.steps_done.emit(counter) class WorkerDialog(QtWidgets.QDialog, Ui_diag_backgroundworker): diff --git a/src/revpicommander/helper.py b/src/revpicommander/helper.py index d177dc5..3f66324 100644 --- a/src/revpicommander/helper.py +++ b/src/revpicommander/helper.py @@ -15,12 +15,11 @@ from threading import Lock from uuid import uuid4 from xmlrpc.client import Binary, ServerProxy -from PyQt5 import QtCore, QtWidgets +from PyQt5 import QtCore from paramiko.ssh_exception import AuthenticationException from . import proginit as pi from .ssh_tunneling.server import SSHLocalTunnel -from .sshauth import SSHAuth settings = QtCore.QSettings("revpimodio.org", "RevPiCommander") """Global application settings.""" @@ -29,6 +28,12 @@ homedir = environ.get("HOME", "") or environ.get("APPDATA", "") """Home dir of user.""" +class ConnectionFail(IntEnum): + NO_XML_RPC = 1 + SSH_CONNECT = 2 + SSH_AUTH = 4 + + class WidgetData(IntEnum): address = 260 acl_level = 262 @@ -194,6 +199,8 @@ class RevPiSettings: class ConnectionManager(QtCore.QThread): """Check connection and status for PLC program on Revolution Pi.""" + connect_error = QtCore.pyqtSignal(str, str, ConnectionFail, RevPiSettings) + """Error header, message and reason (ConnectionFail) of a new connection after pyload_connect call.""" connection_established = QtCore.pyqtSignal() """New connection established successfully with .""" connection_disconnected = QtCore.pyqtSignal() @@ -311,12 +318,12 @@ class ConnectionManager(QtCore.QThread): self.xml_funcs.clear() self.xml_mode = -1 - def pyload_connect(self, revpi_settings: RevPiSettings, parent=None) -> bool: + def pyload_connect(self, revpi_settings: RevPiSettings, ssh_pass="") -> bool: """ Create a new connection from settings object. :param revpi_settings: Revolution Pi saved connection settings - :param parent: Qt parent window for dialog positioning + :param ssh_pass: Use this ssh password, if revpi_settings.ssh_use_tunnel is true :return: True, if the connection was successfully established """ @@ -325,52 +332,38 @@ class ConnectionManager(QtCore.QThread): ssh_tunnel_server = None ssh_tunnel_port = 0 - ssh_pass = "" - socket.setdefaulttimeout(2) + socket.setdefaulttimeout(revpi_settings.timeout) if revpi_settings.ssh_use_tunnel: - while True: - diag_ssh_auth = SSHAuth( - revpi_settings.ssh_user, - "{0}.{1}_{2}".format( - settings.applicationName(), - settings.organizationName(), - revpi_settings.internal_id), - parent, + ssh_tunnel_server = SSHLocalTunnel( + revpi_settings.port, + revpi_settings.address, + revpi_settings.ssh_port + ) + try: + ssh_tunnel_port = ssh_tunnel_server.connect_by_credentials(revpi_settings.ssh_user, ssh_pass) + except AuthenticationException: + self.connect_error.emit( + self.tr("Error"), self.tr( + "The combination of username and password was rejected from the SSH server.\n\n" + "Try again." + ), + ConnectionFail.SSH_AUTH, + revpi_settings, ) - if not diag_ssh_auth.exec() == QtWidgets.QDialog.Accepted: - self._clear_settings() - return False - - ssh_user = diag_ssh_auth.username - ssh_pass = diag_ssh_auth.password - ssh_tunnel_server = SSHLocalTunnel( - revpi_settings.port, - revpi_settings.address, - revpi_settings.ssh_port + return False + except Exception as e: + # todo: Check some more kinds of exceptions and nice user info + self._clear_settings() + self.connect_error.emit( + self.tr("Error"), self.tr( + "Could not establish a SSH connection to server:\n\n{0}" + ).format(str(e)), + ConnectionFail.SSH_CONNECT, + revpi_settings, ) - revpi_settings.ssh_saved_password = diag_ssh_auth.in_keyring - try: - ssh_tunnel_port = ssh_tunnel_server.connect_by_credentials(ssh_user, ssh_pass) - break - except AuthenticationException: - diag_ssh_auth.remove_saved_password() - QtWidgets.QMessageBox.critical( - parent, self.tr("Error"), self.tr( - "The combination of username and password was rejected from the SSH server.\n\n" - "Try again." - ) - ) - except Exception as e: - # todo: Check some more kinds of exceptions and nice user info - self._clear_settings() - QtWidgets.QMessageBox.critical( - parent, self.tr("Error"), self.tr( - "Could not establish a SSH connection to server:\n\n{0}" - ).format(str(e)) - ) - return False + return False sp = ServerProxy("http://127.0.0.1:{0}".format(ssh_tunnel_port)) @@ -386,17 +379,30 @@ class ConnectionManager(QtCore.QThread): pi.logger.exception(e) self.connection_error_observed.emit(str(e)) - if not revpi_settings.ssh_use_tunnel: + if revpi_settings.ssh_use_tunnel: + self.connect_error.emit( + self.tr("Error"), self.tr( + "Can not connect to RevPi XML-RPC Service through SSH tunnel! \n\n" + "This could have the following reasons: The XML-RPC service is not " + "running / not bind to localhost or the ACL permission is not set for " + "127.0.0.1!!!" + ), + ConnectionFail.NO_XML_RPC, + revpi_settings, + ) + else: # todo: Change message, that user can use ssh - QtWidgets.QMessageBox.critical( - parent, self.tr("Error"), self.tr( + self.connect_error.emit( + self.tr("Error"), self.tr( "Can not connect to RevPi XML-RPC Service! \n\n" "This could have the following reasons: The RevPi is not " "online, the XML-RPC service is not running / bind to " "localhost or the ACL permission is not set for your " "IP!!!\n\nRun 'sudo revpipyload_secure_installation' on " "Revolution Pi to setup this function!" - ) + ), + ConnectionFail.NO_XML_RPC, + revpi_settings, ) return False @@ -408,7 +414,6 @@ class ConnectionManager(QtCore.QThread): self.xml_mode = xml_mode with self._lck_cli: - socket.setdefaulttimeout(revpi_settings.timeout) self.ssh_tunnel_server = ssh_tunnel_server self._cli = sp self._cli_connect.put_nowait(( @@ -686,7 +691,8 @@ def import_old_settings(): revpi_setting = RevPiSettings(i, settings_storage=old_settings) revpi_setting._settings = settings revpi_setting.save_settings() - except Exception as e: + except Exception: pi.logger.warning("Could not import saved connection {0}".format(i)) + import_old_settings() diff --git a/src/revpicommander/locale/revpicommander_de.qm b/src/revpicommander/locale/revpicommander_de.qm index a8afc7e..9a28263 100644 Binary files a/src/revpicommander/locale/revpicommander_de.qm and b/src/revpicommander/locale/revpicommander_de.qm differ diff --git a/src/revpicommander/locale/revpicommander_de.ts b/src/revpicommander/locale/revpicommander_de.ts index d39e7dc..96680c0 100644 --- a/src/revpicommander/locale/revpicommander_de.ts +++ b/src/revpicommander/locale/revpicommander_de.ts @@ -93,70 +93,198 @@ Nicht gespeicherte Änderunen gehen verloren Der ausgewählte RevPi ist schon in der Verbindungsliste als '{0}'. - + over SSH über SSH + + ConnectingPyload + + + Simulator started... + Simulator gestartet... + + + + The simulator is running! + +You can work with this simulator if your call RevPiModIO with this additional parameters: +procimg={0} +configrsc={1} + +You can copy that from header textbox. + Der Simulator läuft! + +Du kannst mit der Simulation arbeiten, wenn du RevPiModIO mit diesen zusätzlichen Parametern instantiierst: +procimg={0} +configrsc={1} + +Dies kann aus der Textbox oben kopiert werden. + + + + Can not start... + Kann nicht gestartet werden... + + + + Can not start the simulator! Maybe the piCtory file is corrupt or you have no write permissions for '{0}'. + Kann Simulator nicht starten! Vielleicht ist die piCtory Datei defekt oder es gibt keine Schreibberechtigung für '{0}'. + + + + Warning + Warnung + + + + This version of Logviewer ist not supported in version {0} of RevPiPyLoad on your RevPi! You need at least version 0.4.1. + Diese Version vom Logbetrachter wird in RevPiPyLoad Version {0} nicht unterstützt! Es wird mindestens Version 0.4.1 benötigt. + + + + XML-RPC access mode in the RevPiPyLoad configuration is too small to access this dialog! + XML-RPC Zugriffsberechtigung in der RevPiPyLoad Konfiguraiton ist zu klein für diese Einstellungen! + + + + Error + Fehler + + + + The Version of RevPiPyLoad on your Revolution Pi ({0}) is to old. This Version of RevPiCommander require at least version 0.6.0 of RevPiPyLoad. Please update your Revolution Pi! + Die Version von RevPiPyLoad ({0}) auf dem Revolution Pi ist zu alt. Diese Version vom RevPiCommander braucht mindestens Version 0.6.0. Bitte aktualisiere deinen Revolution Pi! + + + + Question + Frage + + + + Are you sure to reset piControl? +The pictory configuration will be reloaded. During that time the process image will be interrupted and could rise errors on running control programs! + Soll piControl wirklich zurückgesetzt werden? +Die piCtory Konfiguration wird neu geladen. Das Prozessabbild wird in dieser Zeit nicht verfügbar sein und es könnten Fehler in Steuerungsprogrammen ausgelöst werden! + + + + Success + Erfolgreich + + + + piControl reset executed successfully + piControl wurde erfolgreich zurückgesetzt + + + + piControl reset could not be executed successfully + piControl konnte nicht zurückgesetzt werden + + + + Reset to piCtory defaults... + Standardwerte von piCtory laden... + + + + Do you want to reset your process image to {0} values? +You have to stop other RevPiModIO programs before doing that, because they could reset the outputs. + Soll das virtuelle Prozessabbild auf {0} zurückgesetzt werden? +Es sollten alle RevPiModIO Programme vorher beendet werden, da diese ihre IO Werte sofort wieder schreiben würden. + + + + zero + null + + + + piCtory default + piCtory Standardwerte + + + + The watch mode ist not supported in version {0} of RevPiPyLoad on your RevPi! You need at least version 0.5.3! Maybe the python3-revpimodio2 module is not installed on your RevPi at least version 2.0.0. + Der SPS Betrachter ist in Version {0} von RevPiPyLoad auf dem Rev Pi nicht unterstützt! Es muss mindestens Version 0.5.3 installiert sein! Vielleicht fehlt auch das python3-revpimodio2 Modul, welches mindestens Version 2.0.0 haben muss. + + + + Can not load this function, because your ACL level is to low! +You need at least level 1 to read or level 3 to write. + Für diese Funktion ist das Berechtigungslevel zu gering! +Es muss mindestens Level 1 zum Lesen oder Level 3 zu Schreiben sein. + + + + Can not load piCtory configuration. +Did you create a hardware configuration? Please check this in piCtory! + Kann piCtory Konfiguration nicht laden. +Wurde eine Hardwarekonfiguration in piCtory erzeugt? + + ConnectionManager - + SIMULATING SIMULATION - + NOT CONNECTED NICHT VERBUNDEN - + SERVER ERROR SERVER FEHLER - + RUNNING LÄUFT - + PLC FILE NOT FOUND SPS PROGRAMM NICHT GEFUNDEN - + NOT RUNNING (NO STATUS) LÄUFT NICHT (KEIN STATUS) - + PROGRAM KILLED PROGRAMM GETÖTET - + PROGRAM TERMED PROGRAMM BEENDET - + NOT RUNNING LÄUFT NICHT - + FINISHED WITH CODE {0} BEENDET MIT CODE {0} - + Error Fehler - + The combination of username and password was rejected from the SSH server. Try again. @@ -165,7 +293,7 @@ Try again. Bitte erneut versuchen. - + Could not establish a SSH connection to server: {0} @@ -174,7 +302,7 @@ Bitte erneut versuchen. {0} - + Can not connect to RevPi XML-RPC Service! This could have the following reasons: The RevPi is not online, the XML-RPC service is not running / bind to localhost or the ACL permission is not set for your IP!!! @@ -186,6 +314,24 @@ Das kann eine der folgenden Ursachen haben: Der Rev Pi ist nicht online, der XML Führe 'sudo revpipyload_secure_installation' auf dem Revolution Pi aus um diese Funktion zu konfigurieren! + + + Can not connect to RevPi XML-RPC Service through SSH tunnel! + +This could have the following reasons: The XML-RPC service is not running / bind to localhost or the ACL permission is not set for 127.0.0.1!!! + Kann keine Verbindung zum RevPi XML-RPC Dienst herstellen! + +Das kann eine der folgenden Ursachen haben: Der XML-RPC Dienst läuft nicht / ist nicht an localhost gebunden order die Berechtigungen sind nicht für 127.0.0.1 gesetzt!!! + + + + Can not connect to RevPi XML-RPC Service through SSH tunnel! + +This could have the following reasons: The XML-RPC service is not running / not bind to localhost or the ACL permission is not set for 127.0.0.1!!! + Kann keine Verbindung zum RevPi XML-RPC Dienst über SSH herstellen! + +Das kann eine der folgenden Ursachen haben: Der XML-RPC Dienst läuft nicht / ist nicht an localhost gebunden order die Berechtigungen sind nicht für 127.0.0.1 gesetzt!!! + DebugControl @@ -283,90 +429,90 @@ Ungesicherte Änderungen gehen verloren. RevPiCommander - + Simulator started... Simulator gestartet... - + Can not start... Kann nicht gestartet werden... - + Warning Warnung - + This version of Logviewer ist not supported in version {0} of RevPiPyLoad on your RevPi! You need at least version 0.4.1. Diese Version vom Logbetrachter wird in RevPiPyLoad Version {0} nicht unterstützt! Es wird mindestens Version 0.4.1 benötigt. - + XML-RPC access mode in the RevPiPyLoad configuration is too small to access this dialog! XML-RPC Zugriffsberechtigung in der RevPiPyLoad Konfiguraiton ist zu klein für diese Einstellungen! - + Error Fehler - + The Version of RevPiPyLoad on your Revolution Pi ({0}) is to old. This Version of RevPiCommander require at least version 0.6.0 of RevPiPyLoad. Please update your Revolution Pi! Die Version von RevPiPyLoad ({0}) auf dem Revolution Pi ist zu alt. Diese Version vom RevPiCommander braucht mindestens Version 0.6.0. Bitte aktualisiere deinen Revolution Pi! - + Question Frage - + Are you sure to reset piControl? The pictory configuration will be reloaded. During that time the process image will be interrupted and could rise errors on running control programs! Soll piControl wirklich zurückgesetzt werden? Die piCtory Konfiguration wird neu geladen. Das Prozessabbild wird in dieser Zeit nicht verfügbar sein und es könnten Fehler in Steuerungsprogrammen ausgelöst werden! - + Success Erfolgreich - + piControl reset executed successfully piControl wurde erfolgreich zurückgesetzt - + piControl reset could not be executed successfully piControl konnte nicht zurückgesetzt werden - + Reset to piCtory defaults... Standardwerte von piCtory laden... - + The watch mode ist not supported in version {0} of RevPiPyLoad on your RevPi! You need at least version 0.5.3! Maybe the python3-revpimodio2 module is not installed on your RevPi at least version 2.0.0. Der SPS Betrachter ist in Version {0} von RevPiPyLoad auf dem Rev Pi nicht unterstützt! Es muss mindestens Version 0.5.3 installiert sein! Vielleicht fehlt auch das python3-revpimodio2 Modul, welches mindestens Version 2.0.0 haben muss. - + Can not load this function, because your ACL level is to low! You need at least level 1 to read or level 3 to write. Für diese Funktion ist das Berechtigungslevel zu gering! Es muss mindestens Level 1 zum Lesen oder Level 3 zu Schreiben sein. - + Can not load piCtory configuration. Did you create a hardware configuration? Please check this in piCtory! Kann piCtory Konfiguration nicht laden. -Wurde eine Hardwarekonfiguration in piCtory erzeugt? +Wurde eine Hardwarekonfiguration in piCtory erzeugt? Bitte prüfe dies in piCtory! @@ -382,7 +528,7 @@ Das kann eine der folgenden Ursachen haben: Der Rev Pi ist nicht online, der XML Führe 'sudo revpipyload_secure_installation' auf dem Revolution Pi aus um diese Funktion zu konfigurieren! - + The simulator is running! You can work with this simulator if your call RevPiModIO with this additional parameters: @@ -399,27 +545,42 @@ configrsc={1} Dies kann aus der Textbox oben kopiert werden. - + Can not start the simulator! Maybe the piCtory file is corrupt or you have no write permissions for '{0}'. Kann Simulator nicht starten! Vielleicht ist die piCtory Datei defekt oder es gibt keine Schreibberechtigung für '{0}'. - + Do you want to reset your process image to {0} values? You have to stop other RevPiModIO programs before doing that, because they could reset the outputs. Soll das virtuelle Prozessabbild auf {0} zurückgesetzt werden? Es sollten alle RevPiModIO Programme vorher beendet werden, da diese ihre IO Werte sofort wieder schreiben würden. - + zero null - + piCtory default piCtory Standardwerte + + + Revolution Pi connected! + Revolution Pi verbunden! + + + + Connecting... + Verbinde... + + + + Establish a connection to the Revolution Pi... + Baue eine Verbindung zum Revolution Pi auf... + RevPiFiles @@ -547,6 +708,11 @@ Wählen Sie 'Ja' zum Überschreiben, 'Nein' um nur fehlende Choose a local directory first. Lokales Verzeichnis wählen. + + + File transfer... + Dateiübertragung... + RevPiInfo @@ -668,12 +834,12 @@ Ungesicherte Änderungen gehen verloren. Neue Verbindung - + Question Frage - + Do you really want to quit? Unsaved changes will be lost. Soll das Fenster wirklich geschlossen werden? @@ -955,12 +1121,12 @@ Dies ist kein Fehler, wenn das SPS Startprogramm bereits auf dem Rev Pi ist. Pr SSHAuth - + Could not save password Konnte Kennwort nicht speichern - + Could not save password to operating systems password save. Maybe your operating system does not support saving passwords. This could be due to missing libraries or programs. @@ -1049,7 +1215,7 @@ Dies ist kein Fehler von RevPi Commander. File transfer... - Dateiübertragung... + Dateiübertragung... @@ -1684,25 +1850,30 @@ applicable law. SSH Authentifizierung - + SSH username: SSH Benutzername: - + SSH password: SSH Passwort: - + Username and password will be saved in secured operating systems's password storage. Benutzername und Kennwort werden im Passwortspeicher vom Betriebssystem gesichert. - + Save username and password Benutzername und Kennwort merken + + + Note: The default user for SSH is "pi" which differs from the web configuration. You can find the password on the sticker on the device. + Hinweis: Der Standardbenutzer für SSH ist "pi" dies weicht von der Web-Konfiguration ab. Das Kennwort finden sie auf dem Aufkleber am Gerät. + wid_debugcontrol diff --git a/src/revpicommander/revpicommander.py b/src/revpicommander/revpicommander.py index b5a2bdb..d85d500 100644 --- a/src/revpicommander/revpicommander.py +++ b/src/revpicommander/revpicommander.py @@ -11,22 +11,42 @@ from os.path import dirname, join from PyQt5 import QtCore, QtGui, QtWidgets +from revpicommander.backgroundworker import BackgroundWaiter from . import __version__ from . import helper from . import proginit as pi from . import revpilogfile from .avahisearch import AvahiSearch from .debugcontrol import DebugControl -from .helper import RevPiSettings +from .helper import ConnectionFail, RevPiSettings from .revpifiles import RevPiFiles from .revpiinfo import RevPiInfo from .revpioption import RevPiOption from .revpiplclist import RevPiPlcList from .revpiprogram import RevPiProgram from .simulator import Simulator +from .sshauth import SSHAuth from .ui.revpicommander_ui import Ui_win_revpicommander +class ConnectingPyload(QtCore.QThread): + """ + Try to establish a connection in background. + + The pyload_connect function will emit signals for error or successful connect. This + signals will be used to show error messages and return to this function, if the + authentication failed. + """ + + def __init__(self, revpi_settings: RevPiSettings, ssh_password="", parent=None): + super().__init__(parent) + self._revpi_settings = revpi_settings + self._ssh_password = ssh_password + + def run(self) -> None: + helper.cm.pyload_connect(self._revpi_settings, self._ssh_password) + + class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander): """Main application of RevPiCommander.""" @@ -56,6 +76,7 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander): self.btn_plc_logs.clicked.connect(self.on_act_logs_triggered) + helper.cm.connect_error.connect(self.on_cm_connect_error) helper.cm.connection_disconnected.connect(self.on_cm_connection_disconnected) helper.cm.connection_disconnecting.connect(self.on_cm_connection_disconnecting) helper.cm.connection_established.connect(self.on_cm_connection_established) @@ -97,6 +118,21 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander): # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # region # REGION: Connection management + @QtCore.pyqtSlot(str, str, ConnectionFail, RevPiSettings) + def on_cm_connect_error(self, title: str, text: str, fail_code: ConnectionFail, revpi_settings: RevPiSettings): + """ + Slot to get information of pyload_connect connection errors. + + :param title: Title of error message + :param text: Text of error message + :param fail_code: Type of error + :param revpi_settings: Settings of the revpi with the error + """ + QtWidgets.QMessageBox.critical(self, title, text) + if fail_code is ConnectionFail.SSH_AUTH: + # On failed credentials, we try to connect again and remove password form keychain, if exists + self._pyload_connect(revpi_settings, True) + @QtCore.pyqtSlot(str) def on_cm_connection_error_observed(self, message: str): """ @@ -188,6 +224,54 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander): act.setToolTip("{0}:{1}".format(settings.address, settings.port)) parent_menu.addAction(act) + def _pyload_connect(self, revpi_settings: RevPiSettings, remove_saved_ssh_password=False): + """ + Try to async establish a connection to Revolution Pi. + + :param revpi_settings: RevPi settings object + :param remove_saved_ssh_password: Remove password from keychain + """ + ssh_password = "" + + diag_connecting = BackgroundWaiter( + revpi_settings.timeout, + self.tr("Establish a connection to the Revolution Pi..."), + self, + self.tr("Revolution Pi connected!"), + ) + helper.cm.connection_established.connect(diag_connecting.requestInterruption) + + if revpi_settings.ssh_use_tunnel: + diag_ssh_auth = SSHAuth( + revpi_settings.ssh_user, + "{0}.{1}_{2}".format( + helper.settings.applicationName(), + helper.settings.organizationName(), + revpi_settings.internal_id), + self, + ) + + if remove_saved_ssh_password and revpi_settings.ssh_saved_password: + diag_ssh_auth.remove_saved_password() + revpi_settings.ssh_saved_password = False + + # Doesn't matter what user selects, we have to save settings to sync keychain and values + if diag_ssh_auth.exec() != QtWidgets.QDialog.Accepted: + revpi_settings.save_settings() + return + + revpi_settings.ssh_saved_password = diag_ssh_auth.in_keyring + revpi_settings.ssh_user = diag_ssh_auth.username + ssh_password = diag_ssh_auth.password + revpi_settings.save_settings() + + # Connect in background and show the connecting dialog to user + th_connecting = ConnectingPyload(revpi_settings, ssh_password, self) + th_connecting.finished.connect(diag_connecting.requestInterruption) + th_connecting.start() + + diag_connecting.exec_dialog(self.tr("Connecting..."), False) + @QtCore.pyqtSlot() def on_act_connections_triggered(self): """Edit saved connections to Revolution Pi devices.""" @@ -202,7 +286,7 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander): if self.diag_search.just_save: self.diag_connections.exec_with_presets(self.diag_search.connect_settings) else: - helper.cm.pyload_connect(self.diag_search.connect_settings, self) + self._pyload_connect(self.diag_search.connect_settings) self._load_men_connections() @@ -361,7 +445,7 @@ class RevPiCommander(QtWidgets.QMainWindow, Ui_win_revpicommander): @QtCore.pyqtSlot(QtWidgets.QAction) def on_men_connections_triggered(self, action: QtWidgets.QAction): """A connection is selected in the men_connections menu.""" - helper.cm.pyload_connect(action.data(), self) + self._pyload_connect(action.data()) @QtCore.pyqtSlot() def on_act_webpage_triggered(self): diff --git a/src/revpicommander/revpifiles.py b/src/revpicommander/revpifiles.py index 8f53aba..44dea56 100644 --- a/src/revpicommander/revpifiles.py +++ b/src/revpicommander/revpifiles.py @@ -124,7 +124,7 @@ class RevPiFiles(QtWidgets.QMainWindow, Ui_win_files): return uploader = UploadFiles(self.file_list_local(), self) - if uploader.exec_dialog() == QtWidgets.QDialog.Rejected: + if uploader.exec_dialog(self.tr("File transfer...")) == QtWidgets.QDialog.Rejected: return if uploader.ec == 0: diff --git a/src/revpicommander/ui/backgroundworker_ui.py b/src/revpicommander/ui/backgroundworker_ui.py index fa0db51..f832987 100644 --- a/src/revpicommander/ui/backgroundworker_ui.py +++ b/src/revpicommander/ui/backgroundworker_ui.py @@ -14,7 +14,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets class Ui_diag_backgroundworker(object): def setupUi(self, diag_backgroundworker): diag_backgroundworker.setObjectName("diag_backgroundworker") - diag_backgroundworker.resize(418, 97) + diag_backgroundworker.resize(424, 104) diag_backgroundworker.setModal(True) self.verticalLayout = QtWidgets.QVBoxLayout(diag_backgroundworker) self.verticalLayout.setObjectName("verticalLayout") @@ -37,8 +37,7 @@ class Ui_diag_backgroundworker(object): QtCore.QMetaObject.connectSlotsByName(diag_backgroundworker) def retranslateUi(self, diag_backgroundworker): - _translate = QtCore.QCoreApplication.translate - diag_backgroundworker.setWindowTitle(_translate("diag_backgroundworker", "File transfer...")) + pass if __name__ == "__main__": diff --git a/src/revpicommander/ui/sshauth_ui.py b/src/revpicommander/ui/sshauth_ui.py index 5e1f17f..3bda06c 100644 --- a/src/revpicommander/ui/sshauth_ui.py +++ b/src/revpicommander/ui/sshauth_ui.py @@ -15,8 +15,9 @@ class Ui_diag_sshauth(object): def setupUi(self, diag_sshauth): diag_sshauth.setObjectName("diag_sshauth") diag_sshauth.setWindowModality(QtCore.Qt.ApplicationModal) - diag_sshauth.resize(363, 163) + diag_sshauth.resize(331, 225) self.verticalLayout = QtWidgets.QVBoxLayout(diag_sshauth) + self.verticalLayout.setSizeConstraint(QtWidgets.QLayout.SetFixedSize) self.verticalLayout.setObjectName("verticalLayout") self.wid_password = QtWidgets.QWidget(diag_sshauth) self.wid_password.setObjectName("wid_password") @@ -44,6 +45,16 @@ class Ui_diag_sshauth(object): self.btn_box.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok) self.btn_box.setObjectName("btn_box") self.verticalLayout.addWidget(self.btn_box) + self.lbl_info = QtWidgets.QLabel(diag_sshauth) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.lbl_info.sizePolicy().hasHeightForWidth()) + self.lbl_info.setSizePolicy(sizePolicy) + self.lbl_info.setWordWrap(True) + self.lbl_info.setObjectName("lbl_info") + self.verticalLayout.addWidget(self.lbl_info) + self.verticalLayout.setStretch(3, 1) self.retranslateUi(diag_sshauth) self.btn_box.accepted.connect(diag_sshauth.accept) # type: ignore @@ -57,6 +68,7 @@ class Ui_diag_sshauth(object): self.lbl_password.setText(_translate("diag_sshauth", "SSH password:")) self.cbx_save_password.setToolTip(_translate("diag_sshauth", "Username and password will be saved in secured operating systems\'s password storage.")) self.cbx_save_password.setText(_translate("diag_sshauth", "Save username and password")) + self.lbl_info.setText(_translate("diag_sshauth", "Note: The default user for SSH is \"pi\" which differs from the web configuration. You can find the password on the sticker on the device.")) if __name__ == "__main__": diff --git a/ui_dev/backgroundworker.ui b/ui_dev/backgroundworker.ui index ceedc0a..67b7841 100644 --- a/ui_dev/backgroundworker.ui +++ b/ui_dev/backgroundworker.ui @@ -6,13 +6,10 @@ 0 0 - 418 - 97 + 424 + 104 - - File transfer... - true diff --git a/ui_dev/sshauth.ui b/ui_dev/sshauth.ui index 3b821e0..2c061b1 100644 --- a/ui_dev/sshauth.ui +++ b/ui_dev/sshauth.ui @@ -9,14 +9,17 @@ 0 0 - 363 - 163 + 331 + 225 SSH authentication - + + + QLayout::SetFixedSize + @@ -67,6 +70,22 @@ + + + + + 0 + 0 + + + + Note: The default user for SSH is "pi" which differs from the web configuration. You can find the password on the sticker on the device. + + + true + + +