Add asset config, move libast, formatting

Author: jdflyer

.gitignore

@@ -32,5 +32,9 @@ docs/doxygen/
 __pycache__/
 venv/
 
+# m2ctx files
 m2ctx.py
 ctx.c
+
+# Asset Config
+asset_config.json

Makefile

@@ -156,7 +156,11 @@ tools: dirs $(ELF2DOL) $(YAZ0)
 
 assets:
 	@mkdir -p game
-	$(PYTHON) tools/extract_game_assets.py $(IMAGENAME) game
+	$(PYTHON) tools/extract_game_assets.py $(IMAGENAME) game native asset_config.json
+
+assets-fast:
+	@mkdir -p game
+	$(PYTHON) tools/extract_game_assets.py $(IMAGENAME) game oead asset_config.json
 
 docs:
 	$(DOXYGEN) Doxyfile
@@ -189,19 +193,19 @@ shiftedrels: shift $(RELS)
 
 game: shiftedrels
 	@mkdir -p game
-	@$(PYTHON) tools/package_game_assets.py ./game $(BUILD_PATH) copyCode native
+	@$(PYTHON) tools/package_game_assets.py ./game $(BUILD_PATH) copyCode native asset_config.json
 
 game-fast: shiftedrels
 	@mkdir -p game
-	@$(PYTHON) tools/package_game_assets.py ./game $(BUILD_PATH) copyCode oead
+	@$(PYTHON) tools/package_game_assets.py ./game $(BUILD_PATH) copyCode oead asset_config.json
 
 game-nocompile:
 	@mkdir -p game
-	@$(PYTHON) tools/package_game_assets.py ./game $(BUILD_PATH) noCopyCode native
+	@$(PYTHON) tools/package_game_assets.py ./game $(BUILD_PATH) noCopyCode native asset_config.json
 
 game-nocompile-fast:
 	@mkdir -p game
-	@$(PYTHON) tools/package_game_assets.py ./game $(BUILD_PATH) noCopyCode oead
+	@$(PYTHON) tools/package_game_assets.py ./game $(BUILD_PATH) noCopyCode oead asset_config.json
 
 rungame-nocompile: game-nocompile
 	@echo If you are playing on a shifted game make sure Hyrule Field Speed hack is disabled in dolphin!

tools/assets_config.py

