kadu/gotify-tray-customized
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify VerifyServerInfoTask

Browse Source
This commit is contained in:
dries.k
2024-05-18 00:04:04 +02:00
parent 8f2203d47a
commit 7f10d0c0a1
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gotify_tray/gui/widgets/ServerInfoDialog.py
View File

@@ -44,18 +44,16 @@ class ServerInfoDialog(QtWidgets.QDialog, Ui_Dialog):
self.task.incorrect_url.connect(self.incorrect_url_callback) self.task.incorrect_url.connect(self.incorrect_url_callback)
self.task.start() self.task.start()
def server_info_success(self, version: GotifyVersionModel): def server_info_success(self):
self.pb_test.setEnabled(True) self.pb_test.setEnabled(True)
self.label_server_info.setText(f"Version: {version.version}")
update_widget_property(self.pb_test, "state", "success") update_widget_property(self.pb_test, "state", "success")
update_widget_property(self.line_token, "state", "success") update_widget_property(self.line_token, "state", "success")
update_widget_property(self.line_url, "state", "success") update_widget_property(self.line_url, "state", "success")
self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setEnabled(True) self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setEnabled(True)
self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setFocus() self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setFocus()
def incorrect_token_callback(self, version: GotifyVersionModel): def incorrect_token_callback(self):
self.pb_test.setEnabled(True) self.pb_test.setEnabled(True)
self.label_server_info.setText(f"Version: {version.version}")
update_widget_property(self.pb_test, "state", "failed") update_widget_property(self.pb_test, "state", "failed")
update_widget_property(self.line_token, "state", "failed") update_widget_property(self.line_token, "state", "failed")
update_widget_property(self.line_url, "state", "success") update_widget_property(self.line_url, "state", "success")

13
gotify_tray/tasks.py
View File

@@ -171,8 +171,8 @@ class ProcessMessageTask(BaseTask):
class VerifyServerInfoTask(BaseTask): class VerifyServerInfoTask(BaseTask):
success = pyqtSignal(GotifyVersionModel) success = pyqtSignal()
incorrect_token = pyqtSignal(GotifyVersionModel) incorrect_token = pyqtSignal()
incorrect_url = pyqtSignal() incorrect_url = pyqtSignal()
def __init__(self, url: str, client_token: str): def __init__(self, url: str, client_token: str):
@@ -184,21 +184,16 @@ class VerifyServerInfoTask(BaseTask):
try: try:
gotify_client = gotify.GotifyClient(self.url, self.client_token) gotify_client = gotify.GotifyClient(self.url, self.client_token)
version = gotify_client.version()
if isinstance(version, gotify.GotifyErrorModel):
self.incorrect_url.emit()
return
result = gotify_client.get_messages(limit=1) result = gotify_client.get_messages(limit=1)
if isinstance(result, gotify.GotifyPagedMessagesModel): if isinstance(result, gotify.GotifyPagedMessagesModel):
self.success.emit(version) self.success.emit()
return return
elif ( elif (
isinstance(result, gotify.GotifyErrorModel) isinstance(result, gotify.GotifyErrorModel)
and result["error"] == "Unauthorized" and result["error"] == "Unauthorized"
): ):
self.incorrect_token.emit(version) self.incorrect_token.emit()
return return
self.incorrect_url.emit() self.incorrect_url.emit()
except Exception as e: except Exception as e: