From 5b56f449ef79a0376600506cf188d7e8f57d17d8 Mon Sep 17 00:00:00 2001 From: Sudo-Ivan Date: Thu, 1 Jan 2026 22:45:06 -0600 Subject: [PATCH] style: format code for improved readability in multiple files, including config_manager, ringtone_manager, voicemail_manager, contacts, ringtones, and telemetry --- meshchatx/src/backend/config_manager.py | 8 ++++++-- meshchatx/src/backend/database/contacts.py | 1 - meshchatx/src/backend/database/ringtones.py | 17 ++++++++++++----- meshchatx/src/backend/database/telemetry.py | 7 ++++++- meshchatx/src/backend/ringtone_manager.py | 2 +- meshchatx/src/backend/voicemail_manager.py | 16 ++++++++++++---- 6 files changed, 37 insertions(+), 14 deletions(-) diff --git a/meshchatx/src/backend/config_manager.py b/meshchatx/src/backend/config_manager.py index 67e5e81..65c70d7 100644 --- a/meshchatx/src/backend/config_manager.py +++ b/meshchatx/src/backend/config_manager.py @@ -132,11 +132,15 @@ class ConfigManager: ) # ringtone config - self.custom_ringtone_enabled = self.BoolConfig(self, "custom_ringtone_enabled", False) + self.custom_ringtone_enabled = self.BoolConfig( + self, "custom_ringtone_enabled", False + ) self.ringtone_filename = self.StringConfig(self, "ringtone_filename", None) # telephony config - self.do_not_disturb_enabled = self.BoolConfig(self, "do_not_disturb_enabled", False) + self.do_not_disturb_enabled = self.BoolConfig( + self, "do_not_disturb_enabled", False + ) # map config self.map_offline_enabled = self.BoolConfig(self, "map_offline_enabled", False) diff --git a/meshchatx/src/backend/database/contacts.py b/meshchatx/src/backend/database/contacts.py index 8b145ac..b46ae53 100644 --- a/meshchatx/src/backend/database/contacts.py +++ b/meshchatx/src/backend/database/contacts.py @@ -63,4 +63,3 @@ class ContactsDAO: "SELECT * FROM contacts WHERE remote_identity_hash = ?", (remote_identity_hash,), ) - diff --git a/meshchatx/src/backend/database/ringtones.py b/meshchatx/src/backend/database/ringtones.py index 1317848..f065228 100644 --- a/meshchatx/src/backend/database/ringtones.py +++ b/meshchatx/src/backend/database/ringtones.py @@ -8,10 +8,14 @@ class RingtoneDAO: self.provider = provider def get_all(self): - return self.provider.fetchall("SELECT * FROM ringtones ORDER BY created_at DESC") + return self.provider.fetchall( + "SELECT * FROM ringtones ORDER BY created_at DESC" + ) def get_by_id(self, ringtone_id): - return self.provider.fetchone("SELECT * FROM ringtones WHERE id = ?", (ringtone_id,)) + return self.provider.fetchone( + "SELECT * FROM ringtones WHERE id = ?", (ringtone_id,) + ) def get_primary(self): return self.provider.fetchone("SELECT * FROM ringtones WHERE is_primary = 1") @@ -22,7 +26,9 @@ class RingtoneDAO: display_name = filename # check if this is the first ringtone, if so make it primary - count = self.provider.fetchone("SELECT COUNT(*) as count FROM ringtones")["count"] + count = self.provider.fetchone("SELECT COUNT(*) as count FROM ringtones")[ + "count" + ] is_primary = 1 if count == 0 else 0 cursor = self.provider.execute( @@ -35,7 +41,9 @@ class RingtoneDAO: now = datetime.now(UTC) if is_primary == 1: # reset others - self.provider.execute("UPDATE ringtones SET is_primary = 0, updated_at = ?", (now,)) + self.provider.execute( + "UPDATE ringtones SET is_primary = 0, updated_at = ?", (now,) + ) if display_name is not None and is_primary is not None: self.provider.execute( @@ -63,4 +71,3 @@ class RingtoneDAO: self.update(next_ringtone["id"], is_primary=1) else: self.provider.execute("DELETE FROM ringtones WHERE id = ?", (ringtone_id,)) - diff --git a/meshchatx/src/backend/database/telemetry.py b/meshchatx/src/backend/database/telemetry.py index 9f69505..711a925 100644 --- a/meshchatx/src/backend/database/telemetry.py +++ b/meshchatx/src/backend/database/telemetry.py @@ -9,7 +9,12 @@ class TelemetryDAO: self.provider = provider def upsert_telemetry( - self, destination_hash, timestamp, data, received_from=None, physical_link=None, + self, + destination_hash, + timestamp, + data, + received_from=None, + physical_link=None, ): now = datetime.now(UTC).isoformat() diff --git a/meshchatx/src/backend/ringtone_manager.py b/meshchatx/src/backend/ringtone_manager.py index af26bba..8164ce6 100644 --- a/meshchatx/src/backend/ringtone_manager.py +++ b/meshchatx/src/backend/ringtone_manager.py @@ -34,6 +34,7 @@ class RingtoneManager: raise RuntimeError(msg) import secrets + filename = f"ringtone_{secrets.token_hex(8)}.opus" opus_path = os.path.join(self.storage_dir, filename) @@ -63,4 +64,3 @@ class RingtoneManager: def get_ringtone_path(self, filename): return os.path.join(self.storage_dir, filename) - diff --git a/meshchatx/src/backend/voicemail_manager.py b/meshchatx/src/backend/voicemail_manager.py index b29cb0a..662988b 100644 --- a/meshchatx/src/backend/voicemail_manager.py +++ b/meshchatx/src/backend/voicemail_manager.py @@ -215,7 +215,7 @@ class VoicemailManager: and telephone.active_call and telephone.active_call.get_remote_identity().hash == caller_identity.hash - and telephone.call_status == 4 # Ringing + and telephone.call_status == 4 # Ringing ): RNS.log( f"Auto-answering call from {RNS.prettyhexrep(caller_identity.hash)} for voicemail", @@ -256,16 +256,24 @@ class VoicemailManager: try: self.generate_greeting(self.config.voicemail_greeting.get()) except Exception as e: - RNS.log(f"Voicemail: Could not generate initial greeting: {e}", RNS.LOG_ERROR) + RNS.log( + f"Voicemail: Could not generate initial greeting: {e}", + RNS.LOG_ERROR, + ) else: - RNS.log("Voicemail: espeak-ng or ffmpeg missing, cannot generate greeting", RNS.LOG_WARNING) + RNS.log( + "Voicemail: espeak-ng or ffmpeg missing, cannot generate greeting", + RNS.LOG_WARNING, + ) def session_job(): try: # 1. Play greeting if os.path.exists(greeting_path): try: - greeting_source = OpusFileSource(greeting_path, target_frame_ms=60) + greeting_source = OpusFileSource( + greeting_path, target_frame_ms=60 + ) # Attach to transmit mixer greeting_pipeline = Pipeline( source=greeting_source,