From 34ec530ddff0e1b3f235e136336484deb18ad7be Mon Sep 17 00:00:00 2001 From: raphael60650 Date: Tue, 27 Jul 2021 21:16:43 +0200 Subject: [PATCH] wszst module wasn't working properly, removed wszst prefix when calling one of its submodule --- source/Game.py | 32 ++++++++++++++++---------------- source/Track.py | 6 +++--- source/wszst/__init__.py | 6 +----- source/wszst/bmg.py | 6 +++--- source/wszst/ctc.py | 4 ++-- source/wszst/img.py | 4 ++-- source/wszst/lec.py | 4 ++-- source/wszst/szs.py | 12 ++++++------ source/wszst/wit.py | 8 ++++---- source/wszst/wstrt.py | 4 ++-- 10 files changed, 41 insertions(+), 45 deletions(-) diff --git a/source/Game.py b/source/Game.py index fb88120..61fba88 100644 --- a/source/Game.py +++ b/source/Game.py @@ -6,7 +6,7 @@ import json from .CT_Config import CT_Config from .definition import * -from . import wszst +from .wszst import * class RomAlreadyPatched(Exception): @@ -104,12 +104,12 @@ class Game: """ if format in ["ISO", "WBFS", "CISO"]: path_game_format: str = os.path.realpath(self.path + "/../MKWFaraphel." + format.lower()) - wszst.wit.copy(self.path, path_game_format, format) + wit.copy(self.path, path_game_format, format) shutil.rmtree(self.path) self.path = path_game_format self.gui.progress(statut=self.gui.translate("Changing game's ID"), add=1) - wszst.wit.edit(self.path, region_ID=self.region_ID, name=f"Mario Kart Wii Faraphel {self.ctconfig.version}") + wit.edit(self.path, region_ID=self.region_ID, name=f"Mario Kart Wii Faraphel {self.ctconfig.version}") def extract(self) -> None: """ @@ -126,7 +126,7 @@ class Game: if not (os.path.exists(path_dir)): break directory_name, i = f"MKWiiFaraphel ({i})", i + 1 - wszst.wit.extract(self.path, path_dir) + wit.extract(self.path, path_dir) self.path = path_dir if os.path.exists(self.path + "/DATA"): self.path += "/DATA" @@ -195,7 +195,7 @@ class Game: if extension == "szs": if not (os.path.realpath(path) in extracted_file): - wszst.szs.extract(path, get_nodir(path)) + szs.extract(path, get_nodir(path)) extracted_file.append(os.path.realpath(path)) szs_extract_path = path + ".d" @@ -223,12 +223,12 @@ class Game: for file in extracted_file: self.gui.progress(statut=self.gui.translate("Recompilating", "\n", get_nodir(file)), add=1) - wszst.szs.create(file) + szs.create(file) if os.path.exists(file + ".d"): shutil.rmtree(file + ".d") self.gui.progress(statut=self.gui.translate("Patch main.dol"), add=1) - wszst.wstrt.patch(self.path) + wstrt.patch(self.path) self.gui.progress(statut=self.gui.translate("Patch lecode.bin"), add=1) @@ -238,7 +238,7 @@ class Game: shutil.copyfile("./file/lpar-default.txt", self.path + "/tmp/lpar-default.txt") shutil.copyfile(f"./file/lecode-{self.region}.bin", self.path + f"/tmp/lecode-{self.region}.bin") - wszst.lec.patch( + lec.patch( self.path, lecode_file=f"./tmp/lecode-{self.region}.bin", dest_lecode_file=f"./files/rel/lecode-{self.region}.bin", @@ -263,7 +263,7 @@ class Game: :param auto_add_dir: autoadd directory """ if os.path.exists(auto_add_dir): shutil.rmtree(auto_add_dir) - wszst.szs.autoadd(self.path, auto_add_dir) + szs.autoadd(self.path, auto_add_dir) def patch_bmg(self, gamefile: str) -> None: """ @@ -291,10 +291,10 @@ class Game: bmglang = gamefile[-len("E.txt"):-len(".txt")] # Langue du fichier self.gui.progress(statut=self.gui.translate("Patching text", " ", bmglang), add=1) - wszst.szs.extract(gamefile, get_nodir(gamefile)) + szs.extract(gamefile, get_nodir(gamefile)) - bmgmenu = wszst.bmg.cat(gamefile, ".d/message/Menu.bmg") # Menu.bmg - bmgtracks = wszst.bmg.cat(gamefile, ".d/message/Common.bmg") # Common.bmg + bmgmenu = bmg.cat(gamefile, ".d/message/Menu.bmg") # Menu.bmg + bmgtracks = bmg.cat(gamefile, ".d/message/Common.bmg") # Common.bmg trackheader = "#--- standard track names" trackend = "2328" @@ -329,9 +329,9 @@ class Game: f.write(f" {track_id}\t= {prefix}{track_name}\n") - bmgcommon = wszst.ctc.patch_bmg(ctfile="./file/CTFILE.txt", + bmgcommon = ctc.patch_bmg(ctfile="./file/CTFILE.txt", bmgs=[gamefile + ".d/message/Common.bmg", "./file/ExtraCommon.txt"]) - rbmgcommon = wszst.ctc.patch_bmg(ctfile="./file/RCTFILE.txt", + rbmgcommon = ctc.patch_bmg(ctfile="./file/RCTFILE.txt", bmgs=[gamefile + ".d/message/Common.bmg", "./file/ExtraCommon.txt"]) shutil.rmtree(gamefile + ".d") @@ -342,7 +342,7 @@ class Game: for text, colored_text in replacement_list.items(): bmgtext = bmgtext.replace(text, colored_text) with open(file, "w", encoding="utf-8") as f: f.write(bmgtext) - wszst.bmg.encode(file) + bmg.encode(file) os.remove(file) finalise(f"./file/Menu_{bmglang}.txt", bmgmenu, menu_replacement) @@ -394,7 +394,7 @@ class Game: for i, file in enumerate(fc["img"]): self.gui.progress(statut=self.gui.translate("Converting images") + f"\n({i + 1}/{len(fc['img'])}) {file}", add=1) - wszst.img.encode("./file/" + file, fc["img"][file]) + img.encode("./file/" + file, fc["img"][file]) def patch_img_desc(self, img_desc_path: str = "./file/img_desc", dest_dir: str = "./file") -> None: """ diff --git a/source/Track.py b/source/Track.py index 5b7509f..7110fc4 100644 --- a/source/Track.py +++ b/source/Track.py @@ -1,7 +1,7 @@ import requests from .definition import * -from . import wszst +from .wszst import * class Track: @@ -60,14 +60,14 @@ class Track: check if track wu8's sha1 is correct :return: 0 if yes, -1 if no """ - if wszst.szs.sha1(self.file_wu8) == self.sha1: return 0 + if szs.sha1(self.file_wu8) == self.sha1: return 0 else: return -1 def convert_wu8_to_szs(self) -> None: """ convert track to szs """ - wszst.szs.normalize(src_file=self.file_wu8) + szs.normalize(src_file=self.file_wu8) def download_wu8(self, github_content_root: str) -> int: """ diff --git a/source/wszst/__init__.py b/source/wszst/__init__.py index 974f247..da03ff8 100644 --- a/source/wszst/__init__.py +++ b/source/wszst/__init__.py @@ -1,5 +1 @@ -from ..definition import * -from subprocess import CREATE_NO_WINDOW -import subprocess - -__all__ = ["bmg", "ctc", "img", "lec", "wstrt", "szs", "wit", "subprocess", "CREATE_NO_WINDOW"] +__all__ = ["bmg", "ctc", "img", "lec", "wstrt", "szs", "wit"] diff --git a/source/wszst/bmg.py b/source/wszst/bmg.py index 4f291ef..9a3b3e6 100644 --- a/source/wszst/bmg.py +++ b/source/wszst/bmg.py @@ -1,4 +1,4 @@ -from . import * +import subprocess def encode(file: str) -> None: @@ -7,7 +7,7 @@ def encode(file: str) -> None: :param file: txt file to convert """ subprocess.run(["./tools/szs/wbmgt", "ENCODE", file, "--overwrite"], - creationflags=CREATE_NO_WINDOW) + creationflags=subprocess.CREATE_NO_WINDOW) def cat(path: str, subfile: str = ".d/message/Common.bmg") -> str: @@ -18,5 +18,5 @@ def cat(path: str, subfile: str = ".d/message/Common.bmg") -> str: :return: bmg definition """ return subprocess.run(["./tools/szs/wbmgt", "CAT", path + subfile], - creationflags=CREATE_NO_WINDOW, + creationflags=subprocess.CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE).stdout.decode() \ No newline at end of file diff --git a/source/wszst/ctc.py b/source/wszst/ctc.py index 401c5ff..b97b5dc 100644 --- a/source/wszst/ctc.py +++ b/source/wszst/ctc.py @@ -1,4 +1,4 @@ -from . import * +import subprocess def ctc_patch_bmg(bmgs: list, ctfile: str = "./file/CTFILE.txt"): @@ -12,4 +12,4 @@ def ctc_patch_bmg(bmgs: list, ctfile: str = "./file/CTFILE.txt"): for bmg in bmgs: bmg_cmd.extend(["--patch-bmg", f"OVERWRITE={bmg}"]) return subprocess.run( ["tools/szs/wctct", "bmg", "--le-code", "--long", ctfile, *bmg_cmd], - creationflags=CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE).stdout.decode() \ No newline at end of file + creationflags=subprocess.CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE).stdout.decode() \ No newline at end of file diff --git a/source/wszst/img.py b/source/wszst/img.py index a81551f..8ff26ac 100644 --- a/source/wszst/img.py +++ b/source/wszst/img.py @@ -1,4 +1,4 @@ -from . import * +import subprocess def encode(src_file: str, format: str) -> None: @@ -8,4 +8,4 @@ def encode(src_file: str, format: str) -> None: :param format: new image format """ subprocess.run(["./tools/szs/wimgt", "ENCODE", src_file, "-x", format, "--overwrite"], - creationflags=CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE) + creationflags=subprocess.CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE) diff --git a/source/wszst/lec.py b/source/wszst/lec.py index 1b094a6..bb15f0f 100644 --- a/source/wszst/lec.py +++ b/source/wszst/lec.py @@ -1,4 +1,4 @@ -from . import * +import subprocess def patch(path: str, @@ -21,4 +21,4 @@ def patch(path: str, subprocess.run( ["./tools/szs/wlect", "patch", lecode_file, "-od", dest_lecode_file, "--track-dir", game_track_path, "--move-tracks", move_track_path, "--le-define", ctfile_path, "--lpar", lpar_path, "--overwrite"], - creationflags=CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE) \ No newline at end of file + creationflags=subprocess.CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE) \ No newline at end of file diff --git a/source/wszst/szs.py b/source/wszst/szs.py index 15ebcf6..6b7ccea 100644 --- a/source/wszst/szs.py +++ b/source/wszst/szs.py @@ -1,4 +1,4 @@ -from . import * +import subprocess def extract(file: str, dest_dir: str) -> None: @@ -8,7 +8,7 @@ def extract(file: str, dest_dir: str) -> None: :param dest_dir: directory where to extract the file """ subprocess.run(["./tools/szs/wszst", "EXTRACT", file, "--DEST", dest_dir + ".d"], - creationflags=CREATE_NO_WINDOW) + creationflags=subprocess.CREATE_NO_WINDOW) def sha1(file, autoadd_path: str = "./file/auto-add/") -> str: @@ -18,7 +18,7 @@ def sha1(file, autoadd_path: str = "./file/auto-add/") -> str: :return: track's sha1 """ return subprocess.run(["./tools/szs/wszst", "SHA1", file, "--autoadd-path", autoadd_path], - check=True, creationflags=CREATE_NO_WINDOW, + check=True, creationflags=subprocess.CREATE_NO_WINDOW, stdout=subprocess.PIPE).stdout.decode().split(" ")[0] @@ -34,7 +34,7 @@ def normalize(src_file: str, dest_dir: str = "./file/Track/", dest_name: str = " """ subprocess.run(["./tools/szs/wszst", "NORMALIZE", src_file, "--DEST", dest_dir + dest_name, "--" + output_format, "--overwrite", "--autoadd-path", autoadd_path], - creationflags=CREATE_NO_WINDOW, stderr=subprocess.PIPE) + creationflags=subprocess.CREATE_NO_WINDOW, stderr=subprocess.PIPE) def create(file: str) -> None: @@ -43,7 +43,7 @@ def create(file: str) -> None: :param file: create a .szs file from the directory {file}.d """ subprocess.run(["./tools/szs/wszst", "CREATE", file + ".d", "-d", file, "--overwrite"], - creationflags=CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE) + creationflags=subprocess.CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE) def autoadd(file: str, dest_dir: str) -> None: @@ -53,4 +53,4 @@ def autoadd(file: str, dest_dir: str) -> None: :param dest_dir: directory where to store autoadd file """ subprocess.run(["./tools/szs/wszst", "AUTOADD", file + "/files/Race/Course/", "--DEST", dest_dir], - creationflags=CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE) \ No newline at end of file + creationflags=subprocess.CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE) \ No newline at end of file diff --git a/source/wszst/wit.py b/source/wszst/wit.py index da9a2f0..174c4fb 100644 --- a/source/wszst/wit.py +++ b/source/wszst/wit.py @@ -1,4 +1,4 @@ -from . import * +import subprocess def extract(file: str, dest_dir: str) -> None: @@ -8,7 +8,7 @@ def extract(file: str, dest_dir: str) -> None: :param dest_dir: where to extract the game """ subprocess.run(["./tools/wit/wit", "EXTRACT", file, "--DEST", dest_dir], - creationflags=CREATE_NO_WINDOW) + creationflags=subprocess.CREATE_NO_WINDOW) def edit(file: str, region_ID: str = "P", name: str = "Mario Kart Wii") -> None: @@ -20,7 +20,7 @@ def edit(file: str, region_ID: str = "P", name: str = "Mario Kart Wii") -> None: """ subprocess.run( ["./tools/wit/wit", "EDIT", file, "--id", f"RMC{region_ID}60", "--name", name, "--modify", "ALL"], - creationflags=CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE) + creationflags=subprocess.CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE) def copy(src_path, dst_path, format: str = "ISO") -> None: @@ -31,4 +31,4 @@ def copy(src_path, dst_path, format: str = "ISO") -> None: :param format: format for the new game """ subprocess.run(["./tools/wit/wit", "COPY", src_path, "--DEST", dst_path, f"--{format.lower()}", "--overwrite"], - creationflags=CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE) + creationflags=subprocess.CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE) diff --git a/source/wszst/wstrt.py b/source/wszst/wstrt.py index a2ef645..9f5a236 100644 --- a/source/wszst/wstrt.py +++ b/source/wszst/wstrt.py @@ -1,4 +1,4 @@ -from . import * +import subprocess def patch(path: str) -> None: @@ -7,4 +7,4 @@ def patch(path: str) -> None: :param path: path to the game """ subprocess.run(["./tools/szs/wstrt", "patch", path + "/sys/main.dol", "--clean-dol", "--add-lecode"], - creationflags=CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE) \ No newline at end of file + creationflags=subprocess.CREATE_NO_WINDOW, check=True, stdout=subprocess.PIPE) \ No newline at end of file