From 45012658d33d7e32c153c77c18ecdc7c5ed092da Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Wed, 26 May 2021 19:40:48 -0400 Subject: [PATCH] Track XML extraction time (#826) * extracted-assets.json * delete `.extracted-assets.json` in distclean * Move `rm .extracted-assets.json` to `assetclean` --- .gitignore | 1 + Makefile | 3 ++- extract_assets.py | 65 ++++++++++++++++++++++++++++++++++------------- 3 files changed, 51 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 7627ea0c6a..06bad1aa4d 100644 --- a/.gitignore +++ b/.gitignore @@ -47,6 +47,7 @@ graphs/ *.mtl *.fbx !*_custom* +.extracted-assets.json # Per-user configuration .python-version diff --git a/Makefile b/Makefile index 00c71d1b88..28b78b07af 100644 --- a/Makefile +++ b/Makefile @@ -183,7 +183,8 @@ clean: assetclean: $(RM) -r $(ASSET_BIN_DIRS) - $(RM) -r build/assets + $(RM) -r build/assets + $(RM) -r .extracted-assets.json distclean: clean assetclean $(RM) -r baserom/ diff --git a/extract_assets.py b/extract_assets.py index 70ce95523c..941dea1235 100755 --- a/extract_assets.py +++ b/extract_assets.py @@ -1,15 +1,18 @@ #!/usr/bin/env python3 import argparse -from multiprocessing import Pool, cpu_count, Event +from multiprocessing import Pool, cpu_count, Event, Manager import os +import json +import time +import signal -# Returns True if outFile doesn't exists -# or if inFile has been modified after the last modification of outFile -def checkTouchedFile(inFile: str, outFile: str) -> bool: - if not os.path.exists(outFile): - return True - return os.path.getmtime(inFile) > os.path.getmtime(outFile) +EXTRACTED_ASSETS_NAMEFILE = ".extracted-assets.json" + +def SignalHandler(sig, frame): + print(f'Signal {sig} received. Aborting...') + mainAbort.set() + # Don't exit immediately to update the extracted assets file. def Extract(xmlPath, outputPath, outputSourcePath): ExtractFile(xmlPath, outputPath, outputSourcePath, 1, 0) @@ -47,23 +50,37 @@ def ExtractFunc(fullPath): objectName += "_scene" if not globalForce: - cFile = os.path.join(outPath, objectName + ".c") - hFile = os.path.join(outPath, objectName + ".h") - if not checkTouchedFile(fullPath, cFile) and not checkTouchedFile(fullPath, hFile): - return + if fullPath in globalExtractedAssetsTracker: + timestamp = globalExtractedAssetsTracker[fullPath]["timestamp"] + modificationTime = int(os.path.getmtime(fullPath) * (10**9)) + if modificationTime < timestamp: + # XML has not been modified since last extraction. + return + + currentTimeStamp = time.time_ns() if isScene: ExtractScene(fullPath, outPath, outSourcePath) else: Extract(fullPath, outPath, outSourcePath) -def initializeWorker(force: bool, abort, unaccounted: bool): + if not globalAbort.is_set(): + # Only update timestamp on succesful extractions + if fullPath not in globalExtractedAssetsTracker: + globalExtractedAssetsTracker[fullPath] = globalManager.dict() + globalExtractedAssetsTracker[fullPath]["timestamp"] = currentTimeStamp + +def initializeWorker(force: bool, abort, unaccounted: bool, extractedAssetsTracker: dict, manager): global globalForce global globalAbort global globalUnaccounted + global globalExtractedAssetsTracker + global globalManager globalForce = force globalAbort = abort globalUnaccounted = unaccounted + globalExtractedAssetsTracker = extractedAssetsTracker + globalManager = manager def main(): parser = argparse.ArgumentParser(description="baserom asset extractor") @@ -72,17 +89,25 @@ def main(): parser.add_argument("-u", "--unaccounted", help="Enables ZAPD unaccounted detector warning system.", action="store_true") args = parser.parse_args() - abort = Event() + global mainAbort + mainAbort = Event() + manager = Manager() + signal.signal(signal.SIGINT, SignalHandler) + + extractedAssetsTracker = manager.dict() + if os.path.exists(EXTRACTED_ASSETS_NAMEFILE): + with open(EXTRACTED_ASSETS_NAMEFILE) as f: + extractedAssetsTracker.update(json.load(f, object_hook=manager.dict)) asset_path = args.single if asset_path is not None: # Always force if -s is used. - initializeWorker(True, abort, args.unaccounted) + initializeWorker(True, mainAbort, args.unaccounted, extractedAssetsTracker, manager) fullPath = os.path.join("assets", "xml", asset_path + ".xml") ExtractFunc(fullPath) else: xmlFiles = [] - for currentPath, folders, files in os.walk(os.path.join("assets", "xml")): + for currentPath, _, files in os.walk(os.path.join("assets", "xml")): for file in files: fullPath = os.path.join(currentPath, file) if file.endswith(".xml"): @@ -90,10 +115,16 @@ def main(): numCores = cpu_count() print("Extracting assets with " + str(numCores) + " CPU cores.") - with Pool(numCores, initializer=initializeWorker, initargs=(args.force, abort, args.unaccounted)) as p: + with Pool(numCores, initializer=initializeWorker, initargs=(args.force, mainAbort, args.unaccounted, extractedAssetsTracker, manager)) as p: p.map(ExtractFunc, xmlFiles) - if abort.is_set(): + with open(EXTRACTED_ASSETS_NAMEFILE, 'w', encoding='utf-8') as f: + serializableDict = dict() + for xml, data in extractedAssetsTracker.items(): + serializableDict[xml] = dict(data) + json.dump(dict(serializableDict), f, ensure_ascii=False, indent=4) + + if mainAbort.is_set(): exit(1) if __name__ == "__main__":