Merge pull request #897 from annie-xd-wang/double-check-loaded-yaml-file-before-use

double-check the loaded yaml files

Author: AdvancedImagingUTSW

src/navigate/controller/sub_controllers/plugins_controller.py

@@ -95,10 +95,11 @@ def load_plugins(self):
         plugins_config_path = os.path.join(
             get_navigate_path(), "config", "plugins_config.yml"
         )
-        if not os.path.exists(plugins_config_path):
+        plugins_config = load_yaml_file(plugins_config_path)
+        if plugins_config is None:
+            plugins_config = {}
             save_yaml_file(get_navigate_path(), {}, "plugins_config.yml")
         else:
-            plugins_config = load_yaml_file(plugins_config_path)
             for plugin_name, plugin_path in plugins_config.items():
                 if plugin_path and os.path.exists(plugin_path):
                     installed_plugins[plugin_name] = plugin_path

src/navigate/model/model.py

@@ -1424,11 +1424,9 @@ def load_feature_records(self):
             os.makedirs(feature_lists_path)
             return
         # get __sequence.yml
-        if not os.path.exists(f"{feature_lists_path}/__sequence.yml"):
+        feature_records = load_yaml_file(f"{feature_lists_path}/__sequence.yml")
+        if feature_records is None:
             feature_records = []
-        else:
-            feature_records = load_yaml_file(f"{feature_lists_path}/__sequence.yml")
-
         # add non added feature lists
         feature_list_files = [
             temp
@@ -1440,6 +1438,8 @@ def load_feature_records(self):
             if item == "__sequence.yml":
                 continue
             temp = load_yaml_file(f"{feature_lists_path}/{item}")
+            if temp is None:
+                continue
             add_flag = True
             for feature in feature_records:
                 if feature["feature_list_name"] == temp["feature_list_name"]:
@@ -1460,6 +1460,9 @@ def load_feature_records(self):
                 del feature_records[i]
                 continue
             item = load_yaml_file(f"{feature_lists_path}/{temp['yaml_file_name']}")
+            if item is None:
+                i += 1
+                continue
 
             if item["module_name"]:
                 try:

src/navigate/model/plugins_model.py

@@ -81,12 +81,13 @@ def load_plugins(self):
         plugins_config_path = os.path.join(
             get_navigate_path(), "config", "plugins_config.yml"
         )
-        if not os.path.exists(plugins_config_path):
+        plugins_config = load_yaml_file(plugins_config_path)
+        if plugins_config is None:
+            plugins_config = {}
             save_yaml_file(
                 os.path.join(get_navigate_path(), "config"), {}, "plugins_config.yml"
             )
         else:
-            plugins_config = load_yaml_file(plugins_config_path)
             verified_plugins_config = {}
             for plugin_name, plugin_path in plugins_config.items():
                 if not plugin_path: