mirror of
https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
synced 2025-01-01 12:25:06 +08:00
Avoid unnecessary isfile
/exists
calls
This commit is contained in:
parent
e4dcdcc955
commit
d9034b48a5
@ -62,16 +62,15 @@ def cache(subsection):
|
|||||||
if cache_data is None:
|
if cache_data is None:
|
||||||
with cache_lock:
|
with cache_lock:
|
||||||
if cache_data is None:
|
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 = {}
|
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, {})
|
s = cache_data.get(subsection, {})
|
||||||
cache_data[subsection] = s
|
cache_data[subsection] = s
|
||||||
|
@ -32,11 +32,12 @@ class ExtensionMetadata:
|
|||||||
self.config = configparser.ConfigParser()
|
self.config = configparser.ConfigParser()
|
||||||
|
|
||||||
filepath = os.path.join(path, self.filename)
|
filepath = os.path.join(path, self.filename)
|
||||||
if os.path.isfile(filepath):
|
# `self.config.read()` will quietly swallow OSErrors (which FileNotFoundError is),
|
||||||
try:
|
# so no need to check whether the file exists beforehand.
|
||||||
self.config.read(filepath)
|
try:
|
||||||
except Exception:
|
self.config.read(filepath)
|
||||||
errors.report(f"Error reading {self.filename} for extension {canonical_name}.", exc_info=True)
|
except Exception:
|
||||||
|
errors.report(f"Error reading {self.filename} for extension {canonical_name}.", exc_info=True)
|
||||||
|
|
||||||
self.canonical_name = self.config.get("Extension", "Name", fallback=canonical_name)
|
self.canonical_name = self.config.get("Extension", "Name", fallback=canonical_name)
|
||||||
self.canonical_name = canonical_name.lower().strip()
|
self.canonical_name = canonical_name.lower().strip()
|
||||||
|
@ -215,9 +215,10 @@ def get_user_metadata(filename):
|
|||||||
|
|
||||||
metadata = {}
|
metadata = {}
|
||||||
try:
|
try:
|
||||||
if os.path.isfile(metadata_filename):
|
with open(metadata_filename, "r", encoding="utf8") as file:
|
||||||
with open(metadata_filename, "r", encoding="utf8") as file:
|
metadata = json.load(file)
|
||||||
metadata = json.load(file)
|
except FileNotFoundError:
|
||||||
|
pass
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
errors.display(e, f"reading extra network user metadata from {metadata_filename}")
|
errors.display(e, f"reading extra network user metadata from {metadata_filename}")
|
||||||
|
|
||||||
|
@ -453,9 +453,11 @@ def connect_paste(button, paste_fields, input_comp, override_settings_component,
|
|||||||
def paste_func(prompt):
|
def paste_func(prompt):
|
||||||
if not prompt and not shared.cmd_opts.hide_ui_dir_config:
|
if not prompt and not shared.cmd_opts.hide_ui_dir_config:
|
||||||
filename = os.path.join(data_path, "params.txt")
|
filename = os.path.join(data_path, "params.txt")
|
||||||
if os.path.exists(filename):
|
try:
|
||||||
with open(filename, "r", encoding="utf8") as file:
|
with open(filename, "r", encoding="utf8") as file:
|
||||||
prompt = file.read()
|
prompt = file.read()
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
|
||||||
params = parse_generation_parameters(prompt)
|
params = parse_generation_parameters(prompt)
|
||||||
script_callbacks.infotext_pasted_callback(prompt, params)
|
script_callbacks.infotext_pasted_callback(prompt, params)
|
||||||
|
@ -245,9 +245,10 @@ def list_extensions(settings_file):
|
|||||||
settings = {}
|
settings = {}
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if os.path.isfile(settings_file):
|
with open(settings_file, "r", encoding="utf8") as file:
|
||||||
with open(settings_file, "r", encoding="utf8") as file:
|
settings = json.load(file)
|
||||||
settings = json.load(file)
|
except FileNotFoundError:
|
||||||
|
pass
|
||||||
except Exception:
|
except Exception:
|
||||||
errors.report("Could not load settings", exc_info=True)
|
errors.report("Could not load settings", exc_info=True)
|
||||||
|
|
||||||
|
@ -97,11 +97,12 @@ def run_postprocessing(extras_mode, image, image_folder, input_dir, output_dir,
|
|||||||
|
|
||||||
if pp.caption:
|
if pp.caption:
|
||||||
caption_filename = os.path.splitext(fullfn)[0] + ".txt"
|
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:
|
with open(caption_filename, encoding="utf8") as file:
|
||||||
existing_caption = file.read().strip()
|
existing_caption = file.read().strip()
|
||||||
else:
|
except FileNotFoundError:
|
||||||
existing_caption = ""
|
pass
|
||||||
|
|
||||||
action = shared.opts.postprocessing_existing_caption_action
|
action = shared.opts.postprocessing_existing_caption_action
|
||||||
if action == 'Prepend' and existing_caption:
|
if action == 'Prepend' and existing_caption:
|
||||||
|
@ -18,8 +18,10 @@ def initialize():
|
|||||||
shared.options_templates = shared_options.options_templates
|
shared.options_templates = shared_options.options_templates
|
||||||
shared.opts = options.Options(shared_options.options_templates, shared_options.restricted_opts)
|
shared.opts = options.Options(shared_options.options_templates, shared_options.restricted_opts)
|
||||||
shared.restricted_opts = 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)
|
shared.opts.load(shared.config_filename)
|
||||||
|
except FileNotFoundError:
|
||||||
|
pass
|
||||||
|
|
||||||
from modules import devices
|
from modules import devices
|
||||||
devices.device, devices.device_interrogate, devices.device_gfpgan, devices.device_esrgan, devices.device_codeformer = \
|
devices.device, devices.device_interrogate, devices.device_gfpgan, devices.device_esrgan, devices.device_codeformer = \
|
||||||
|
@ -35,13 +35,11 @@ def css_html():
|
|||||||
return f'<link rel="stylesheet" property="stylesheet" href="{webpath(fn)}">'
|
return f'<link rel="stylesheet" property="stylesheet" href="{webpath(fn)}">'
|
||||||
|
|
||||||
for cssfile in scripts.list_files_with_name("style.css"):
|
for cssfile in scripts.list_files_with_name("style.css"):
|
||||||
if not os.path.isfile(cssfile):
|
|
||||||
continue
|
|
||||||
|
|
||||||
head += stylesheet(cssfile)
|
head += stylesheet(cssfile)
|
||||||
|
|
||||||
if os.path.exists(os.path.join(data_path, "user.css")):
|
user_css = os.path.join(data_path, "user.css")
|
||||||
head += stylesheet(os.path.join(data_path, "user.css"))
|
if os.path.exists(user_css):
|
||||||
|
head += stylesheet(user_css)
|
||||||
|
|
||||||
return head
|
return head
|
||||||
|
|
||||||
|
@ -26,8 +26,9 @@ class UiLoadsave:
|
|||||||
self.ui_defaults_review = None
|
self.ui_defaults_review = None
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if os.path.exists(self.filename):
|
self.ui_settings = self.read_from_file()
|
||||||
self.ui_settings = self.read_from_file()
|
except FileNotFoundError:
|
||||||
|
pass
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self.error_loading = True
|
self.error_loading = True
|
||||||
errors.display(e, "loading settings")
|
errors.display(e, "loading settings")
|
||||||
|
@ -21,11 +21,11 @@ def html_path(filename):
|
|||||||
def html(filename):
|
def html(filename):
|
||||||
path = html_path(filename)
|
path = html_path(filename)
|
||||||
|
|
||||||
if os.path.exists(path):
|
try:
|
||||||
with open(path, encoding="utf8") as file:
|
with open(path, encoding="utf8") as file:
|
||||||
return file.read()
|
return file.read()
|
||||||
|
except OSError:
|
||||||
return ""
|
return ""
|
||||||
|
|
||||||
|
|
||||||
def walk_files(path, allowed_extensions=None):
|
def walk_files(path, allowed_extensions=None):
|
||||||
|
Loading…
Reference in New Issue
Block a user