Global folder integration for all features that need a baserom (#677)

* Look for shared baserom directory using XDG_DATA_DIR instead of polluting the home directory

* move global baserom folder detection to a new file that the makefile can use

* ignore __pycache__ in tools

* edit make patch to use global baserom detector

* Extract jp/sh/eu from global folder too

* genericize asset extraction for all versions

* force at least US to extract

---------

Co-authored-by: Matt Pharoah <mtpharoah@gmail.com>
Co-authored-by: someone2639 <someone2639@gmail.com>
This commit is contained in:
someone2639
2023-09-17 21:54:37 -04:00
committed by GitHub
parent 620b7cdded
commit db85886294
5 changed files with 75 additions and 79 deletions

View File

@@ -4,56 +4,7 @@ import os
import json
import subprocess
XDG_DATA_DIR=os.environ.get("XDG_DATA_HOME") or "~/.local/share"
ROMS_DIR=os.path.expanduser(os.path.join(XDG_DATA_DIR, "HackerSM64"))
sha1_LUT = {
"eu": "4ac5721683d0e0b6bbb561b58a71740845dceea9",
"jp": "8a20a5c83d6ceb0f0506cfc9fa20d8f438cafe51",
"sh": "3f319ae697533a255a1003d09202379d78d5a2e0",
"us": "9bef1128717f958171a4afac3ed78ee2bb4e86ce",
}
sha1_swapLUT = {
"eu": "d80ee9eeb6454d53a96ceb6ed0aca3ffde045091",
"jp": "1d2579dd5fb1d8263a4bcc063a651a64acc88921",
"sh": "2a2b85e94581545ca3c05b8f864b488b141a8a1f",
"us": "1002dd7b56aa0a59a9103f1fb3d57d6b161f8da7",
}
def get_rom_candidates():
fileArray = [f for f in os.listdir(os.getcwd()) if os.path.isfile(f)]
if os.path.exists(ROMS_DIR):
fileArray += [os.path.join(ROMS_DIR, f) for f in os.listdir(ROMS_DIR) if os.path.isfile(os.path.join(ROMS_DIR, f))]
foundVersions = {}
for f in fileArray:
try:
p = subprocess.Popen(
["sha1sum", f],
stdout=subprocess.PIPE
)
sha1sum = p.communicate()[0].decode('ascii').split()[0]
for k, v in sha1_LUT.items():
if v == sha1sum:
foundVersions[k] = f
for k, v in sha1_swapLUT.items():
if v == sha1sum: # the ROM is swapped!
subprocess.run(
[
"dd","conv=swab",
"if=%s" % f,
"of=/tmp/baserom.%s.swapped.z64" % k
],
stderr=subprocess.PIPE,
)
foundVersions[k] = "/tmp/baserom.%s.swapped.z64" % k
except Exception as e:
continue
return foundVersions
from tools.detect_baseroms import get_rom_candidates
def read_asset_map():
with open("assets.json") as f: