From 59cac90c588d6433f4a5d517ac876ca8769ebb61 Mon Sep 17 00:00:00 2001 From: SimplifiedPrivacy Date: Sun, 12 Jul 2026 20:02:10 -0400 Subject: [PATCH] Assets folder is part of startup --- gui/__main__.py | 13 +++++++++++-- gui/__pycache__/__main__.cpython-312.pyc | Bin 4919 -> 5088 bytes .../assets}/yaml_mappings/locations.yaml | 0 .../assets}/yaml_mappings/mapping_one.yaml | 0 .../assets}/yaml_mappings/operators.yaml | 0 5 files changed, 11 insertions(+), 2 deletions(-) rename {assets => gui/assets}/yaml_mappings/locations.yaml (100%) rename {assets => gui/assets}/yaml_mappings/mapping_one.yaml (100%) rename {assets => gui/assets}/yaml_mappings/operators.yaml (100%) diff --git a/gui/__main__.py b/gui/__main__.py index 79a77ac..0cb9a78 100644 --- a/gui/__main__.py +++ b/gui/__main__.py @@ -1,6 +1,7 @@ from core.errors.logger import logger from core.models.manage.session_management import init_session, get_session, close_session, create_ALL_tables, create_ONLY_db_version_table, get_path, does_it_exist, does_db_version_table_exist from core.models.manage.version_check import check_database_compatibility, insert_new_version, get_custom_message +from core.services.helpers.manage_assets import assets_folder_setup from core.Constants import Constants # generic import os @@ -25,7 +26,7 @@ def recovery_dialog(custom_error, db_version_you_have): elif choice == 2: logger.info(f"[DB MANAGEMENT] User opted to move the DB file.") - from v2.ui.popups.pick_folder_to_move import launch_file_picker + from gui.v2.ui.popups.pick_folder_to_move import launch_file_picker launch_file_picker(database_path) sys.exit() @@ -33,6 +34,14 @@ def recovery_dialog(custom_error, db_version_you_have): logger.error(f"[DB MANAGEMENT] User opted to close the app WITHOUT wiping the database, even though they need to.") sys.exit() +# ============================================================================ +# ASSETS FOLDER +# ============================================================================ +if not assets_folder_setup(): + from gui.v2.ui.popups.Database_version import show_recovery_dialog + custom_error = "Unable to Setup your Assets Folder." + recovery_dialog(custom_error, 0) + # ============================================================================ # INITIALIZE DATABASE # ============================================================================ @@ -87,7 +96,7 @@ if is_compatable: custom_error = "Critical Failure with starting the models of the database." logger.error(f"[DB MANAGEMENT] {custom_error}") close_session() - from v2.ui.popups.Database_version import show_recovery_dialog + from gui.v2.ui.popups.Database_version import show_recovery_dialog choice = show_recovery_dialog({"message": custom_error, "db_version": 0, "status": "cant_make"}) logger.info(f"[DB MANAGEMENT] From the database error options, the user picked {choice}") sys.exit() diff --git a/gui/__pycache__/__main__.cpython-312.pyc b/gui/__pycache__/__main__.cpython-312.pyc index b08c5f5d7f0146f7c0c56b43d4b253e5b9ee66c6..1a452b95213719a2fdd441aff61f2c34b21c5d17 100644 GIT binary patch delta 1418 zcmZ`(&2JM&6rXW6#$Lycvuh_#Vq+USbsPr^gaiemiYg*i+eoG2OPWKM#q)6N?0Tb_ z4U)N-14mR5?F|B|#Hq?LhyDRQA+8{`Mo2{*svha7LL54?#>POrhqp8D{oZ@O_p$ri z7k`yvPoq&4iDz!MSFoB0wbXb_3>mDW~q8Bf)JS#`Y_Dx;U136i~HDn+|HAD zBQ5Ugz%K(Cej4W4DWS#9m7dSAq>+9kKjV1cQ?QyKDH3$HBhkWz=aDv{M#^_`}04a>X#Oc%kQyfWHgW>~3btpVQ50zftGYDY>MfO}c z1^X3{1z6x$Xu|I;Zmu6dO4Q|51KA%3lMwzhatd^s&g_m2iYkpHlY)|<5$GfR9`<^Z z?;ONQ2hA@Hw+V8_H1TnxFk3{(~*>cW&NVvMZz_I#HnM&BYEvOfKEQW6yjb zLJyPWR$?SFJA|Af%K}${48)2IH1gXR+Dmc! zWFOnXa^WA@#4_#%EvH@wRt|N&73D=jH#rBF8#f$_0yD&Uduu;2{amzEqI83`4X059miE3;uZ}MZRn&W|?&9ygbCK#2(}dzy;d0BoZb8m< zau;RLT-(`Zxv%|fxivpq)oVq%xa561v8#2%HM8X!wz&x`Dg4>&{=11(03Y>|llM0Z zHHSf!1G_2G^6CayTflhLHd|&Lj9v+BQc{cg$W^DsT@jD7xQvyRq9}#r$}&>OLfE1Z z-3V`U7i?q8bT`-$@73gq9}Y`nS&9XT&}xn?tmgHG)o|MeZPeWESRGtemDXs38-0KU z-H2^cFa+2F&Pp=Il6N delta 1015 zcmZ8gJ#5oJ81*G_+SrK`J3lr_-6S-rn-oxip+$u*T($kZ55?9W$^YvBC;MgawHiAs84sAnsBeM|k+;d+*)%^FI5l^?F`;AB#x>dv1g_ znxfuUjKH5@f8oxGtzrR-EzQ<&cu%mC0Rg5DxsW|}3Q~CLk<8xG439wi5dC8^{iB?z zGf*0f4KUmbkRi(qMa^^ct(c^5!ZO_r#Pbn5izPe9m?UH&cNjQMg9L_X%@z6>nPtPB zVy7uD--wHXJ}zm3*}TNFsxppx8SK1=CSzC`qXoZ*tUmwBb223gt+woAGS3Aj{S=uE^O;D68tUrVC5}p)9pXUE?d>?P1agYARThq>FSa}Q tVGGvC6?Wu5pu0@>)Us0gCPcmn(l054l0R1lAJh;+R|lW9APVu@e*vf%)QA88 diff --git a/assets/yaml_mappings/locations.yaml b/gui/assets/yaml_mappings/locations.yaml similarity index 100% rename from assets/yaml_mappings/locations.yaml rename to gui/assets/yaml_mappings/locations.yaml diff --git a/assets/yaml_mappings/mapping_one.yaml b/gui/assets/yaml_mappings/mapping_one.yaml similarity index 100% rename from assets/yaml_mappings/mapping_one.yaml rename to gui/assets/yaml_mappings/mapping_one.yaml diff --git a/assets/yaml_mappings/operators.yaml b/gui/assets/yaml_mappings/operators.yaml similarity index 100% rename from assets/yaml_mappings/operators.yaml rename to gui/assets/yaml_mappings/operators.yaml