uses str instead of def everything😭

Author: daveberrys

src/back/api/sendingFile.py

@@ -25,7 +25,7 @@ def catbox(file_path):
             if response.status_code == 200:
                 result = response.text.strip()
                 if result:
-                    if Settings().readSet._history():
+                    if Settings().getSetting("history"):
                         his().storeHistory("catbox", os.path.basename(file_path), result, "")
                     return result
                 return "Error: Server returned empty response."
@@ -45,7 +45,7 @@ def litterbox(file_path, duration="1h"):
             if response.status_code == 200:
                 result = response.text.strip()
                 if result:
-                    if Settings().readSet._history():
+                    if Settings().getSetting("history"):
                         his().storeHistory("litterbox", os.path.basename(file_path), result, duration)
                     return result
                 return "Error: Server returned empty response."
@@ -64,7 +64,7 @@ def buzzheavier(file_path):
                 data = response.json()
                 fileID = data.get("data", {}).get("id")
                 if fileID:
-                    if Settings().readSet._history():
+                    if Settings().getSetting("history"):
                         his().storeHistory("buzzheavier", filename, f"https://buzzheavier.com/{fileID}", "")
                     return f"https://buzzheavier.com/{fileID}"
                 return "Error: Could not find file ID in response."

src/back/system/contact.py

@@ -22,7 +22,7 @@ def pickFile(self):
     def uploadTo(self, path, platform, duration="1h"):
         filename = os.path.basename(path)
 
-        if Settings().readSet._notifyYou():
+        if Settings().getSetting("notifyYou"):
             notify("Upload Started", f"Sending {filename} to {platform}...")
 
         result = ""
@@ -36,16 +36,16 @@ def uploadTo(self, path, platform, duration="1h"):
             result = "Unknown platform"
 
         if result.startswith("http"):
-            if Settings().readSet._notifyYou():
+            if Settings().getSetting("notifyYou"):
                 notify("Upload Success!", f"Link: {result}")
         else:
-            if Settings().readSet._notifyYou():
+            if Settings().getSetting("notifyYou"):
                 notify("Upload Failed", f"Problem with {platform}: {result}")
 
         return result
 
     def checkForUpdates(self):
-        if not Settings().readSet._checkForUpdates():
+        if not Settings().getSetting("checkForUpdates"):
             print.debug("Updates disabled by user.")
             return {"status": "disabled"}
 

src/back/system/settings.py

@@ -32,15 +32,11 @@ def __init__(self):
         self.defaultSettingsPath = os.path.join(os.path.dirname(__file__), "extra", "settings.json")
 
         if not os.path.exists(self.defaultSettingsPath):
-            # Fallback for running from root
             self.defaultSettingsPath = os.path.abspath(os.path.join("src", "back", "extra", "settings.json"))
 
         self.defaultSettings = {}
         self.settings = {}
 
-        # passing through
-        self.readSet = self.ReadSettings(self.settingsPath)
-
     def checkFolder(self):
         if os.path.exists(self.configPath):
             print.success(f"Config path found at: {self.configPath}")
@@ -107,37 +103,9 @@ def updateSetting(self, key, value):
             print.error(f"Error updating setting: {e}")
             return False
 
-    class ReadSettings:
-        def __init__(self, path):
-            self.settingPath = path
-
-        def _checkForUpdates(self):
-            try:
-                with open(self.settingPath, "r") as f:
-                    return json.load(f).get("checkForUpdates", True)
-            except Exception:
-                pass
-
-        def _history(self):
-            try:
-                with open(self.settingPath, "r") as f:
-                    return json.load(f).get("history", True)
-            except Exception:
-                pass
-            return True
-
-        def _minimizeToTray(self):
-            try:
-                with open(self.settingPath, "r") as f:
-                    return json.load(f).get("minimizeToTray", True)
-            except Exception:
-                pass
-            return True
-        
-        def _notifyYou(self):
-            try:
-                with open(self.settingPath, "r") as f:
-                    return json.load(f).get("notifyYou", True)
-            except Exception:
-                pass
-            return True
+    def getSetting(self, key):
+        try:
+            with open(self.settingsPath, "r") as f:
+                return json.load(f).get(key, True)
+        except Exception:
+            pass

src/front/window.py

@@ -45,7 +45,7 @@ def createWindow(self):
             height=600,
         )
 
-        if Settings().readSet._minimizeToTray():
+        if Settings().getSetting("minimizeToTray"):
             self.window.events.closing += self.onWindowClosing
 
     def onWindowClosing(self):
@@ -88,7 +88,7 @@ def start(self, debugMode):
         if self.debugMode:
             print.success("Debug mode is active.")
 
-        if Settings().readSet._minimizeToTray():
+        if Settings().getSetting("minimizeToTray"):
             trayThread = threading.Thread(target=self.setupTray, daemon=True)
             trayThread.start()