From 5bb821b6d247da780b25c806162014a18b1a5b93 Mon Sep 17 00:00:00 2001
From: GorouFlex <98001973+gorouflex@users.noreply.github.com>
Date: Sun, 24 Mar 2024 23:18:51 +0700
Subject: [PATCH] ver 0.2.41

---
 Changelog.md                                  |   5 +
 UXTU4Mac/Assets/Presets/.DS_Store             | Bin 0 -> 6148 bytes
 ...APUMendocino-U.py => AMDAPUMendocino_U.py} |   0
 ...ostMatisse-G.py => AMDAPUPostMatisse_G.py} |   0
 ...tMatisse-GE.py => AMDAPUPostMatisse_GE.py} |   0
 ...ostMatisse-H.py => AMDAPUPostMatisse_H.py} |   0
 ...tMatisse-HS.py => AMDAPUPostMatisse_HS.py} |   0
 ...tMatisse-HX.py => AMDAPUPostMatisse_HX.py} |   0
 ...UPreMatisse-G.py => AMDAPUPreMatisse_G.py} |   0
 ...reMatisse-GE.py => AMDAPUPreMatisse_GE.py} |   0
 ...UPreMatisse-H.py => AMDAPUPreMatisse_H.py} |   0
 ...e-U-e-Ce.py => AMDAPUPreMatisse_U_e_Ce.py} |   0
 UXTU4Mac/UXTU4Mac.py                          |  92 +++++++++---------
 13 files changed, 51 insertions(+), 46 deletions(-)
 create mode 100644 UXTU4Mac/Assets/Presets/.DS_Store
 rename UXTU4Mac/Assets/Presets/{AMDAPUMendocino-U.py => AMDAPUMendocino_U.py} (100%)
 rename UXTU4Mac/Assets/Presets/{AMDAPUPostMatisse-G.py => AMDAPUPostMatisse_G.py} (100%)
 rename UXTU4Mac/Assets/Presets/{AMDAPUPostMatisse-GE.py => AMDAPUPostMatisse_GE.py} (100%)
 rename UXTU4Mac/Assets/Presets/{AMDAPUPostMatisse-H.py => AMDAPUPostMatisse_H.py} (100%)
 rename UXTU4Mac/Assets/Presets/{AMDAPUPostMatisse-HS.py => AMDAPUPostMatisse_HS.py} (100%)
 rename UXTU4Mac/Assets/Presets/{AMDAPUPostMatisse-HX.py => AMDAPUPostMatisse_HX.py} (100%)
 rename UXTU4Mac/Assets/Presets/{AMDAPUPreMatisse-G.py => AMDAPUPreMatisse_G.py} (100%)
 rename UXTU4Mac/Assets/Presets/{AMDAPUPreMatisse-GE.py => AMDAPUPreMatisse_GE.py} (100%)
 rename UXTU4Mac/Assets/Presets/{AMDAPUPreMatisse-H.py => AMDAPUPreMatisse_H.py} (100%)
 rename UXTU4Mac/Assets/Presets/{AMDAPUPreMatisse-U-e-Ce.py => AMDAPUPreMatisse_U_e_Ce.py} (100%)

diff --git a/Changelog.md b/Changelog.md
index ae5d82e..3509d8b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,8 @@
+## [0.2.41]
+
+- Fix various bug related to Welcome tutorial and get presets
+- Fix filename
+
 ## [0.2.4]
 
 - Extended presets based on UXTU's preset.
