From 9170d93b31293c47b465e050e3abebd21e652ad9 Mon Sep 17 00:00:00 2001 From: Radded Date: Wed, 10 Apr 2024 13:38:19 -0400 Subject: [PATCH 1/9] feat: clock plugin support for WaveShare 2.7 inch display --- clock.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/clock.py b/clock.py index a801b82..dd2688c 100644 --- a/clock.py +++ b/clock.py @@ -44,6 +44,11 @@ def on_ui_setup(self, ui): ui.add_element('clock', LabeledValue(color=BLACK, label='', value='-/-/-\n-:--', position=pos, label_font=fonts.Small, text_font=fonts.Small)) + elif ui.is_waveshare27inch(): + pos = (145, 138) if memenable else (215, 138) + ui.add_element('clock', LabeledValue(color=BLACK, label='', value='-/-/-\n-:--', + position=pos, + label_font=fonts.Small, text_font=fonts.Small)) def on_ui_update(self, ui): now = datetime.datetime.now() From b8ecea3432af8c4c3840c71124de1d187b03d76a Mon Sep 17 00:00:00 2001 From: Radded Date: Wed, 10 Apr 2024 19:39:23 -0400 Subject: [PATCH 2/9] adjusted some plugin call times for discord, auto_backup --- auto_backup.py | 2 +- discord.py | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/auto_backup.py b/auto_backup.py index f716ec6..152d6c5 100644 --- a/auto_backup.py +++ b/auto_backup.py @@ -25,7 +25,7 @@ def on_loaded(self): self.ready = True logging.info("AUTO-BACKUP: Successfully loaded.") - def on_internet_available(self, agent): + def on_sleep(self, agent): if not self.ready: return diff --git a/discord.py b/discord.py index 70a24c2..73f6fe2 100644 --- a/discord.py +++ b/discord.py @@ -34,8 +34,17 @@ def on_loaded(self): self.ready = True logging.info("Discord: plugin loaded") - # called when there's available internet - def on_internet_available(self, agent): + def grateful(self, agent): + self.send_message(agent) + def peer_detected(self, agent): + self.send_message(agent) + def unread_inbox(self, agent): + self.send_message(agent) + def internet_available(self, agent): + self.send_message(agent) + + # called upon various statuses + def send_message(self, agent): if not self.ready: return From 642fad060bdd1572ab3d7e63543879cab3f1c2b9 Mon Sep 17 00:00:00 2001 From: Radded Date: Wed, 10 Apr 2024 19:58:03 -0400 Subject: [PATCH 3/9] more things --- auto_backup.py | 2 +- discord.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/auto_backup.py b/auto_backup.py index 152d6c5..8b6a4d5 100644 --- a/auto_backup.py +++ b/auto_backup.py @@ -25,7 +25,7 @@ def on_loaded(self): self.ready = True logging.info("AUTO-BACKUP: Successfully loaded.") - def on_sleep(self, agent): + def wifi_update(self, agent): if not self.ready: return diff --git a/discord.py b/discord.py index 73f6fe2..c928f42 100644 --- a/discord.py +++ b/discord.py @@ -42,6 +42,8 @@ def unread_inbox(self, agent): self.send_message(agent) def internet_available(self, agent): self.send_message(agent) + def wifi_update(self, agent): + self.send_message(agent) # called upon various statuses def send_message(self, agent): From c4cd6d1b0ae2cea545338ad25cbc8f9f8b4f736d Mon Sep 17 00:00:00 2001 From: Radded Date: Wed, 10 Apr 2024 20:06:38 -0400 Subject: [PATCH 4/9] callback moment --- auto_backup.py | 2 +- discord.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/auto_backup.py b/auto_backup.py index 8b6a4d5..bd8001c 100644 --- a/auto_backup.py +++ b/auto_backup.py @@ -25,7 +25,7 @@ def on_loaded(self): self.ready = True logging.info("AUTO-BACKUP: Successfully loaded.") - def wifi_update(self, agent): + def on_wifi_update(self, agent): if not self.ready: return diff --git a/discord.py b/discord.py index c928f42..af2a710 100644 --- a/discord.py +++ b/discord.py @@ -34,15 +34,15 @@ def on_loaded(self): self.ready = True logging.info("Discord: plugin loaded") - def grateful(self, agent): + def on_grateful(self, agent): self.send_message(agent) - def peer_detected(self, agent): + def on_peer_detected(self, agent): self.send_message(agent) - def unread_inbox(self, agent): + def on_unread_inbox(self, agent): self.send_message(agent) - def internet_available(self, agent): + def on_internet_available(self, agent): self.send_message(agent) - def wifi_update(self, agent): + def on_wifi_update(self, agent): self.send_message(agent) # called upon various statuses From 3cc751acaf238eb865e3d24ebdc127e439cc8d70 Mon Sep 17 00:00:00 2001 From: Radded Date: Wed, 10 Apr 2024 20:07:19 -0400 Subject: [PATCH 5/9] things --- auto_backup.py | 1 + discord.py | 1 + 2 files changed, 2 insertions(+) diff --git a/auto_backup.py b/auto_backup.py index bd8001c..a3f505b 100644 --- a/auto_backup.py +++ b/auto_backup.py @@ -26,6 +26,7 @@ def on_loaded(self): logging.info("AUTO-BACKUP: Successfully loaded.") def on_wifi_update(self, agent): + logging.into("You got auto backup!"); if not self.ready: return diff --git a/discord.py b/discord.py index af2a710..7f2d3ca 100644 --- a/discord.py +++ b/discord.py @@ -47,6 +47,7 @@ def on_wifi_update(self, agent): # called upon various statuses def send_message(self, agent): + logging.info("You got Discord!"); if not self.ready: return From 4cbfb554b6c32c8e6c6106683f43f0f45ee99e00 Mon Sep 17 00:00:00 2001 From: Radded Date: Wed, 10 Apr 2024 20:16:28 -0400 Subject: [PATCH 6/9] more things the second --- auto_backup.py | 2 +- discord.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/auto_backup.py b/auto_backup.py index a3f505b..c3375e5 100644 --- a/auto_backup.py +++ b/auto_backup.py @@ -26,7 +26,7 @@ def on_loaded(self): logging.info("AUTO-BACKUP: Successfully loaded.") def on_wifi_update(self, agent): - logging.into("You got auto backup!"); + logging.info("You got auto backup!"); if not self.ready: return diff --git a/discord.py b/discord.py index 7f2d3ca..bd8dcc9 100644 --- a/discord.py +++ b/discord.py @@ -35,19 +35,23 @@ def on_loaded(self): logging.info("Discord: plugin loaded") def on_grateful(self, agent): + logging.info("Discord on grateful") self.send_message(agent) def on_peer_detected(self, agent): + logging.info("Discord on peer detected") self.send_message(agent) def on_unread_inbox(self, agent): + logging.info("Discord on unread inbox") self.send_message(agent) def on_internet_available(self, agent): + logging.info("Discord on internet available") self.send_message(agent) def on_wifi_update(self, agent): + logging.info("Discord on wifi update") self.send_message(agent) # called upon various statuses def send_message(self, agent): - logging.info("You got Discord!"); if not self.ready: return From 76bedfc45cafbaa3af74d77fc9b2c7c41dd76dfc Mon Sep 17 00:00:00 2001 From: Radded Date: Wed, 10 Apr 2024 20:24:31 -0400 Subject: [PATCH 7/9] aaa --- auto_backup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/auto_backup.py b/auto_backup.py index c3375e5..b877d88 100644 --- a/auto_backup.py +++ b/auto_backup.py @@ -25,8 +25,8 @@ def on_loaded(self): self.ready = True logging.info("AUTO-BACKUP: Successfully loaded.") - def on_wifi_update(self, agent): - logging.info("You got auto backup!"); + def on_internet_available(self, agent): + logging.info("You got auto backup!") if not self.ready: return From 2ec3ed22eb0f157e16eefc4bbc6b74da99ece520 Mon Sep 17 00:00:00 2001 From: Radded Date: Wed, 10 Apr 2024 20:25:40 -0400 Subject: [PATCH 8/9] MOAR shgit --- auto_backup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/auto_backup.py b/auto_backup.py index b877d88..224c191 100644 --- a/auto_backup.py +++ b/auto_backup.py @@ -31,9 +31,11 @@ def on_internet_available(self, agent): return if self.options['max_tries'] and self.tries >= self.options['max_tries']: + logging.info("Tries exceeded") return if self.status.newer_then_days(self.options['interval']): + logging.info("Days exceeded") return # Only backup existing files to prevent errors From dd1a1d28e3085ef2e21d64d12ad1782ebd2e276e Mon Sep 17 00:00:00 2001 From: Radded Date: Wed, 10 Apr 2024 20:35:44 -0400 Subject: [PATCH 9/9] more more more more more --- auto_backup.py | 3 --- discord.py | 30 ++++++++++++------------------ 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/auto_backup.py b/auto_backup.py index 224c191..f716ec6 100644 --- a/auto_backup.py +++ b/auto_backup.py @@ -26,16 +26,13 @@ def on_loaded(self): logging.info("AUTO-BACKUP: Successfully loaded.") def on_internet_available(self, agent): - logging.info("You got auto backup!") if not self.ready: return if self.options['max_tries'] and self.tries >= self.options['max_tries']: - logging.info("Tries exceeded") return if self.status.newer_then_days(self.options['interval']): - logging.info("Days exceeded") return # Only backup existing files to prevent errors diff --git a/discord.py b/discord.py index bd8dcc9..2209eae 100644 --- a/discord.py +++ b/discord.py @@ -33,33 +33,25 @@ def on_loaded(self): self.ready = True logging.info("Discord: plugin loaded") - - def on_grateful(self, agent): - logging.info("Discord on grateful") - self.send_message(agent) - def on_peer_detected(self, agent): - logging.info("Discord on peer detected") - self.send_message(agent) - def on_unread_inbox(self, agent): - logging.info("Discord on unread inbox") - self.send_message(agent) - def on_internet_available(self, agent): - logging.info("Discord on internet available") - self.send_message(agent) - def on_wifi_update(self, agent): - logging.info("Discord on wifi update") - self.send_message(agent) - # called upon various statuses - def send_message(self, agent): + # called when there's available internet + def on_internet_available(self, agent): + logging.info("Discord called") if not self.ready: return + logging.info("Discord is ready") config = agent.config() display = agent.view() + + logging.info("Discord has config and display") + last_session = agent.last_session + + logging.info("Discord has session") if last_session.is_new() and last_session.handshakes > 0: + logging.info ("Discord has session; new with handshakes") try: from discord import Webhook, RequestsWebhookAdapter, File except ImportError as e: @@ -95,3 +87,5 @@ def send_message(self, agent): except Exception as e: logging.exception("Discord: error while sending message") logging.debug(e) + else: + logging.info("Discord has session where is_new " + str(last_session.is_new()) + " and last handshakes are " + str(last_session.handshakes))