From 3e973feaa3bcf8a06cc1cb0a32735a9d45eec46c Mon Sep 17 00:00:00 2001 From: Kyle Walker Date: Fri, 8 May 2020 08:48:11 -0700 Subject: [PATCH] Handle WorkshopFileInfos.json --- src/tts_tools/libtts.py | 5 +++++ src/tts_tools/prefetch/__init__.py | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/tts_tools/libtts.py b/src/tts_tools/libtts.py index f42fcd6..703a38b 100644 --- a/src/tts_tools/libtts.py +++ b/src/tts_tools/libtts.py @@ -175,4 +175,9 @@ def get_save_name(filename): with open(filename, 'r', encoding='utf-8') as infile: save = json.load(infile) + + # Handle possible WorkshopFileInfos.json + if isinstance(save, list): + return None + return save["SaveName"] diff --git a/src/tts_tools/prefetch/__init__.py b/src/tts_tools/prefetch/__init__.py index e9775d0..b8a5fca 100644 --- a/src/tts_tools/prefetch/__init__.py +++ b/src/tts_tools/prefetch/__init__.py @@ -36,6 +36,11 @@ def prefetch_file(filename, try: save_name = get_save_name(filename) + if save_name is None: + print("Skipping {filename} likely workshop file info".format( + filename=filename + )) + return except Exception: save_name = "???"