From 0c8c76e9305c2ab91697d196bbd0c8e145a2d637 Mon Sep 17 00:00:00 2001 From: Dyredhead Date: Thu, 20 Apr 2023 23:22:11 -0400 Subject: [PATCH 1/6] added a notif pref --- gh/extension.py | 8 +++++--- gh/listeners/preferences.py | 1 + manifest.json | 8 ++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gh/extension.py b/gh/extension.py index 6e091a0..a314f6f 100644 --- a/gh/extension.py +++ b/gh/extension.py @@ -58,6 +58,7 @@ def __init__(self): self.subscribe(ItemEnterEvent, ItemEnterEventListener()) self.icon_path = 'images/icon.png' + self.notifications_enabled = None self.github: Github = None self.user: AuthenticatedUser = None self.cache = Cache(CACHE_DIR) @@ -83,7 +84,7 @@ def fetch_data_from_github(self): sync_service = GitHubDataSync(self.github, self.cache) try: - + self.preferences self.show_notification("Indexing GitHub data") start_time = time.time() @@ -116,11 +117,12 @@ def show_message_no_results(self, search_query): def show_notification(self, text: str): """ - Shows a notification + Shows a notification, if notifications are enabled Args: text (str): The text to display on the notification """ - Notify.Notification.new("Ulauncher GitHub", text).show() + if self.notifications_enabled: + Notify.Notification.new("Ulauncher GitHub", text).show() def handle_github_exception(self, e: GithubException): logger.error(e) diff --git a/gh/listeners/preferences.py b/gh/listeners/preferences.py index 2ccf74f..e11ec3b 100644 --- a/gh/listeners/preferences.py +++ b/gh/listeners/preferences.py @@ -11,6 +11,7 @@ class PreferencesEventListener(EventListener): def on_event(self, event, extension): """ Handle event """ + extension.preferences = event.preferences['os_notifs'] extension.github = Github(event.preferences['access_token']) try: extension.refresh_user() diff --git a/manifest.json b/manifest.json index e881063..cbd8e94 100644 --- a/manifest.json +++ b/manifest.json @@ -105,6 +105,14 @@ "name": "GitHub access token", "description": "The Personal Access token to authenticate on GitHub API", "default_value": "" + }, + { + "id": "os_notifs", + "type": "select", + "name": "Enable Notifications?", + "description": "Should a notification be sent", + "options": {"True": true, "False": false}, + "default_value": "True" } ] } From d1225c598bf7d31a0096dad63fa674c946bdc3bb Mon Sep 17 00:00:00 2001 From: Dyredhead Date: Thu, 20 Apr 2023 23:24:28 -0400 Subject: [PATCH 2/6] added a notif pref --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index cbd8e94..f76f534 100644 --- a/manifest.json +++ b/manifest.json @@ -112,7 +112,7 @@ "name": "Enable Notifications?", "description": "Should a notification be sent", "options": {"True": true, "False": false}, - "default_value": "True" + "default_value": true } ] } From af59b8d4532a6d5dbaebc4e8a4c68a6d2b3d15c8 Mon Sep 17 00:00:00 2001 From: Dyredhead Date: Thu, 20 Apr 2023 23:25:30 -0400 Subject: [PATCH 3/6] added a notif pref --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index f76f534..e071976 100644 --- a/manifest.json +++ b/manifest.json @@ -111,7 +111,7 @@ "type": "select", "name": "Enable Notifications?", "description": "Should a notification be sent", - "options": {"True": true, "False": false}, + "options": [true, false], "default_value": true } ] From 6373eb167b8909f7e6cf55730fde55f0b018d9a9 Mon Sep 17 00:00:00 2001 From: Dyredhead Date: Thu, 20 Apr 2023 23:32:09 -0400 Subject: [PATCH 4/6] fixed bug --- gh/extension.py | 4 ++-- gh/listeners/preferences.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gh/extension.py b/gh/extension.py index a314f6f..8e0b7e7 100644 --- a/gh/extension.py +++ b/gh/extension.py @@ -58,7 +58,7 @@ def __init__(self): self.subscribe(ItemEnterEvent, ItemEnterEventListener()) self.icon_path = 'images/icon.png' - self.notifications_enabled = None + self.os_notifs = None self.github: Github = None self.user: AuthenticatedUser = None self.cache = Cache(CACHE_DIR) @@ -121,7 +121,7 @@ def show_notification(self, text: str): Args: text (str): The text to display on the notification """ - if self.notifications_enabled: + if self.os_notifs: Notify.Notification.new("Ulauncher GitHub", text).show() def handle_github_exception(self, e: GithubException): diff --git a/gh/listeners/preferences.py b/gh/listeners/preferences.py index e11ec3b..afb8f9a 100644 --- a/gh/listeners/preferences.py +++ b/gh/listeners/preferences.py @@ -11,7 +11,7 @@ class PreferencesEventListener(EventListener): def on_event(self, event, extension): """ Handle event """ - extension.preferences = event.preferences['os_notifs'] + extension.os_notifs = event.preferences['os_notifs'] extension.github = Github(event.preferences['access_token']) try: extension.refresh_user() From 96785959ecb466824bbb1978cd345ee951bb3a4d Mon Sep 17 00:00:00 2001 From: Dyredhead Date: Thu, 20 Apr 2023 23:42:14 -0400 Subject: [PATCH 5/6] fixed bug --- gh/listeners/preferences.py | 1 + 1 file changed, 1 insertion(+) diff --git a/gh/listeners/preferences.py b/gh/listeners/preferences.py index afb8f9a..765ec4c 100644 --- a/gh/listeners/preferences.py +++ b/gh/listeners/preferences.py @@ -12,6 +12,7 @@ class PreferencesEventListener(EventListener): def on_event(self, event, extension): """ Handle event """ extension.os_notifs = event.preferences['os_notifs'] + logger.error(extension.os_notifs) extension.github = Github(event.preferences['access_token']) try: extension.refresh_user() From becadbd830490109541812dfd6443de284919171 Mon Sep 17 00:00:00 2001 From: Dyredhead Date: Thu, 20 Apr 2023 23:48:24 -0400 Subject: [PATCH 6/6] fixed bug --- gh/extension.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gh/extension.py b/gh/extension.py index 8e0b7e7..6bc8e95 100644 --- a/gh/extension.py +++ b/gh/extension.py @@ -121,7 +121,7 @@ def show_notification(self, text: str): Args: text (str): The text to display on the notification """ - if self.os_notifs: + if self.os_notifs == "true": Notify.Notification.new("Ulauncher GitHub", text).show() def handle_github_exception(self, e: GithubException):