feat(settings): Use new settings configuration

Author: ImDevinC

DiscordActionBase.py

@@ -1,15 +1,16 @@
 from gi.repository import Gtk, Adw
 
-from ..DiscordActionBase import DiscordActionBase
+from src.backend.PluginManager.ActionBase import ActionBase
 from ..discordrpc.commands import VOICE_CHANNEL_SELECT
 
 from loguru import logger as log
 
 
-class ChangeTextChannel(DiscordActionBase):
+class ChangeTextChannel(ActionBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.channel_id: str = None
+        self.has_configuration = True
 
     def on_ready(self):
         self.load_config()
@@ -34,7 +35,6 @@ def on_tick(self):
                 "actions.changetextchannel.update_channel"))
 
     def load_config(self):
-        super().load_config()
         settings = self.get_settings()
         self.channel_id = settings.get('channel_id')
 

actions/ChangeTextChannel.py

@@ -1,17 +1,18 @@
 from gi.repository import Gtk, Adw
 
-from ..DiscordActionBase import DiscordActionBase
+from src.backend.PluginManager.ActionBase import ActionBase
 from ..discordrpc.commands import VOICE_CHANNEL_SELECT
 from src.backend.DeckManagement.InputIdentifier import InputEvent, Input
 
 from loguru import logger as log
 
 
-class ChangeVoiceChannelAction(DiscordActionBase):
+class ChangeVoiceChannelAction(ActionBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.current_channel: str = None
         self.channel_id: str = None
+        self.has_configuration = True
 
     def on_ready(self):
         self.load_config()
@@ -36,7 +37,6 @@ def on_tick(self):
                 "actions.changevoicechannel.update_channel"))
 
     def load_config(self):
-        super().load_config()
         settings = self.get_settings()
         self.channel_id = settings.get('channel_id')
 

actions/ChangeVoiceChannelAction.py

@@ -2,13 +2,13 @@
 
 from gi.repository import Gtk, Adw
 
-from ..DiscordActionBase import DiscordActionBase
+from src.backend.PluginManager.ActionBase import ActionBase
 from ..discordrpc.commands import VOICE_SETTINGS_UPDATE
 
 from loguru import logger as log
 
 
-class DeafenAction(DiscordActionBase):
+class DeafenAction(ActionBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.mode: str = 'Toggle'
@@ -46,7 +46,6 @@ def on_tick(self):
                 "Not\nDeafened", position=self.label_location.lower())
 
     def load_config(self):
-        super().load_config()
         settings = self.get_settings()
         self.mode = settings.get('mode')
         if not self.mode:

actions/DeafenAction.py

@@ -2,13 +2,13 @@
 
 from gi.repository import Gtk, Adw, Gio, GObject
 
-from ..DiscordActionBase import DiscordActionBase
+from src.backend.PluginManager.ActionBase import ActionBase
 from ..discordrpc.commands import VOICE_SETTINGS_UPDATE
 
 from loguru import logger as log
 
 
-class MuteAction(DiscordActionBase):
+class MuteAction(ActionBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.mode: str = 'Toggle'
@@ -45,7 +45,6 @@ def on_tick(self):
             self.set_label("Unmuted", position=self.label_location.lower())
 
     def load_config(self):
-        super().load_config()
         settings = self.get_settings()
         self.mode = settings.get('mode')
         if not self.mode:

actions/MuteAction.py

@@ -2,13 +2,13 @@
 
 from gi.repository import Gtk, Adw
 
-from ..DiscordActionBase import DiscordActionBase
+from src.backend.PluginManager.ActionBase import ActionBase
 from ..discordrpc.commands import VOICE_SETTINGS_UPDATE
 
 from loguru import logger as log
 
 
-class TogglePushToTalkAction(DiscordActionBase):
+class TogglePushToTalkAction(ActionBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.mode: str = 'Toggle'
@@ -19,6 +19,7 @@ def __init__(self, *args, **kwargs):
             "PUSH_TO_TALK": True,
             "VOICE_ACTIVITY": False
         }
+        self.has_configuration = True
 
     def on_ready(self):
         self.load_config()
@@ -46,13 +47,13 @@ def on_tick(self):
         # page transition. I don't like it, but it works for now
         self.update_display({'mode': {"type": self.ptt_string}})
         if self.ptt:
-            self.set_label("Push to\ntalk", position=self.label_location.lower())
+            self.set_label("Push to\ntalk",
+                           position=self.label_location.lower())
         else:
             self.set_label(
                 "Voice\nActivity", position=self.label_location.lower())
 
     def load_config(self):
-        super().load_config()
         settings = self.get_settings()
         self.mode = settings.get('mode')
         if not self.mode:
@@ -119,4 +120,4 @@ def on_key_down(self):
                     self.show_error(5)
             case "Toggle":
                 if not self.plugin_base.backend.set_push_to_talk("VOICE_ACTIVITY" if self.ptt == True else "PUSH_TO_TALK"):
-                    self.show_error(5)
+                    self.show_error(5)

actions/TogglePushToTalkAction.py

@@ -1,10 +1,14 @@
 import os
+import json
 
 # Import StreamController modules
 from src.backend.PluginManager.PluginBase import PluginBase
 from src.backend.PluginManager.ActionHolder import ActionHolder
+from src.backend.DeckManagement.InputIdentifier import Input
+from src.backend.PluginManager.ActionInputSupport import ActionInputSupport
 
 # Import actions
+from .settings import PluginSettings
 from .actions.MuteAction import MuteAction
 from .actions.DeafenAction import DeafenAction
 from .actions.ChangeVoiceChannelAction import ChangeVoiceChannelAction
@@ -25,51 +29,90 @@ def __init__(self):
         self.lm = self.locale_manager
         self.lm.set_to_os_default()
 
+        self._settings_manager = PluginSettings(self)
+        self.has_plugin_settings = True
+
         self.message_mute_action_holder = ActionHolder(
             plugin_base=self,
             action_base=MuteAction,
             action_id="com_imdevinc_StreamControllerDiscordPlugin::Mute",
-            action_name="Mute"
+            action_name="Mute",
+            action_support={
+                Input.Key: ActionInputSupport.SUPPORTED,
+                Input.Dial: ActionInputSupport.UNTESTED,
+                Input.Touchscreen: ActionInputSupport.UNTESTED,
+            }
         )
         self.add_action_holder(self.message_mute_action_holder)
 
         self.message_deafen_action_holder = ActionHolder(
             plugin_base=self,
             action_base=DeafenAction,
             action_id="com_imdevinc_StreamControllerDiscordPlugin::Deafen",
-            action_name="Deafen"
+            action_name="Deafen",
+            action_support={
+                Input.Key: ActionInputSupport.SUPPORTED,
+                Input.Dial: ActionInputSupport.UNTESTED,
+                Input.Touchscreen: ActionInputSupport.UNTESTED,
+            }
         )
         self.add_action_holder(self.message_deafen_action_holder)
 
         self.change_voice_channel_action = ActionHolder(
             plugin_base=self,
             action_base=ChangeVoiceChannelAction,
             action_id="com_imdevinc_StreamControllerDiscordPlugin::ChangeVoiceChannel",
-            action_name="Change Voice Channel"
+            action_name="Change Voice Channel",
+            action_support={
+                Input.Key: ActionInputSupport.SUPPORTED,
+                Input.Dial: ActionInputSupport.UNTESTED,
+                Input.Touchscreen: ActionInputSupport.UNTESTED,
+            }
         )
         self.add_action_holder(self.change_voice_channel_action)
 
         self.change_text_channel_action = ActionHolder(
             plugin_base=self,
             action_base=ChangeTextChannel,
             action_id="com_imdevinc_StreamControllerDiscordPlugin::ChangeTextChannel",
-            action_name="Change Text Channel"
+            action_name="Change Text Channel",
+            action_support={
+                Input.Key: ActionInputSupport.SUPPORTED,
+                Input.Dial: ActionInputSupport.UNTESTED,
+                Input.Touchscreen: ActionInputSupport.UNTESTED,
+            }
         )
         self.add_action_holder(self.change_text_channel_action)
 
         self.message_ptt_action_holder = ActionHolder(
             plugin_base=self,
             action_base=TogglePushToTalkAction,
             action_id="com_imdevinc_StreamControllerDiscordPlugin::Push_To_Talk",
-            action_name="Toggle push to talk"
+            action_name="Toggle push to talk",
+            action_support={
+                Input.Key: ActionInputSupport.SUPPORTED,
+                Input.Dial: ActionInputSupport.UNTESTED,
+                Input.Touchscreen: ActionInputSupport.UNTESTED,
+            }
         )
         self.add_action_holder(self.message_ptt_action_holder)
 
+        try:
+            with open(os.path.join(self.PATH, "manifest.json"), "r", encoding="UTF-8") as f:
+                data = json.load(f)
+        except Exception as ex:
+            log.error(ex)
+            data = {}
+        app_manifest = {
+            "plugin_version": data.get("version", "0.0.0"),
+            "app_version": data.get("app-version", "0.0.0")
+        }
+
         self.register(
             plugin_name="Discord",
             github_repo="https://github.com/imdevinc/StreamControllerDiscordPlugin",
-            plugin_version="1.0.0",
-            app_version="1.5.0"
+            plugin_version=app_manifest.get("plugin_version"),
+            app_version=app_manifest.get("app_version")
         )
 
         settings = self.get_settings()
@@ -104,3 +147,6 @@ def handle_callback(self, key: str, data: any):
     def on_auth_callback(self, success: bool, message: str = None):
         if self.auth_callback_fn:
             self.auth_callback_fn(success, message)
+
+    def get_settings_area(self):
+        return self._settings_manager.get_settings_area()

main.py

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.3",
+  "version": "1.1.0",
   "thumbnail": "store/thumbnail.png",
   "id": "com_imdevinc_StreamControllerDiscordPlugin",
   "name": "Discord",
@@ -8,8 +8,8 @@
   "tags": [
     "discord"
   ],
-  "minimum-app-version": "1.5.0-beta.6",
-  "app-version": "1.5.0-beta.6",
+  "minimum-app-version": "1.5.0-beta.8",
+  "app-version": "1.5.0-beta.8",
   "description": "Adds controls for Discord including mute, deafen, and change channel",
   "short-description": "Control Discord"
 }