From 02eadff97ac7c03df0a512b5f162d8fba3556345 Mon Sep 17 00:00:00 2001
From: MoonRide303 <moonride303@gmail.com>
Date: Wed, 18 Oct 2023 08:47:39 +0200
Subject: [PATCH] Added support for loading model files from subfolders

---
 fooocus_version.py |  2 +-
 modules/path.py    | 16 +++-------------
 update_log.md      |  4 ++++
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/fooocus_version.py b/fooocus_version.py
index a8a1a7a..b9acb65 100644
--- a/fooocus_version.py
+++ b/fooocus_version.py
@@ -1 +1 @@
-version = '2.1.697'
+version = '2.1.698'
diff --git a/modules/path.py b/modules/path.py
index c278d26..6c12d4e 100644
--- a/modules/path.py
+++ b/modules/path.py
@@ -5,6 +5,7 @@ import modules.flags
 import modules.sdxl_styles
 
 from modules.model_loader import load_file_from_url
+from modules.util import get_files_from_folder
 
 config_path = "user_path_config.txt"
 config_dict = {}
@@ -168,19 +169,8 @@ model_filenames = []
 lora_filenames = []
 
 
-def get_model_filenames(folder_path):
-    if not os.path.isdir(folder_path):
-        raise ValueError("Folder path is not a valid directory.")
-
-    filenames = []
-    for filename in os.listdir(folder_path):
-        if os.path.isfile(os.path.join(folder_path, filename)):
-            for ends in ['.pth', '.ckpt', '.bin', '.safetensors', '.fooocus.patch']:
-                if filename.lower().endswith(ends):
-                    filenames.append(filename)
-                    break
-
-    return filenames
+def get_model_filenames(folder_path, name_filter=None):
+    return get_files_from_folder(folder_path, ['.pth', '.ckpt', '.bin', '.safetensors', '.fooocus.patch'], name_filter)
 
 
 def update_all_model_names():
diff --git a/update_log.md b/update_log.md
index 14b441c..676a648 100644
--- a/update_log.md
+++ b/update_log.md
@@ -1,3 +1,7 @@
+# 2.1.698
+
+* Added support for loading model files from subfolders.
+
 # 2.1.696
 
 * Improved wildcards implementation (using same wildcard multiple times will now return different values).