diff --git a/UXTU4Mac/Assets/Presets/.DS_Store b/UXTU4Mac/Assets/Presets/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/UXTU4Mac/Assets/Presets/AMDAPUMendocino-U.py b/UXTU4Mac/Assets/Presets/AMDAPUMendocino_U.py
similarity index 100%
rename from UXTU4Mac/Assets/Presets/AMDAPUMendocino-U.py
rename to UXTU4Mac/Assets/Presets/AMDAPUMendocino_U.py
diff --git a/UXTU4Mac/Assets/Presets/AMDAPUPostMatisse-G.py b/UXTU4Mac/Assets/Presets/AMDAPUPostMatisse_G.py
similarity index 100%
rename from UXTU4Mac/Assets/Presets/AMDAPUPostMatisse-G.py
rename to UXTU4Mac/Assets/Presets/AMDAPUPostMatisse_G.py
diff --git a/UXTU4Mac/Assets/Presets/AMDAPUPostMatisse-GE.py b/UXTU4Mac/Assets/Presets/AMDAPUPostMatisse_GE.py
similarity index 100%
rename from UXTU4Mac/Assets/Presets/AMDAPUPostMatisse-GE.py
rename to UXTU4Mac/Assets/Presets/AMDAPUPostMatisse_GE.py
diff --git a/UXTU4Mac/Assets/Presets/AMDAPUPostMatisse-H.py b/UXTU4Mac/Assets/Presets/AMDAPUPostMatisse_H.py
similarity index 100%
rename from UXTU4Mac/Assets/Presets/AMDAPUPostMatisse-H.py
rename to UXTU4Mac/Assets/Presets/AMDAPUPostMatisse_H.py
diff --git a/UXTU4Mac/Assets/Presets/AMDAPUPostMatisse-HS.py b/UXTU4Mac/Assets/Presets/AMDAPUPostMatisse_HS.py
similarity index 100%
rename from UXTU4Mac/Assets/Presets/AMDAPUPostMatisse-HS.py
rename to UXTU4Mac/Assets/Presets/AMDAPUPostMatisse_HS.py
diff --git a/UXTU4Mac/Assets/Presets/AMDAPUPostMatisse-HX.py b/UXTU4Mac/Assets/Presets/AMDAPUPostMatisse_HX.py
similarity index 100%
rename from UXTU4Mac/Assets/Presets/AMDAPUPostMatisse-HX.py
rename to UXTU4Mac/Assets/Presets/AMDAPUPostMatisse_HX.py
diff --git a/UXTU4Mac/Assets/Presets/AMDAPUPreMatisse-G.py b/UXTU4Mac/Assets/Presets/AMDAPUPreMatisse_G.py
similarity index 100%
rename from UXTU4Mac/Assets/Presets/AMDAPUPreMatisse-G.py
rename to UXTU4Mac/Assets/Presets/AMDAPUPreMatisse_G.py
diff --git a/UXTU4Mac/Assets/Presets/AMDAPUPreMatisse-GE.py b/UXTU4Mac/Assets/Presets/AMDAPUPreMatisse_GE.py
similarity index 100%
rename from UXTU4Mac/Assets/Presets/AMDAPUPreMatisse-GE.py
rename to UXTU4Mac/Assets/Presets/AMDAPUPreMatisse_GE.py
diff --git a/UXTU4Mac/Assets/Presets/AMDAPUPreMatisse-H.py b/UXTU4Mac/Assets/Presets/AMDAPUPreMatisse_H.py
similarity index 100%
rename from UXTU4Mac/Assets/Presets/AMDAPUPreMatisse-H.py
rename to UXTU4Mac/Assets/Presets/AMDAPUPreMatisse_H.py
diff --git a/UXTU4Mac/Assets/Presets/AMDAPUPreMatisse-U-e-Ce.py b/UXTU4Mac/Assets/Presets/AMDAPUPreMatisse_U_e_Ce.py
similarity index 100%
rename from UXTU4Mac/Assets/Presets/AMDAPUPreMatisse-U-e-Ce.py
rename to UXTU4Mac/Assets/Presets/AMDAPUPreMatisse_U_e_Ce.py
diff --git a/UXTU4Mac/UXTU4Mac.py b/UXTU4Mac/UXTU4Mac.py
index c1d327b..117b600 100644
--- a/UXTU4Mac/UXTU4Mac.py
+++ b/UXTU4Mac/UXTU4Mac.py
@@ -5,7 +5,7 @@
 CONFIG_PATH = 'Assets/config.ini'
 LATEST_VERSION_URL = "https://github.com/AppleOSX/UXTU4Mac/releases/latest"
 GITHUB_API_URL = "https://api.github.com/repos/AppleOSX/UXTU4Mac/releases/latest"
