update method for storing data

Storing settings and other files that need to persist now use flet's storage environment variable so settings and other files persist after app updates

Author: knightlygains

main.py

@@ -5,20 +5,19 @@
 import text_values as text_values # Long text values stored in separate file
 from dynamic_modal import DynamicModal
 from are_you_sure import YouSure
-from settings_values import settings_values, custom_scripts, load_settings, update_scripts, settings_path
+from settings_values import *
 
 # Create settings.json if not exists and/or load saved values
 load_settings(e=None, update=False)
 
 # Create recent_computers.json
-recent_computers_path = "assets/settings/recent_computers.json"
 if os.path.exists(recent_computers_path) == False:
     with open(recent_computers_path, "w") as file:
         print(f"{recent_computers_path} created")
         init_data = {"computers":[]}
         json.dump(init_data, file, indent=4)
 
-list_path = "assets/settings/lists/computers.txt"
+computerlist_path = "assets/settings/lists/computers.txt"
 
 #Cleanup old files
 printers_path = "assets/results/Printers"
@@ -50,15 +49,13 @@
     for filename in os.listdir(uptime_path):
         pathlib.Path(f"{uptime_path}/{filename}").unlink()
 
-
-
 # Program
 def main(page: ft.Page):
     #Setup PowerShell
     powershell = the_shell.Power_Shell()
 
     page.fonts = {
-        "Consola": "assets/fonts/Consola.ttf"
+        "Consola": "fonts/Consola.ttf"
     }
 
     def min_max(e):
@@ -78,7 +75,7 @@ def min_max(e):
     drag_window = ft.Container(
         content=ft.Row([
             ft.Container(
-                content=ft.Image(src="assets/images/itremote.svg", width=32),
+                content=ft.Image(src="images/itremote.svg", width=32),
                 padding=ft.padding.only(left=10, top=3)
             ),
             ft.WindowDragArea(ft.Container(
@@ -614,18 +611,18 @@ def check_computer_name():
     def check_list():
 
         try:
-            with open(list_path, "r") as file:
+            with open(computerlist_path, "r") as file:
 
                 contents = file.read()
                 if contents == "":
                     show_message("List is empty.")
                     return False
         except FileNotFoundError as e:
-            with open(list_path, "x") as file:
+            with open(computerlist_path, "x") as file:
                 print("Computer list file created.")
 
         try:
-            with open(list_path, "r") as list:
+            with open(computerlist_path, "r") as list:
                 computers = list.read()
                 if computers == "":
                     show_message("List is empty.")
@@ -637,7 +634,7 @@ def check_list():
                 else:
                     return True
         except FileNotFoundError as e:
-            with open(list_path, "x") as file:
+            with open(computerlist_path, "x") as file:
                 print("Computer list file created.")
 
     def find_day(date):
@@ -2172,7 +2169,7 @@ def run_operation(computer):
             # an array of them.
             if computer == "list of computers":
                 list_of_pcs = []
-                list = open(list_path, "r")
+                list = open(computerlist_path, "r")
                 computers = list.readlines()
                 for pc in computers:
                     list_of_pcs.append(pc.strip("\\n"))
@@ -2850,7 +2847,7 @@ def clicked(e):
 
     def open_errors(e):
         try:
-            with open("assets/settings/log.txt", "r") as file:
+            with open(logging_path, "r") as file:
                 errors = file.readlines()
                 list_of_errors = []
 
@@ -3429,7 +3426,7 @@ def on_github_hover(e):
                         width=210
                     ),
                     ft.Container(
-                        content=ft.Image(src="assets/images/Github.png", width=70),
+                        content=ft.Image(src="images/Github.png", width=70),
                         url="https://github.com/knightlygains/it-remote",
                         offset=ft.transform.Offset(2, 2),
                         on_hover=on_github_hover,
@@ -3446,7 +3443,7 @@ def on_github_hover(e):
         ft.Row([
             ft.Container(
                 content=ft.Column([
-                    ft.Image(src="assets/images/ko-fi.png", width=70),
+                    ft.Image(src="images/ko-fi.png", width=70),
                     ft.Text("Ko-Fi", weight=ft.FontWeight.BOLD)
                 ], horizontal_alignment=ft.CrossAxisAlignment.CENTER),
                 margin=ft.margin.only(top=20),
@@ -3456,7 +3453,7 @@ def on_github_hover(e):
             ),
             ft.Container(
                 content=ft.Column([
-                    ft.Image(src="assets/images/patreon.png", width=70),
+                    ft.Image(src="images/patreon.png", width=70),
                     ft.Text("Patreon", weight=ft.FontWeight.BOLD)
                 ], horizontal_alignment=ft.CrossAxisAlignment.CENTER),
                 margin=ft.margin.only(top=20),

settings_values.py

@@ -14,33 +14,41 @@
     "home_tab": 1
 }
 
+# Dict to store custom_script info
 custom_scripts = {
 
 }
 
-custom_scripts_path = "assets/settings/custom_scripts.json"
-settings_path = "assets/settings/settings.json"
-computerlist_path = "assets/settings/lists/computers.txt"
-logging_path = "assets/settings/log.txt"
+# Flet's storage directory that persists after updates
+storage_directory = os.getenv("FLET_APP_STORAGE_DATA")
+
+# Define paths for different settings/files
+custom_scripts_path = f"{storage_directory}/custom_scripts.json"
+settings_path = f"{storage_directory}/settings.json"
+computerlist_path = f"{storage_directory}/computers.txt"
+logging_path = f"{storage_directory}/log.txt"
+recent_computers_path = f"{storage_directory}/recent_computers.json"
 
 # Make settings directory
-if not os.path.exists("assets/settings"):
+if not os.path.exists(settings_path):
     try:
-        os.mkdir("assets/settings")
+        with open(settings_path, "w") as file:
+            print(f"Created {settings_path}")
     except Exception as e:
         print(e)
 
 if not os.path.exists(logging_path):
     try:
         with open(logging_path, "w") as file:
-            print("Created log.txt")
+            print(f"Created {logging_path}")
     except Exception as e:
         print(e)
 
 # Make lists directory
-if not os.path.exists("assets/settings/lists"):
+if not os.path.exists(computerlist_path):
     try:
-        os.mkdir("assets/settings/lists")
+        with open(computerlist_path, "w") as file:
+            print(f"Created {computerlist_path}")
     except Exception as e:
         print(e)
 
@@ -80,7 +88,7 @@ def load_settings(e, update):
     if update:
         try:
             with open(settings_path, "r") as file:
-                print("settings.json exists, updating")
+                print(f"{settings_path} exists, updating")
                 data = json.load(file)
                 # Update each setting with value
                 # stored in settings_values
@@ -118,10 +126,10 @@ def load_settings(e, update):
                     settings_values[key] = value
             except json.decoder.JSONDecodeError:
                 print("No settings data found")
-    except FileNotFoundError:
-        print("No settings.json found. Creating a new one.")
+    except Exception as e:
+        print(f"No {settings_path} found. Creating a new one.")
         with open(settings_path, "w") as file:
-            print("settings.json created")
+            print(f"{settings_path} created")
             json.dump(settings_values, file, indent=4)
 
     # Create custom_scripts json