From 448170dad967c08f824477c05dc60c40556af24b Mon Sep 17 00:00:00 2001 From: Faraphel Date: Thu, 21 Jul 2022 00:33:38 +0200 Subject: [PATCH] simplified cat_data to use list instead of dict --- .../UI/CommonLanguageMenu.d/message/Common.bmg.json | 2 +- .../Scene/UI/RaceLanguage.d/message/Common.bmg.json | 2 +- source/wt/bmg.py | 12 +++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/CommonLanguageMenu.d/message/Common.bmg.json b/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/CommonLanguageMenu.d/message/Common.bmg.json index 451c387..0739236 100644 --- a/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/CommonLanguageMenu.d/message/Common.bmg.json +++ b/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/CommonLanguageMenu.d/message/Common.bmg.json @@ -14,7 +14,7 @@ }, { "mode": "patch", - "patchs": {"LE-FORCE-COPY": null} + "patchs": ["LE-FORCE-COPY"] } ] }, diff --git a/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/RaceLanguage.d/message/Common.bmg.json b/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/RaceLanguage.d/message/Common.bmg.json index 78fb30b..f806f08 100644 --- a/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/RaceLanguage.d/message/Common.bmg.json +++ b/Pack/MKWFaraphel/essentials/_PATCH/files/Scene/UI/RaceLanguage.d/message/Common.bmg.json @@ -14,7 +14,7 @@ }, { "mode": "patch", - "patchs": {"LE-FORCE-COPY": null} + "patchs": ["LE-FORCE-COPY"] } ] }, diff --git a/source/wt/bmg.py b/source/wt/bmg.py index d603723..026fee4 100644 --- a/source/wt/bmg.py +++ b/source/wt/bmg.py @@ -31,20 +31,18 @@ def encode_data(txt_data: str) -> bytes: return stdout -def cat_data(txt_data: str, patchs: dict[str, str | None] = None, filters: dict[str, str | None] = None) -> str: +def cat_data(txt_data: str, patchs: list[str] = None, filters: list[str] = None) -> str: """ Patch and filter a bmgtxt file (for example LE-COPY). :patchs: dictionary of patchs bmg key and value """ args = [] - for key, value in filters.items() if filters is not None else {}: - args.append("--filter-bmg") - args.append(key if value is None else f"{key}={value}") + for filter_ in filters if filters is not None else []: + args.extend(["--filter-bmg", filter_]) - for key, value in patchs.items() if patchs is not None else {}: - args.append("--patch-bmg") - args.append(key if value is None else f"{key}={value}") + for patch in patchs if patchs is not None else []: + args.extend(["--patch-bmg", patch]) process = _tools_run_popen("CAT", "-", *args) stdout, _ = process.communicate(input=txt_data.encode("utf-8"))