-LOCAL_VERSION = "0.2.4"
+LOCAL_VERSION = "0.2.41"
 cpu_hierarchy = ["Raven Ridge", "Dali", "Picasso", "Massite", "Renoir", "Lucienne", "Mendocino", "Cezanne", "Barcelo", "Barcelo-R", "Rembrandt", "Rembrandt-R", "Dragon Range", "Phoenix"]
 os.makedirs('Logs', exist_ok=True)
 logging.basicConfig(filename='Logs/UXTU4Mac.log', filemode='w', encoding='utf-8',
@@ -46,49 +46,49 @@ def get_presets():
     cpu_family = get_hardware_info("Assets/ryzenadj -i | grep 'CPU Family' | awk -F': ' '{print $2}'", use_sudo=True)
     cpu_model = get_hardware_info("sysctl -n machdep.cpu.brand_string")
     loca = None
-    if cpu_hierarchy.index(cpu_family) < cpu_hierarchy.index("Massite"):
-        if "U" in cpu_model or "e" in cpu_model or "Ce" in cpu_model:
-            loca = "Assets.Presets.AMDAPUPreMatisse_U_e_Ce"
-            from Assets.Presets.AMDAPUPreMatisse_U_e_Ce import PRESETS
-            logging.info("what")
-        elif "H" in cpu_model:
-            loca = "Assets.Presets.AMDAPUPreMatisse_H"
-            from Assets.Presets.AMDAPUPreMatisse_H import PRESETS
-        elif "GE" in cpu_model:
-            loca = "Assets.Presets.AMDAPUPreMatisse_GE"
-            from Assets.Presets.AMDAPUPreMatisse_GE import PRESETS
-        elif "G" in cpu_model:
-            loca = "Assets.Presets.AMDAPUPreMatisse_G"
-            from Assets.Presets.AMDAPUPreMatisse_G import PRESETS
-        else:
-            loca = "Assets.Presets.AMDCPU"
-            from Assets.Presets.AMDCPU import PRESETS
-    elif cpu_hierarchy.index(cpu_family) > cpu_hierarchy.index("Massite"):
-        if "U" in cpu_model:
-            loca = "Assets.Presets.AMDAPUPostMatisse_U"
-            from Assets.Presets.AMDAPUPostMatisse_U import PRESETS
-        elif "HX" in cpu_model:
-            loca = "Assets.Presets.AMDAPUPostMatisse_HX"
-            from Assets.Presets.AMDAPUPostMatisse_HX import PRESETS
-        elif "HS" in cpu_model:
-            loca = "Assets.Presets.AMDAPUPostMatisse_HS"
-            from Assets.Presets.AMDAPUPostMatisse_HS import PRESETS
-        elif "H" in cpu_model:
-            loca = "Assets.Presets.AMDAPUPostMatisse_H"
-            from Assets.Presets.AMDAPUPostMatisse_H import PRESETS
-        elif "G" in cpu_model:
-            loca = "Assets.Presets.AMDAPUPostMatisse_G"
-            from Assets.Presets.AMDAPUPostMatisse_G import PRESETS
-        elif "GE" in cpu_model:
-            loca = "Assets.Presets.AMDAPUPostMatisse_GE"
-            from Assets.Presets.AMDAPUPostMatisse_GE import PRESETS
-        else:
-            loca = "Assets.Presets.AMDCPU"
-            from Assets.Presets.AMDCPU import PRESETS
-    elif cpu_hierarchy.index(cpu_family) == cpu_hierarchy.index("Mendocino") and "U" in cpu_model:
-        loca = "Assets.Presets.AMDAPUMendocino_U"
-        from Assets.Presets.AMDAPUMendocino_U import PRESETS
-    else:
+    try:
+        if cpu_hierarchy.index(cpu_family) < cpu_hierarchy.index("Massite"):
+            if "U" in cpu_model or "e" in cpu_model or "Ce" in cpu_model:
+                loca = "Assets.Presets.AMDAPUPreMatisse_U_e_Ce"
+                from Assets.Presets.AMDAPUPreMatisse_U_e_Ce import PRESETS
+            elif "H" in cpu_model:
+                loca = "Assets.Presets.AMDAPUPreMatisse_H"
+                from Assets.Presets.AMDAPUPreMatisse_H import PRESETS
+            elif "GE" in cpu_model:
+                loca = "Assets.Presets.AMDAPUPreMatisse_GE"
+                from Assets.Presets.AMDAPUPreMatisse_GE import PRESETS
+            elif "G" in cpu_model:
+                loca = "Assets.Presets.AMDAPUPreMatisse_G"
+                from Assets.Presets.AMDAPUPreMatisse_G import PRESETS
+            else:
+                loca = "Assets.Presets.AMDCPU"
+                from Assets.Presets.AMDCPU import PRESETS
+        elif cpu_hierarchy.index(cpu_family) > cpu_hierarchy.index("Massite"):
+            if "U" in cpu_model:
+                loca = "Assets.Presets.AMDAPUPostMatisse_U"
+                from Assets.Presets.AMDAPUPostMatisse_U import PRESETS
+            elif "HX" in cpu_model:
+                loca = "Assets.Presets.AMDAPUPostMatisse_HX"
+                from Assets.Presets.AMDAPUPostMatisse_HX import PRESETS
+            elif "HS" in cpu_model:
+                loca = "Assets.Presets.AMDAPUPostMatisse_HS"
+                from Assets.Presets.AMDAPUPostMatisse_HS import PRESETS
+            elif "H" in cpu_model:
+                loca = "Assets.Presets.AMDAPUPostMatisse_H"
+                from Assets.Presets.AMDAPUPostMatisse_H import PRESETS
+            elif "G" in cpu_model:
+                loca = "Assets.Presets.AMDAPUPostMatisse_G"
+                from Assets.Presets.AMDAPUPostMatisse_G import PRESETS
+            elif "GE" in cpu_model:
+                loca = "Assets.Presets.AMDAPUPostMatisse_GE"
+                from Assets.Presets.AMDAPUPostMatisse_GE import PRESETS
+            else:
+                loca = "Assets.Presets.AMDCPU"
+                from Assets.Presets.AMDCPU import PRESETS
+        elif cpu_hierarchy.index(cpu_family) == cpu_hierarchy.index("Mendocino") and "U" in cpu_model:
+            loca = "Assets.Presets.AMDAPUMendocino_U"
+            from Assets.Presets.AMDAPUMendocino_U import PRESETS
+    except:  
         loca = "Assets.Presets.AMDCPU"
         from Assets.Presets.AMDCPU import PRESETS
     cfg.set('User', 'Preset', loca)
@@ -224,10 +224,10 @@ def welcome_tutorial():
         raise SystemExit
     with open(CONFIG_PATH, 'w') as config_file:
         cfg.write(config_file)
-    preset_cfg()
-    clear()
     if not check_run():
        install_menu()
+    preset_cfg()
+    clear()
        
 def settings():
     options = {