Handle errors raised in pathlib and set path

pull/109/head
Uminosachi 2023-10-08 18:20:37 +09:00
parent a53fbfa882
commit a14612c7a0
2 changed files with 32 additions and 15 deletions

View File

@ -13,16 +13,7 @@ class IAFileManager:
DOWNLOAD_COMPLETE = "Download complete"
def __init__(self) -> None:
config_save_folder = get_webui_setting("inpaint_anything_save_folder", "inpaint-anything")
self.folder_is_webui = False if config_save_folder == "inpaint-anything" else True
if config_save_folder == "inpaint-anything":
self._ia_outputs_dir = os.path.join(shared.data_path, "outputs", config_save_folder, datetime.now().strftime("%Y-%m-%d"))
else:
webui_save_folder = Path(get_webui_setting("outdir_img2img_samples", os.path.join("outputs", "img2img-images")))
if webui_save_folder.is_absolute():
self._ia_outputs_dir = os.path.join(str(webui_save_folder), datetime.now().strftime("%Y-%m-%d"))
else:
self._ia_outputs_dir = os.path.join(shared.data_path, str(webui_save_folder), datetime.now().strftime("%Y-%m-%d"))
self.update_ia_outputs_dir()
self._ia_models_dir = os.path.join(os.path.dirname(os.path.realpath(__file__)), "models")
@ -37,11 +28,14 @@ class IAFileManager:
if config_save_folder == "inpaint-anything":
self._ia_outputs_dir = os.path.join(shared.data_path, "outputs", config_save_folder, datetime.now().strftime("%Y-%m-%d"))
else:
webui_save_folder = Path(get_webui_setting("outdir_img2img_samples", os.path.join("outputs", "img2img-images")))
if webui_save_folder.is_absolute():
self._ia_outputs_dir = os.path.join(str(webui_save_folder), datetime.now().strftime("%Y-%m-%d"))
else:
self._ia_outputs_dir = os.path.join(shared.data_path, str(webui_save_folder), datetime.now().strftime("%Y-%m-%d"))
try:
webui_save_folder = Path(get_webui_setting("outdir_img2img_samples", os.path.join("outputs", "img2img-images")))
if webui_save_folder.is_absolute():
self._ia_outputs_dir = os.path.join(str(webui_save_folder), datetime.now().strftime("%Y-%m-%d"))
else:
self._ia_outputs_dir = os.path.join(shared.data_path, str(webui_save_folder), datetime.now().strftime("%Y-%m-%d"))
except Exception:
self._ia_outputs_dir = os.path.join(shared.data_path, "outputs", "img2img-images", datetime.now().strftime("%Y-%m-%d"))
@property
def outputs_dir(self) -> str:

View File

@ -19,6 +19,29 @@ const inpaintAnything_waitForElement = async (parent, selector, exist) => {
});
};
const inpaintAnything_waitForStyle = async (parent, selector, style) => {
return new Promise((resolve) => {
const observer = new MutationObserver(() => {
if (!parent.querySelector(selector) || !parent.querySelector(selector).style[style]) {
return;
}
observer.disconnect();
resolve(undefined);
});
observer.observe(parent, {
childList: true,
subtree: true,
attributes: true,
attributeFilter: ["style"],
});
if (!!parent.querySelector(selector) && !!parent.querySelector(selector).style[style]) {
resolve(undefined);
}
});
};
const inpaintAnything_timeout = (ms) => {
return new Promise(function (resolve, reject) {
setTimeout(() => reject("Timeout"), ms);