From 8d0431ca20283af0f048a5bde6f649baaf4aecab Mon Sep 17 00:00:00 2001
From: Andrew Ward <andrew@scorchsoft.com>
Date: Sat, 22 Mar 2025 10:22:29 +0000
Subject: [PATCH] make setting loading more robust so the app wont crash if new
 ones are added between releases

---
 utils/__pycache__/text_to_mic.cpython-312.pyc | Bin 71250 -> 71859 bytes
 utils/text_to_mic.py                          | 129 +++++++++++++-----
 2 files changed, 98 insertions(+), 31 deletions(-)

diff --git a/utils/__pycache__/text_to_mic.cpython-312.pyc b/utils/__pycache__/text_to_mic.cpython-312.pyc
index 5d2e0d9b49bc625c5c3fb2b45feb5288dae71711..72977126b5d8853f4736ec959d53feb6a2553e0e 100644
GIT binary patch
delta 1698
zcmZ`(T}%{L6uxJEmH~Fz1zdIzgb`2~S{D(FU@0|Qv}#hVfuyyz-EMaV*t+cE%pjC3
zT}u2}l~&Betfr==zLXRn)NQi9wer$7H5F9KW@0LuHhpNKi-=OKP4DHenzUy#C+FPz
zop0~??wPrImWiEbtUp>TX$adNpZwD7KycpLekU^>=QMt%dI6zB>>-nW{7wliQ6YV&
zXx}E`NMa<a8A<FJz}__LQ)WGP2Bg%}jFcv&pXR!$RHU(lomdDY^AI%`uS4CmmZFdR
zkgwmon^xV;NQnFvwgE}h5jMg`Oih$z+0Pv@QRuKK%!H@~L^pGoRr2+=bB+dP2%nM|
zAk8utAtYt|yBcB|P%)}NDs)hQc3~W#z73u9F4O_VNXuBLDM5+@P>AYg2ygf)-d%`r
zbfCE!(YpPSMU^$p7id<U@2kPUX5}J2gK`BkiL}9ZHN|hRYKyN)GhmHKD{kDj@-B7;
z)I6J3KbuyFjA9~GF%YmH!i0v+>j`*ezdP6_D;~`k3@BF2By#%U<nyAEL8!gB#EXMP
zBcf;HXX*lWC#Wb2=@VO)h3nDVE`;8~$Zo2e4pAYr4-_s$hj7=m7%9OKrY}n)cRy<(
zT4NUC1?5%fD}D-rD|0dAKXL2vt+9lgAVTy|c>ai3{(1(5Py-UF?TuJ5)~Cs>s*&bX
zeF0S??HY{a^J=2W;N(u9N|ZJ@NpAAA`!&^|_sAb8b(qtzEnI`Uy-o6HvSc{s0(YxV
z#bnLy1%PToD2xPbJv~Yxu2q8gG+ot=a;Mf9eAVZ5`hy;65$>$@2fZG@TIc*9zVEOw
z>Tb+4(}O08%D!}d;rzL1?eT5>FQ2q097_jEM;&E}($y!qf$US3#B=4NeCdsFZt=jT
zvsGicYrcN-TkiYpOP0&p*t*7BeEB)<V)l8<#r83NQ__NpE0Y<B7y7Nra{LEfs~hHL
zO=$A@WnsQkp~I)O2m!f6nAb(v=kd48s>m5R&9b)GiJKI;+dNu}!tB6w`juo(dL5ZD
zKXzh@o=h%TYuM&V7R!`_1ky=_3SgmT)lyS%N+c9EZqyx<rQzRj{$~$L@cH9><tSfy
zZpSsgK4M97s6<TIbI0wgM(wK-Ieen5Jdt0N$P;d_c)=*DHi~PEk`0roET54yqr8I2
zyo~&`5sps^g{c+4X4?B(2O6$rib({P(!rfK@(Mq%IaM>T^V8aX?jeoWFu$;3#GD_V
zHl<pGNgna#gPkKaTdz5`MYc?ukWEO~mW<oVMr~z-)z@uRH*EHioK4qlo3X4mK4N|N
z5+Nb%kMCC@+wyyePOX@5tcq+&m~G?cm80gB1D#{$H4|1x#F|XUn~zixw;DIQ3eY7w
z$CX82%3bd&;L&gv>&i<RcBJ5q;evcu9X<Raxa#!R?tKGox@}4TMX#8ug<G+}R4U-5
z&igCicm1>bH{q`S;q()jiiI9*1=9?fCa3<<gC+XShqs|iAD*d%zhe((_EMCU)qRgI
zP&6A`_SXi0Uj2<H0+q?ex}Gd$VSn@l1t+N-HeOD{WyW-X+||J-a8Ohg!7=`xDEQ=t
z<vmXzAS><`pCrivrH{Zq#!e;gH@VTdcj8#|bq<!nEAe&?exgB+)|=rLw8mFj;2jEj
z;|HuT2yis+%!J(_wh@-EFo7Zw*F{p1j7<-TdWqXhHjYIvWPuB6qtjV1ZCc0j_W}^V
dn+>-C&PK1=VUNAt4u$<xls(Q)BNERJ{yzaI+TH*F

delta 1077
zcmY*XUrbw77(d_r2km+(e_FkTB7ZtqE2B_q%ouf~#JKq)TQ--l8EePwO0^btTA|S*
zi^hegt;>1nmMs|}J`nX`vk&D>@kygWu5)s8C0j<a7ax`mS0FHk=P;S^+~jw@@AsYW
z_kHJnCx1)$?Hj@Rvn-ntU1u)dje4J;Th@;r66dUm8v-J)*OLBrvosDSl;X+um_j=8
zFOlq}J^Oi;&+wxNH>*O1+72o(3b-zcRB;-18C3{SK9dW}U?*GW&BR}-_GkFx$c20;
z31b|f0R;4$pj?_CKx5!Sshw_EM|%-|6_6@rNbrfhO)XO;wOo~G3DY!CH1FV^9i&B7
z%XLAOua}MU{}r5I1z5qcf8{+DZ*9oQNGcUeM3dh4lfwx-2nb=3f>AjbP7Frkq2ZAT
z4yR(n2@h`wgDD(0#N<%yY{~%N8+eu-|CM&<;qiMMwZjw)=={Ii{mgCJ4Il6bSYnxZ
z24B;39HM!iGIF)JpQGEu702PzEOwH~3Gv~uid{@T&d7dNPr#UN#`E?=XJhdQzQE#X
z8b}Hh8tEeVZ}-HX)H#oI#kr{XHN}6k|F-h_q+H}2Cf`z(J^SI*@!M6NB9i3pnPW?J
z4L7>4c26C<7RZ(tC1k6gD%Wb<3+=t%rx%V6XopW}?Wc@GC$dMb3~07}3+{uOtw*;h
zi#D%j^UkDyw;foMsZy~ERVtI#HNPZJ>^hr|U8u5Y1y!1SRN39GJL(r5ZJMJ^uXXBP
zzuwrYH|$;Z^ct-JW8Z6r`_Lnk=&XKZm6eLgBSj~Ys}?P-nx%CreaF(NTVI^C7F|?p
zBk83VB$i+ox)BJr@N;$L)SPP(gB@jaFZ00~>U8jo>gwt9@jrAzpO4&p{2fHeNU0HG
z<Z>whKj!C4CZLqQ+5+?B>FPcBgWO%)0wce){w7HG=pRjb$^CU3>D^d{5z@TrhX?tS
zo98%gRUkiYearnN<j0>L1W1$F?M7~0$Q#?WB7B@H32=qm5(<|@_(hODVS}Wv(hSY7
ze9FeYJIXWRL?VJiLorp2B=BeK*yj|Uj}kY~TjDQr1vAuxw{XV{^E`xdUsk|<I8nG@
zg?BlK6&_T<3;-@%tbx<ui87V1Sf0vYgt;E}NJg2JW^nGAYPB8upeOgX9ZI58R8|6o
eqc6ZRz;w>9zz6ns?9h<qa^hvNgqV$+Xxcw)Q9vsI

diff --git a/utils/text_to_mic.py b/utils/text_to_mic.py
index ee8c3a2..a734d97 100644
--- a/utils/text_to_mic.py
+++ b/utils/text_to_mic.py
@@ -229,20 +229,38 @@ class TextToMic(tk.Tk):
         return ResourceUtils.resource_path(relative_path)
 
     def initialize_gui(self):
+        # Get saved settings
+        settings = self.load_settings()
 
         self.input_device_index = tk.StringVar(self)
         self.device_index = tk.StringVar(self)
         self.device_index_2 = tk.StringVar(self)
 
-        self.input_device_index.set("Default")
-        self.device_index.set("Select Device")
-        self.device_index_2.set("None")
-
-        # Fetching available devices (no longer needed here?)
-        #available_devices = self.get_audio_devices()
-        #available_input_devices = self.get_input_devices()
-        #device_names = list(self.available_devices.keys())
-        #input_device_names = list(self.available_input_devices.keys())
+        # Set default values
+        default_input = "Default"
+        default_output = "Select Device"
+        default_secondary = "None"
+        
+        # Get saved device names from settings
+        saved_input_device = settings.get("input_device", default_input)
+        saved_primary_device = settings.get("primary_device", default_output)
+        saved_secondary_device = settings.get("secondary_device", default_secondary)
+        
+        # Validate that saved devices are still available, otherwise use defaults
+        if saved_input_device in self.available_input_devices:
+            self.input_device_index.set(saved_input_device)
+        else:
+            self.input_device_index.set(default_input)
+        
+        if saved_primary_device in self.available_devices:
+            self.device_index.set(saved_primary_device)
+        else:
+            self.device_index.set(default_output)
+        
+        if saved_secondary_device in self.available_devices or saved_secondary_device == "None":
+            self.device_index_2.set(saved_secondary_device)
+        else:
+            self.device_index_2.set(default_secondary)
 
         main_frame = ttk.Frame(self, padding="20")
         main_frame.grid(column=0, row=0, sticky=(tk.W, tk.E, tk.N, tk.S))
@@ -316,17 +334,23 @@ class TextToMic(tk.Tk):
         ttk.Label(device_frame, text="Device Settings", font=("Arial", 10, "bold")).grid(column=0, row=0, sticky=tk.W, pady=(0, 10), columnspan=2)
 
         ttk.Label(device_frame, text="Input Device (optional):").grid(column=0, row=1, sticky=tk.W, pady=(0, 5))
-        input_device_menu = ttk.OptionMenu(device_frame, self.input_device_index, "None", *self.available_input_devices.keys())
+        input_device_menu = ttk.OptionMenu(device_frame, self.input_device_index, self.input_device_index.get(), 
+                                          *self.available_input_devices.keys(), 
+                                          command=self.on_input_device_change)
         input_device_menu.grid(column=1, row=1, sticky=tk.E, pady=(0, 5))
         input_device_menu.config(width=dropdown_width, style='Compact.TMenubutton')
 
         ttk.Label(device_frame, text="Primary Playback Device:").grid(column=0, row=2, sticky=tk.W, pady=(0, 5))
-        primary_device_menu = ttk.OptionMenu(device_frame, self.device_index, *self.available_devices.keys())
+        primary_device_menu = ttk.OptionMenu(device_frame, self.device_index, self.device_index.get(), 
+                                            *self.available_devices.keys(),
+                                            command=self.on_primary_device_change)
         primary_device_menu.grid(column=1, row=2, sticky=tk.E, pady=(0, 5))
         primary_device_menu.config(width=dropdown_width, style='Compact.TMenubutton')
 
         ttk.Label(device_frame, text="Secondary Playback Device (optional):").grid(column=0, row=3, sticky=tk.W, pady=(0, 5))
-        secondary_device_menu = ttk.OptionMenu(device_frame, self.device_index_2, "None", *self.available_devices.keys())
+        secondary_device_menu = ttk.OptionMenu(device_frame, self.device_index_2, self.device_index_2.get(), 
+                                              "None", *self.available_devices.keys(),
+                                              command=self.on_secondary_device_change)
         secondary_device_menu.grid(column=1, row=3, sticky=tk.E, pady=(0, 5))
         secondary_device_menu.config(width=dropdown_width, style='Compact.TMenubutton')
 
@@ -1193,32 +1217,60 @@ Please also make sure you read the Terms of use and licence statement before usi
 
     def load_settings(self):
         settings_file = self.get_settings_file_path("settings.json")
+        
+        # Define default settings structure
+        default_settings = {
+            "chat_gpt_completion": False,
+            "model": self.default_model,
+            "prompt": "",
+            "auto_apply_ai_to_recording": False,
+            "current_tone": "None",
+            "hide_banner": False,
+            "input_device": "Default",   # Add default for input device
+            "primary_device": "Select Device",  # Also add for primary device
+            "secondary_device": "None",  # Also add for secondary device
+            "hotkeys": {
+                "record_start_stop": ["ctrl", "shift", "0"],
+                "stop_recording": ["ctrl", "shift", "9"],
+                "play_last_audio": ["ctrl", "shift", "8"],
+                "cancel_operation": ["ctrl", "shift", "1"]
+            },
+            "max_tokens": 750
+        }
+        
         try:
+            # Try to load existing settings
             with open(settings_file, "r") as f:
                 settings = json.load(f)
                 
-                # Check if the new cancel_operation hotkey exists
-                if "hotkeys" in settings and "cancel_operation" not in settings["hotkeys"]:
-                    settings["hotkeys"]["cancel_operation"] = ["ctrl", "shift", "1"]
-                    self.save_settings_to_JSON(settings)
+            # Check if settings need to be updated with new defaults
+            settings_updated = False
+            
+            # Recursively update nested dictionaries with missing keys
+            def update_missing_settings(existing, defaults):
+                nonlocal settings_updated
+                for key, value in defaults.items():
+                    if key not in existing:
+                        existing[key] = value
+                        settings_updated = True
+                    elif isinstance(value, dict) and isinstance(existing[key], dict):
+                        # Recursively update nested dictionaries
+                        update_missing_settings(existing[key], value)
+                return existing
+            
+            # Update settings with any missing values
+            settings = update_missing_settings(settings, default_settings)
+            
+            # Save if any settings were updated
+            if settings_updated:
+                self.save_settings_to_JSON(settings)
+                print("Settings file updated with new default values")
                 
         except FileNotFoundError:
-            # Default settings
-            settings = {
-                "chat_gpt_completion": False,
-                "model": self.default_model,
-                "prompt": "",
-                "auto_apply_ai_to_recording": False,
-                "current_tone": "None",
-                "hide_banner": False,
-                "hotkeys": {
-                    "record_start_stop": ["ctrl", "shift", "0"],
-                    "stop_recording": ["ctrl", "shift", "9"],
-                    "play_last_audio": ["ctrl", "shift", "8"],
-                    "cancel_operation": ["ctrl", "shift", "1"]
-                }
-            }
+            # Create new settings file with defaults if it doesn't exist
+            settings = default_settings
             self.save_settings_to_JSON(settings)
+        
         return settings
 
     def save_settings_to_JSON(self, settings):
@@ -1404,4 +1456,19 @@ Please also make sure you read the Terms of use and licence statement before usi
             # Otherwise, submit text as before
             self.submit_text()
 
+    def on_input_device_change(self, event):
+        """Handle changes to the input device dropdown."""
+        selected_device = event.widget.cget("value")
+        self.input_device_index.set(selected_device)
+
+    def on_primary_device_change(self, event):
+        """Handle changes to the primary device dropdown."""
+        selected_device = event.widget.cget("value")
+        self.device_index.set(selected_device)
+
+    def on_secondary_device_change(self, event):
+        """Handle changes to the secondary device dropdown."""
+        selected_device = event.widget.cget("value")
+        self.device_index_2.set(selected_device)
+