Merge pull request #14527 from akx/avoid-isfiles

Avoid unnecessary `isfile`/`exists` calls

modules/cache.py

@@ -62,12 +62,11 @@ def cache(subsection):
     if cache_data is None:
         with cache_lock:
             if cache_data is None:
-                if not os.path.isfile(cache_filename):
-                    cache_data = {}
-                else:
                 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')

modules/extensions.py

@@ -32,7 +32,8 @@ class ExtensionMetadata:
         self.config = configparser.ConfigParser()
 
         filepath = os.path.join(path, self.filename)
-        if os.path.isfile(filepath):
+        # `self.config.read()` will quietly swallow OSErrors (which FileNotFoundError is),
+        # so no need to check whether the file exists beforehand.
         try:
             self.config.read(filepath)
         except Exception:

modules/infotext_utils.py

@@ -453,9 +453,11 @@ def connect_paste(button, paste_fields, input_comp, override_settings_component,
     def paste_func(prompt):
         if not prompt and not shared.cmd_opts.hide_ui_dir_config:
             filename = os.path.join(data_path, "params.txt")
-            if os.path.exists(filename):
+            try:
                 with open(filename, "r", encoding="utf8") as file:
                     prompt = file.read()
+            except OSError:
+                pass
 
         params = parse_generation_parameters(prompt)
         script_callbacks.infotext_pasted_callback(prompt, params)

modules/launch_utils.py

@@ -245,9 +245,10 @@ def list_extensions(settings_file):
     settings = {}
 
     try:
-        if os.path.isfile(settings_file):
         with open(settings_file, "r", encoding="utf8") as file:
             settings = json.load(file)
+    except FileNotFoundError:
+        pass
     except Exception:
         errors.report("Could not load settings", exc_info=True)
 

modules/postprocessing.py

@@ -97,11 +97,12 @@ def run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir,
 
                 if pp.caption:
                     caption_filename = os.path.splitext(fullfn)[0] + ".txt"
-                    if os.path.isfile(caption_filename):
+                    existing_caption = ""
+                    try:
                         with open(caption_filename, encoding="utf8") as file:
                             existing_caption = file.read().strip()
-                    else:
-                        existing_caption = ""
+                    except FileNotFoundError:
+                        pass
 
                     action = shared.opts.postprocessing_existing_caption_action
                     if action == 'Prepend' and existing_caption:

modules/shared_init.py

@@ -18,8 +18,10 @@ def initialize():
     shared.options_templates = shared_options.options_templates
     shared.opts = options.Options(shared_options.options_templates, shared_options.restricted_opts)
     shared.restricted_opts = shared_options.restricted_opts
-    if os.path.exists(shared.config_filename):
+    try:
         shared.opts.load(shared.config_filename)
+    except FileNotFoundError:
+        pass
 
     from modules import devices
     devices.device, devices.device_interrogate, devices.device_gfpgan, devices.device_esrgan, devices.device_codeformer = \

modules/ui_gradio_extensions.py

@@ -35,13 +35,11 @@ def css_html():
         return f'<link rel="stylesheet" property="stylesheet" href="{webpath(fn)}">'
 
     for cssfile in scripts.list_files_with_name("style.css"):
-        if not os.path.isfile(cssfile):
-            continue
-
         head += stylesheet(cssfile)
 
-    if os.path.exists(os.path.join(data_path, "user.css")):
-        head += stylesheet(os.path.join(data_path, "user.css"))
+    user_css = os.path.join(data_path, "user.css")
+    if os.path.exists(user_css):
+        head += stylesheet(user_css)
 
     return head
 

modules/ui_loadsave.py

@@ -26,8 +26,9 @@ class UiLoadsave:
         self.ui_defaults_review = None
 
         try:
-            if os.path.exists(self.filename):
             self.ui_settings = self.read_from_file()
+        except FileNotFoundError:
+            pass
         except Exception as e:
             self.error_loading = True
             errors.display(e, "loading settings")

modules/util.py

@@ -21,10 +21,10 @@ def html_path(filename):
 def html(filename):
     path = html_path(filename)
 
-    if os.path.exists(path):
+    try:
         with open(path, encoding="utf8") as file:
             return file.read()
-
+    except OSError:
         return ""