Merge branch 'release_candidate'

1 files changed, 8 insertions, 9 deletions

diff --git a/modules/cache.py b/modules/cache.py
index 2d37e7b9..a9822a0e 100644
--- a/modules/cache.py
+++ b/modules/cache.py
@@ -62,16 +62,15 @@ def cache(subsection):
     if cache_data is None:

         with cache_lock:

             if cache_data is None:

-                if not os.path.isfile(cache_filename):

+                try:

+                    with open(cache_filename, "r", encoding="utf8") as file:

+                        cache_data = json.load(file)

+                except FileNotFoundError:

+                    cache_data = {}

+                except Exception:

+                    os.replace(cache_filename, os.path.join(script_path, "tmp", "cache.json"))

+                    print('[ERROR] issue occurred while trying to read cache.json, move current cache to tmp/cache.json and create new cache')

                     cache_data = {}

-                else:

-                    try:

-                        with open(cache_filename, "r", encoding="utf8") as file:

-                            cache_data = json.load(file)

-                    except Exception:

-                        os.replace(cache_filename, os.path.join(script_path, "tmp", "cache.json"))

-                        print('[ERROR] issue occurred while trying to read cache.json, move current cache to tmp/cache.json and create new cache')

-                        cache_data = {}

 

     s = cache_data.get(subsection, {})

     cache_data[subsection] = s