mirrors/Fooocus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: correctly sort files, display deepest dir level first (#1784)

Browse Source
This commit is contained in:
Manuel Schmid 2024-02-10 19:03:26 +01:00 committed by GitHub
parent 231956065f
commit 98ba1d5d47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/util.py
View File

@ -164,14 +164,14 @@ def get_files_from_folder(folder_path, exensions=None, name_filter=None):
filenames = [] filenames = []
for root, dirs, files in os.walk(folder_path): for root, dirs, files in os.walk(folder_path, topdown=False):
relative_path = os.path.relpath(root, folder_path) relative_path = os.path.relpath(root, folder_path)
if relative_path == ".": if relative_path == ".":
relative_path = "" relative_path = ""
for filename in files: for filename in sorted(files):
_, file_extension = os.path.splitext(filename) _, file_extension = os.path.splitext(filename)
if (exensions == None or file_extension.lower() in exensions) and (name_filter == None or name_filter in _): if (exensions == None or file_extension.lower() in exensions) and (name_filter == None or name_filter in _):
path = os.path.join(relative_path, filename) path = os.path.join(relative_path, filename)
filenames.append(path) filenames.append(path)
return sorted(filenames, key=lambda x: -1 if os.sep in x else 1) return filenames