Merge pull request #11199 from akx/makedirs

Use os.makedirs(..., exist_ok=True)

modules/codeformer_model.py

@@ -20,9 +20,7 @@ codeformer = None
 
 
 def setup_model(dirname):
-    global model_path
-    if not os.path.exists(model_path):
-        os.makedirs(model_path)
+    os.makedirs(model_path, exist_ok=True)
 
     path = modules.paths.paths.get("CodeFormer", None)
     if path is None:

modules/extensions.py

@@ -7,8 +7,7 @@ from modules.paths_internal import extensions_dir, extensions_builtin_dir, scrip
 
 extensions = []
 
-if not os.path.exists(extensions_dir):
-    os.makedirs(extensions_dir)
+os.makedirs(extensions_dir, exist_ok=True)
 
 
 def active():

modules/gfpgan_model.py

@@ -70,11 +70,8 @@ gfpgan_constructor = None
 
 
 def setup_model(dirname):
-    global model_path
-    if not os.path.exists(model_path):
-        os.makedirs(model_path)
-
     try:
+        os.makedirs(model_path, exist_ok=True)
         from gfpgan import GFPGANer
         from facexlib import detection, parsing  # noqa: F401
         global user_path

modules/modelloader.py

@@ -95,8 +95,7 @@ def cleanup_models():
 
 def move_files(src_path: str, dest_path: str, ext_filter: str = None):
     try:
-        if not os.path.exists(dest_path):
-            os.makedirs(dest_path)
+        os.makedirs(dest_path, exist_ok=True)
         if os.path.exists(src_path):
             for file in os.listdir(src_path):
                 fullpath = os.path.join(src_path, file)

modules/sd_models.py

@@ -95,8 +95,7 @@ except Exception:
 
 
 def setup_model():
-    if not os.path.exists(model_path):
-        os.makedirs(model_path)
+    os.makedirs(model_path, exist_ok=True)
 
     enable_midas_autodownload()
 

modules/textual_inversion/autocrop.py

@@ -298,8 +298,7 @@ def download_and_cache_models(dirname):
     download_url = 'https://github.com/opencv/opencv_zoo/blob/91fb0290f50896f38a0ab1e558b74b16bc009428/models/face_detection_yunet/face_detection_yunet_2022mar.onnx?raw=true'
     model_file_name = 'face_detection_yunet.onnx'
 
-    if not os.path.exists(dirname):
-        os.makedirs(dirname)
+    os.makedirs(dirname, exist_ok=True)
 
     cache_file = os.path.join(dirname, model_file_name)
     if not os.path.exists(cache_file):