Mercurial Repositories > MQTT Monitor / file comparison
comparison: MqttMonitor/MqttMonitorWidget.py
MqttMonitor/MqttMonitorWidget.py
- changeset 82
- 4d36daabe993
- parent 78
- a22328182bc2
- child 84
- 044df16e55aa
equal
deleted
inserted
replaced
| 81:74cdf8ae5f66 | 82:4d36daabe993 |
|---|---|
| 444 MqttConnectionProfilesDialog | 444 MqttConnectionProfilesDialog |
| 445 ) | 445 ) |
| 446 dlg = MqttConnectionProfilesDialog( | 446 dlg = MqttConnectionProfilesDialog( |
| 447 self.__client, self.__plugin.getPreferences("BrokerProfiles"), | 447 self.__client, self.__plugin.getPreferences("BrokerProfiles"), |
| 448 parent=self) | 448 parent=self) |
| 449 if dlg.exec_() == QDialog.Accepted: | 449 if dlg.exec() == QDialog.Accepted: |
| 450 profilesDict = dlg.getProfiles() | 450 profilesDict = dlg.getProfiles() |
| 451 self.__plugin.setPreferences("BrokerProfiles", profilesDict) | 451 self.__plugin.setPreferences("BrokerProfiles", profilesDict) |
| 452 self.__populateProfileComboBox() | 452 self.__populateProfileComboBox() |
| 453 else: | 453 else: |
| 454 from .MqttConnectionOptionsDialog import ( | 454 from .MqttConnectionOptionsDialog import ( |
| 455 MqttConnectionOptionsDialog | 455 MqttConnectionOptionsDialog |
| 456 ) | 456 ) |
| 457 dlg = MqttConnectionOptionsDialog( | 457 dlg = MqttConnectionOptionsDialog( |
| 458 self.__client, self.__connectionOptions, parent=self) | 458 self.__client, self.__connectionOptions, parent=self) |
| 459 if dlg.exec_() == QDialog.Accepted: | 459 if dlg.exec() == QDialog.Accepted: |
| 460 self.__connectionOptions = dlg.getConnectionOptions() | 460 self.__connectionOptions = dlg.getConnectionOptions() |
| 461 if self.__connectionOptions["TlsEnable"]: | 461 if self.__connectionOptions["TlsEnable"]: |
| 462 port = self.brokerPortComboBox.currentText().strip() | 462 port = self.brokerPortComboBox.currentText().strip() |
| 463 if port == "1883": | 463 if port == "1883": |
| 464 # it is default non-encrypted port => set to TLS port | 464 # it is default non-encrypted port => set to TLS port |
| 562 os.path.exists(payloadFile) and | 562 os.path.exists(payloadFile) and |
| 563 os.path.getsize(payloadFile) <= 268435455 | 563 os.path.getsize(payloadFile) <= 268435455 |
| 564 ): | 564 ): |
| 565 # payload size limit is 268,435,455 bytes | 565 # payload size limit is 268,435,455 bytes |
| 566 try: | 566 try: |
| 567 f = open(payloadFile, "rb") | 567 with open(payloadFile, "rb") as f: |
| 568 payloadStr = f.read() | 568 payloadStr = f.read() |
| 569 f.close() | |
| 570 except EnvironmentError as err: | 569 except EnvironmentError as err: |
| 571 E5MessageBox.critical( | 570 E5MessageBox.critical( |
| 572 self, | 571 self, |
| 573 self.tr("Read Payload from File"), | 572 self.tr("Read Payload from File"), |
| 574 self.tr("""<p>The file <b>{0}</b> could not be read.""" | 573 self.tr("""<p>The file <b>{0}</b> could not be read.""" |
| 675 if not res: | 674 if not res: |
| 676 return | 675 return |
| 677 | 676 |
| 678 fn = Utilities.toNativeSeparators(fn) | 677 fn = Utilities.toNativeSeparators(fn) |
| 679 try: | 678 try: |
| 680 f = open(fn, "w") | 679 with open(fn, "w") as f: |
| 681 f.write(self.messagesEdit.toPlainText()) | 680 f.write(self.messagesEdit.toPlainText()) |
| 682 f.close() | |
| 683 except EnvironmentError as err: | 681 except EnvironmentError as err: |
| 684 E5MessageBox.critical( | 682 E5MessageBox.critical( |
| 685 self, | 683 self, |
| 686 self.tr("Save Messages"), | 684 self.tr("Save Messages"), |
| 687 self.tr("""<p>The file <b>{0}</b> could not be written.""" | 685 self.tr("""<p>The file <b>{0}</b> could not be written.""" |
| 732 if not res: | 730 if not res: |
| 733 return | 731 return |
| 734 | 732 |
| 735 fn = Utilities.toNativeSeparators(fn) | 733 fn = Utilities.toNativeSeparators(fn) |
| 736 try: | 734 try: |
| 737 f = open(fn, "w") | 735 with open(fn, "w") as f: |
| 738 f.write(self.logEdit.toPlainText()) | 736 f.write(self.logEdit.toPlainText()) |
| 739 f.close() | |
| 740 except EnvironmentError as err: | 737 except EnvironmentError as err: |
| 741 E5MessageBox.critical( | 738 E5MessageBox.critical( |
| 742 self, | 739 self, |
| 743 self.tr("Save Log Messages"), | 740 self.tr("Save Log Messages"), |
| 744 self.tr("""<p>The file <b>{0}</b> could not be written.""" | 741 self.tr("""<p>The file <b>{0}</b> could not be written.""" |
