diff --git a/scripts/assets.py b/scripts/assets.py index b5872adcf..7f086afd7 100755 --- a/scripts/assets.py +++ b/scripts/assets.py @@ -293,7 +293,7 @@ class Main(App): dolphin = Dolphin() self.logger.info(f"Loading data") if not "dolphin\external" in str(self.args.input_directory): # AHEM... oopsie. This script apparently just loads all assets, not only external assets, lol. - dolphin.load(self.args.input_directory) + dolphin.load([self.args.input_directory]) else: dolphin.load(valid_dirs) self.logger.info(f"Packing") diff --git a/scripts/flipper/assets/dolphin.py b/scripts/flipper/assets/dolphin.py index c185ae310..8dac971cc 100644 --- a/scripts/flipper/assets/dolphin.py +++ b/scripts/flipper/assets/dolphin.py @@ -369,21 +369,14 @@ class Dolphin: self.manifest = DolphinManifest() self.logger = logging.getLogger("Dolphin") - def load(self, valid_dirs: list or str): - - if type(valid_dirs) == list: - for path in valid_dirs: - assert os.path.isdir(path) - # Load Manifest - self.logger.info(f"Loading directory {path}") - self.manifest.load(path) - else: - assert os.path.isdir(valid_dirs) + def load(self, valid_dirs: list): + print(valid_dirs) + input() + for path in valid_dirs: + assert os.path.isdir(path) # Load Manifest - self.logger.info(f"Loading directory {valid_dirs}") - self.manifest.load(valid_dirs) - - + self.logger.info(f"Loading directory {path}") + self.manifest.load(path) def pack(self, output_directory: str, symbol_name: str = None): self.manifest.save(output_directory, symbol_name)