falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix imports

This commit is contained in:
lepelog 2022-07-01 02:01:37 +02:00
parent 79b4f1cd9e
commit 2c180dfa90
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/tp.py
View File

@ -21,11 +21,9 @@ try:
import click import click
import logging import logging
import hashlib import hashlib
import git
import libdol import libdol
import librel import librel
import libarc import libarc
import yaz0
import io import io
import extract_game_assets import extract_game_assets
@ -621,9 +619,15 @@ def calculate_progress(build_path: Path, matching: bool, format: str, print_rels
open("Progress.md","w").write(tableString) open("Progress.md","w").write(tableString)
elif format == "CSV": elif format == "CSV":
version = 1 version = 1
git_object = git.Repo().head.object try:
timestamp = str(git_object.committed_date) import git
git_hash = git_object.hexsha git_object = git.Repo().head.object
timestamp = str(git_object.committed_date)
git_hash = git_object.hexsha
except ImportError:
LOG.warning("can't import git, some fields will be missing!")
timestamp = ""
git_hash = ""
data = [ data = [
str(version), str(version),
@ -1113,10 +1117,6 @@ def check_sha1(game_path: Path, build_path: Path, include_rels: bool):
for rel_filepath in build_rels_path: for rel_filepath in build_rels_path:
with rel_filepath.open("rb") as file: with rel_filepath.open("rb") as file:
data = bytearray(file.read()) data = bytearray(file.read())
yaz0_data = data
if struct.unpack(">I", data[:4])[0] == 0x59617A30:
data = yaz0.decompress(io.BytesIO(data))
rel = librel.read(data) rel = librel.read(data)
CURRENT[rel.index] = ( CURRENT[rel.index] = (
str(rel_filepath), str(rel_filepath),