@@ -0,0 +1,119 @@
+import curses
+from sys import argv
+import json
+from os import path
+
+CONFIG_DESCRIPTIONS = {
+    "decompress_assets": "Decompress Yaz0 compressed assets (appends .c to the filename)",
+    "extract_arc": "Extract archive (.arc) files",
+    "convert_stages": "Convert Stage Files (.dzs and .dzr) to json",
+    "convert_textures": "Convert Textures (.bti) to png",
+    "update_copydate": "Update COPYDATE on build",
+    "package_maps": "Package Symbol Map (.map) files on build",
+}
+
+CONFIG_DEFAULTS = {
+    "decompress_assets": True,
+    "extract_arc": True,
+    "convert_stages": True,
+    "convert_textures": False,
+    "update_copydate": True,
+    "package_maps": True,
+}
+
+CONFIGFILE_DEFAULT = "asset_config.json"
+
+
+def printMenu(stdscr, selected_idx, options):
+    stdscr.clear()
+    height, width = stdscr.getmaxyx()
+
+    left = min([(width // 2) - (len(option) // 2) for option in options])
+    top = (height // 2) - (len(options) // 2)
+
+    stdscr.addstr(top - 2, left, "Configure Asset Extraction/Packaging (q to save):")
+
+    for idx, option in enumerate(options):
+        x = left
+        y = top + idx
+
+        if idx == selected_idx:
+            stdscr.attron(curses.color_pair(1))
+            stdscr.addstr(y, x, option)
+            stdscr.attroff(curses.color_pair(1))
+        else:
+            stdscr.addstr(y, x, option)
+
+    stdscr.refresh()
+
+
+def cursesMenu(stdscr, values):
+    curses.curs_set(0)
+    curses.init_pair(1, curses.COLOR_BLACK, curses.COLOR_WHITE)
+
+    keys = list(values.keys())
+    options = [
+        f"{CONFIG_DESCRIPTIONS[key]}: ({"X" if values[key] else " "})" for key in keys
+    ]
+    bool_values = [values[key] for key in keys]
+
+    selected_idx = 0
+
+    while True:
+        printMenu(stdscr, selected_idx, options)
+
+        key = stdscr.getch()
+
+        if key == curses.KEY_UP and selected_idx > 0:
+            selected_idx -= 1
+        elif key == curses.KEY_DOWN and selected_idx < len(options) - 1:
+            selected_idx += 1
+        elif key in (curses.KEY_ENTER, ord("\n"), 13):
+            bool_values[selected_idx] = not bool_values[selected_idx]
+            options[selected_idx] = (
+                f"{CONFIG_DESCRIPTIONS[keys[selected_idx]]}: ({"X" if bool_values[selected_idx] else " "})"
+            )
+        elif key in (27, ord("q")):  # Escape, q
+            break
+
+    return {key: value for key, value in zip(keys, bool_values)}
+
+
+def saveConfig(values, configfile=CONFIGFILE_DEFAULT):
+    with open(configfile, "w") as f:
+        json.dump(values, f)
+
+
+def updateConfig(configfile=CONFIGFILE_DEFAULT):
+    values = getConfig(configfile)
+
+    values = curses.wrapper(cursesMenu, values)
+    saveConfig(values, configfile)
+    return values
+
+
+def getConfig(configfile=CONFIGFILE_DEFAULT, update=False):
+    values = CONFIG_DEFAULTS
+
+    if path.exists(configfile):
+        with open(configfile, "r") as f:
+            config = json.load(f)
+            for key, value in config.items():
+                if key in CONFIG_DEFAULTS:
+                    values[key] = value
+    elif update == True:
+        values = updateConfig(configfile)
+
+    return values
+
+
+def main():
+    if len(argv) < 2:
+        print(f"{argv[0]} Usage: python3 {argv[0]} asset_config.json")
+        exit(1)
+
+    updateConfig(argv[1])
+
+
+if __name__ == "__main__":
+    main()

tools/extract_game_assets.py

@@ -5,6 +5,7 @@
 import libyaz0
 import libstage
 import libbti
+import assets_config
 
 """
 Extracts the game assets and stores them in the game folder
@@ -139,20 +140,24 @@ def writeFolder(parsedFstBin, i):
     ".arc": {
         "function": libarc.extract_to_directory,
         "exceptions": ["archive/dat/speakerse.arc"],
+        "config_key": "extract_arc"
     },
     ".dzs": {
-        "function": libstage.extract_to_json
+        "function": libstage.extract_to_json,
+        "config_key": "convert_stages"
     },
     ".dzr": {
-        "function": libstage.extract_to_json
+        "function": libstage.extract_to_json,
+        "config_key": "convert_stages"
     },
     ".bti": {
-        "function": libbti.bti_to_png
+        "function": libbti.bti_to_png,
+        "config_key": "convert_textures"
     }
 }
 
 def writeFile(name, data):
-    if data[0:4] == bytes("Yaz0", "ascii"):
+    if data[0:4] == bytes("Yaz0", "ascii") and config["decompress_assets"]:
         splitName = os.path.splitext(name)
         name = splitName[0] + ".c" + splitName[1]
         data = libyaz0.decompress(data)
@@ -162,9 +167,12 @@ def writeFile(name, data):
     ext = splitName[1]
     if ext in convertDefinitions:
         extractDef = convertDefinitions[ext]
-        if "exceptions" in extractDef and str(name) in extractDef["exceptions"]:
+        if ("exceptions" in extractDef and str(name) in extractDef["exceptions"]) or ("config_key" in extractDef and config[extractDef["config_key"]] == False):
             extractDef = None
 
+    if  config["decompress_assets"] == None:
+        extractDef = None # If assets aren't being decompressed, just write the raw file
+
     if extractDef == None:
         file = open(name, "wb")
         file.write(data)
@@ -237,15 +245,16 @@ def getDolInfo(disc):
 
     return dolOffset, dolSize
 
-
-def extract(isoPath: Path, gamePath: Path, yaz0Encoder):
+def extract(isoPath: Path, gamePath: Path, yaz0Encoder: str, config_file: str):
     if yaz0Encoder == "oead":
         try:
             from oead import yaz0
             global yaz0DecompressFunction
             yaz0DecompressFunction = yaz0.decompress
         except:
             print("Extract: oead isn't installed, falling back to native yaz0")
+    global config
+    config = assets_config.getConfig(config_file,update=True)
     isoPath = isoPath.absolute()
     cwd = os.getcwd()
     os.chdir(gamePath)
@@ -293,7 +302,7 @@ def extract(isoPath: Path, gamePath: Path, yaz0Encoder):
 
 
 def main():
-    extract(Path(sys.argv[1]), Path(sys.argv[2]), "native")
+    extract(Path(sys.argv[1]), Path(sys.argv[2]), sys.argv[3], sys.argv[4])
 
 
 if __name__ == "__main__":