From f9d7ccd83cdf7ad3deaee1a203184247d6b84810 Mon Sep 17 00:00:00 2001 From: canewsin Date: Thu, 26 May 2022 11:46:58 +0530 Subject: [PATCH] Fix Unhandled File Access Errors --- src/Site/SiteStorage.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Site/SiteStorage.py b/src/Site/SiteStorage.py index c12a80b0..a2eb0b20 100644 --- a/src/Site/SiteStorage.py +++ b/src/Site/SiteStorage.py @@ -255,12 +255,16 @@ class SiteStorage(object): if create_dirs: file_inner_dir = os.path.dirname(inner_path) self.ensureDir(file_inner_dir) - return open(file_path, mode, **kwargs) + try : + return open(file_path, mode, **kwargs) + except IOError as err: + self.log.error("File Access error: %s" % Debug.formatException(err)) + return None # Open file object @thread_pool_fs_read.wrap def read(self, inner_path, mode="rb"): - return open(self.getPath(inner_path), mode).read() + return self.open(inner_path, mode).read() @thread_pool_fs_write.wrap def writeThread(self, inner_path, content): @@ -369,8 +373,12 @@ class SiteStorage(object): # Load and parse json file @thread_pool_fs_read.wrap def loadJson(self, inner_path): - with self.open(inner_path, "r", encoding="utf8") as file: - return json.load(file) + try: + with self.open(inner_path, "r", encoding="utf8") as file: + return json.load(file) + except Exception as err: + self.log.error("Json load error: %s" % Debug.formatException(err)) + return None # Write formatted json file def writeJson(self, inner_path, data):