add loader to handle userprofiles in vm-compact

ensure we reload user profiles into memory
when rebuilding the config menu

patch bump

Author: onyx-and-iris

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "voicemeeter-compact"
-version = "1.7.0"
+version = "1.7.1"
 description = "A Compact Voicemeeter Remote App"
 authors = ["onyx-and-iris <code@onyxandiris.online>"]
 license = "MIT"

vmcompact/app.py

@@ -1,9 +1,11 @@
 import tkinter as tk
+from functools import cached_property
 from pathlib import Path
 from tkinter import ttk
 from typing import NamedTuple
 
 from .builders import MainFrameBuilder
+from .configurations import loader
 from .data import _base_values, _configuration, _kinds_all
 from .errors import VMCompactError
 from .menu import Menus
@@ -41,6 +43,7 @@ def __init__(self, vmr):
             self.iconbitmap(str(icon_path))
         self.minsize(275, False)
         self.subject = Subject()
+        self._configs = None
         self["menu"] = Menus(self, vmr)
         self.styletable = ttk.Style()
         if _configuration.config:
@@ -130,6 +133,11 @@ def stop_drag(self):
         self.drag_id = ""
         _base_values.dragging = False
 
+    @cached_property
+    def userconfigs(self):
+        self._configs = loader(self.kind.name)
+        return self._configs
+
 
 _apps = {kind.name: App.make(kind) for kind in _kinds_all}
 

vmcompact/configurations.py

@@ -26,7 +26,7 @@
                     try:
                         with open(filepath, "rb") as f:
                             configs[filename] = tomllib.load(f)
-                        logger.info(f"{filename} loaded into memory")
+                        logger.info(f"configuration: {filename} loaded into memory")
                     except tomllib.TOMLDecodeError:
                         logger.error(f"Invalid TOML config: configs/{filename.stem}")
 
@@ -66,3 +66,19 @@
 def get_configuration(key):
     if key in configuration:
         return configuration[key]
+
+
+def loader(kind_id):
+    configs = {}
+    userconfigpath = Path.home() / ".config" / "vm-compact" / "configs" / kind_id
+    if userconfigpath.exists():
+        filepaths = list(userconfigpath.glob("*.toml"))
+        for filepath in filepaths:
+            identifier = filepath.with_suffix("").stem
+            try:
+                with open(filepath, "rb") as f:
+                    configs[identifier] = tomllib.load(f)
+                logger.info(f"loader: {identifier} loaded into memory")
+            except tomllib.TOMLDecodeError:
+                logger.error(f"Invalid TOML config: configs/{filename.stem}")
+    return configs

vmcompact/menu.py

@@ -93,6 +93,14 @@ def __init__(self, parent, vmr):
                 for profile in self.target.configs.keys()
                 if profile not in self.config_defaults
             ]
+        elif self.parent.userconfigs:
+            [
+                self.menu_configs_load.add_command(
+                    label=name, command=partial(self.load_custom_profile, data)
+                )
+                for name, data in self.parent.userconfigs.items()
+                if name not in self.config_defaults
+            ]
         else:
             self.menu_configs.entryconfig(0, state="disabled")
         self.menu_configs.add_command(
@@ -213,6 +221,10 @@ def action_set_voicemeeter(self, cmd, val=True):
             self._unlock.set(not self._lock.get())
         setattr(self.target.command, cmd, val)
 
+    def load_custom_profile(self, profile):
+        self.logger.info(f"loading user profile {profile}")
+        self.target.apply(profile)
+
     def load_profile(self, profile):
         self.logger.info(f"loading user profile {profile}")
         self.target.apply_config(profile)
@@ -289,6 +301,11 @@ def menu_teardown(self, i):
             for key in self.target.configs.keys()
             if key not in self.config_defaults
         ]
+        [
+            self.menu_configs_load.delete(key)
+            for key in self.parent.userconfigs.keys()
+            if key not in self.config_defaults
+        ]
 
         [
             self.menu_vban.entryconfig(j, state="disabled")
@@ -307,6 +324,14 @@ def menu_setup(self):
                 for profile in self.target.configs.keys()
                 if profile not in self.config_defaults
             ]
+        elif self.parent.userconfigs:
+            [
+                self.menu_configs_load.add_command(
+                    label=name, command=partial(self.load_custom_profile, data)
+                )
+                for name, data in self.parent.userconfigs.items()
+                if name not in self.config_defaults
+            ]
         else:
             self.menu_configs.entryconfig(0, state="disabled")
 
@@ -346,6 +371,11 @@ def vban_connect(self, i):
         self.menu_layout.entryconfig(
             0, state=f"{'normal' if kind.name == 'potato' else 'disabled'}"
         )
+        # ensure the configs are reloaded into memory
+        if "config" in self.parent.target.__dict__:
+            del self.parent.target.__dict__["config"]
+        if "userconfigs" in self.parent.__dict__:
+            del self.parent.__dict__["userconfigs"]
         self.menu_setup()
 
     def vban_disconnect(self, i):
@@ -366,6 +396,11 @@ def vban_disconnect(self, i):
         self.menu_layout.entryconfig(
             0, state=f"{'normal' if kind.name == 'potato' else 'disabled'}"
         )
+        # ensure the configs are reloaded into memory
+        if "config" in self.parent.target.__dict__:
+            del self.parent.target.__dict__["config"]
+        if "userconfigs" in self.parent.__dict__:
+            del self.parent.__dict__["userconfigs"]
         self.menu_setup()
 
         self.after(15000, self.enable_vban_menus)