From 2c817e6c9b836f1bad2a4d21290270d69463887c Mon Sep 17 00:00:00 2001 From: Caleb Smith Date: Mon, 17 Aug 2020 22:23:11 -0500 Subject: [PATCH] Fix update from folder and RSTB estimates --- wildbits/__main__.py | 2 +- wildbits/__version__.py | 2 +- wildbits/_rstb.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wildbits/__main__.py b/wildbits/__main__.py index bfc9d11..5f16eb0 100644 --- a/wildbits/__main__.py +++ b/wildbits/__main__.py @@ -183,7 +183,7 @@ def update_sarc_folder(self) -> dict: try: self._open_sarc, tree, modded = _sarc.open_sarc( _sarc.update_from_folder( - self._open_sarc, Path(result if isinstance(result) else result[0]) + self._open_sarc, Path(result if isinstance(result, str) else result[0]) ) ) except (FileNotFoundError, OSError, ValueError) as err: diff --git a/wildbits/__version__.py b/wildbits/__version__.py index 3dcb969..435cb21 100644 --- a/wildbits/__version__.py +++ b/wildbits/__version__.py @@ -1,4 +1,4 @@ -VERSION = "1.0.4" +VERSION = "1.0.5" USER_VERSION = ( VERSION.replace("a", " alpha ") .replace("rc", " release candidate ") diff --git a/wildbits/_rstb.py b/wildbits/_rstb.py index 042bfef..799aba2 100644 --- a/wildbits/_rstb.py +++ b/wildbits/_rstb.py @@ -58,10 +58,10 @@ def get_rstb_value(file: Path, be: bool) -> (int, bool): if size == 0: ext = file.suffix if ext in botw.extensions.AAMP_EXTS: - size = botw.rstb.guess_aamp_size(file) + size = botw.rstb.guess_aamp_size(file, be, file.suffix) guess = True elif ext in {".sbfres", ".bfres"}: - size = botw.rstb.guess_bfres_size(file) + size = botw.rstb.guess_bfres_size(file, be, file.name) guess = True return size, guess