From 967fa39c472ac7000007fed146d05b600186f1d1 Mon Sep 17 00:00:00 2001 From: Insiro Date: Sat, 19 Aug 2023 17:15:12 +0900 Subject: [PATCH] fix: merge_mods desktop.ini handling error genshin_merge_mods.py try to rename desktop.ini - make ignore desktop.ini file --- Tools/genshin_merge_mods.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Tools/genshin_merge_mods.py b/Tools/genshin_merge_mods.py index 4c87374..0e6a3c4 100644 --- a/Tools/genshin_merge_mods.py +++ b/Tools/genshin_merge_mods.py @@ -289,7 +289,10 @@ def main(): if not args.store: print("Cleanup and disabling ini") for file in ini_files: - os.rename(file, os.path.join(os.path.dirname(file), "DISABLED") + os.path.basename(file)) + f_basename = os.path.basename(file) + if f_basename.lower() == "desktop.ini": + continue + os.rename(file, os.path.join(os.path.dirname(file), "DISABLED") + f_basename) print("All operations completed") @@ -302,7 +305,7 @@ def collect_ini(path, ignore): if "disabled" in root.lower(): continue for file in files: - if "disabled" in file.lower() or ignore.lower() in file.lower(): + if "disabled" in file.lower() or ignore.lower() in file.lower() or file.endswith("desktop.ini"): continue if os.path.splitext(file)[1] == ".ini": ini_files.append(os.path.join(root, file)) @@ -312,6 +315,8 @@ def collect_ini(path, ignore): def enable_ini(path): for root, dir, files in os.walk(path): for file in files: + if file.lower().endswith("desktop.ini"): + continue if os.path.splitext(file)[1] == ".ini" and ("disabled" in root.lower() or "disabled" in file.lower()): print(f"\tRe-enabling {os.path.join(root, file)}") new_path = re.compile("disabled", re.IGNORECASE).sub("", os.path.join(root, file))