fix(misc): add timeout and better handling for errors

Author: ImDevinC

actions/ChangeTextChannel.py

@@ -19,10 +19,14 @@ def on_ready(self):
             VOICE_CHANNEL_SELECT, self.update_display)
 
     def update_display(self, value: dict):
-        log.debug("update_display: {0}", value)
+        pass
 
     def on_tick(self):
-        pass
+        if self.channel_id:
+            self.set_label(self.channel_id)
+        else:
+            self.set_label(self.plugin_base.lm.get(
+                "actions.changetextchannel.update_channel"))
 
     def load_config(self):
         super().load_config()
@@ -47,4 +51,5 @@ def on_change_channel_id(self, entry, _):
     def on_key_down(self):
         settings = self.get_settings()
         channel_id = settings.get('channel_id')
-        self.plugin_base.backend.change_text_channel(channel_id)
+        if not self.plugin_base.backend.change_text_channel(channel_id):
+            self.show_error(5)

actions/ChangeVoiceChannelAction.py

@@ -21,13 +21,14 @@ def on_ready(self):
             VOICE_CHANNEL_SELECT, self.update_display)
 
     def update_display(self, value: dict):
-        log.debug("update_display: {0}", value)
+        pass
 
     def on_tick(self):
         if self.current_channel:
             self.set_label(self.current_channel)
         else:
-            self.set_label("Join voice channel")
+            self.set_label(self.plugin_base.lm.get(
+                "actions.changevoicechannel.update_channel"))
 
     def load_config(self):
         super().load_config()
@@ -67,4 +68,5 @@ def event_callback(self, event: InputEvent, data: dict = None):
             self.on_dial_down()
 
     def on_key_hold_start(self):
-        self.plugin_base.backend.change_voice_channel(None)
+        if not self.plugin_base.backend.change_voice_channel(None):
+            self.show_error(5)

actions/DeafenAction.py

@@ -9,7 +9,7 @@
 class DeafenAction(DiscordActionBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.mode: str = None
+        self.mode: str = 'Toggle'
         self.deafened: bool = False
         self.label_location: str = 'Bottom'
 
@@ -25,9 +25,10 @@ def update_display(self, value: dict):
 
     def on_tick(self):
         if self.deafened:
-            self.set_label("Deafened", position=self.label_location)
+            self.set_label("Deafened", position=self.label_location.lower())
         else:
-            self.set_label("Not Deafened", position=self.label_location)
+            self.set_label(
+                "Not\nDeafened", position=self.label_location.lower())
 
     def load_config(self):
         super().load_config()
@@ -91,9 +92,10 @@ def on_key_down(self):
         match self.mode:
             case "Deafen":
                 if not self.plugin_base.backend.set_deafen(True):
-                    self.show_error()
+                    self.show_error(5)
             case "Undeafen":
                 if not self.plugin_base.backend.set_deafen(False):
-                    self.show_error()
+                    self.show_error(5)
             case "Toggle":
-                self.plugin_base.backend.set_deafen(not self.deafened)
+                if not self.plugin_base.backend.set_deafen(not self.deafened):
+                    self.show_error(5)

actions/MuteAction.py

@@ -91,9 +91,10 @@ def on_key_down(self):
         match self.mode:
             case "Mute":
                 if not self.plugin_base.backend.set_mute(True):
-                    self.show_error()
+                    self.show_error(5)
             case "Unmute":
                 if not self.plugin_base.backend.set_mute(False):
-                    self.show_error()
+                    self.show_error(5)
             case "Toggle":
-                self.plugin_base.backend.set_mute(not self.muted)
+                if not self.plugin_base.backend.set_mute(not self.muted):
+                    self.show_error(5)

discordrpc/sockets.py

@@ -16,6 +16,7 @@ def __init__(self):
     def connect(self):
         if self.socket is None:
             self.socket = socket.socket(socket.AF_UNIX)
+            self.socket.settimeout(10)
         base_path = path = os.environ.get('XDG_RUNTIME_DIR') or os.environ.get(
             'TMPDIR') or os.environ.get('TMP') or os.environ.get('TEMP') or '/tmp'
         base_path = re.sub(r'\/$', '', path) + '/discord-ipc-{0}'
@@ -46,6 +47,10 @@ def receive(self) -> (int, str):
         code = int.from_bytes(header[:4], "little")
         length = int.from_bytes(header[4:], "little")
         all_data = data[8:]
+        buffer_size = length - len(all_data)
+        if buffer_size < 0:
+            log.debug("buffer size too small")
+            return 0, {}
         data = self.socket.recv(length-len(all_data))
         all_data += data
         return code, all_data.decode('UTF-8')

locales/en_US.json

@@ -11,5 +11,11 @@
   "actions.mute.label_choice.title": "Display Location",
   "actions.base.credentials.authenticated": "Authenticated successfully",
   "actions.base.credentials.failed": "Failed to authenticate",
-  "actions.base.credentials.missing_client_info": "Missing Client ID or Client Secret"
+  "actions.base.credentials.missing_client_info": "Missing Client ID or Client Secret",
+  "actions.deafen.choice.title": "Button Press Action",
+  "actions.deafen.label_choice.title": "Display Location",
+  "actions.changetextchannel.channel_id": "Channel ID",
+  "actions.changetextchannel.update_channel": "Configure\nChannel",
+  "actions.changevoicechannel.channel_id": "Channel ID",
+  "actions.changevoicechannel.update_channel": "Configure\nChannel"
 }