298977887/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-06-12 14:32:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'folder_paths_ignore_git' of https://github.com/M1kep/ComfyUI

Browse Source
This commit is contained in:
comfyanonymous 2023-09-05 23:37:22 -04:00
commit eb2349822b
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
folder_paths.py
View File

@ -121,18 +121,25 @@ def add_model_folder_path(folder_name, full_folder_path):
def get_folder_paths(folder_name): def get_folder_paths(folder_name):
return folder_names_and_paths[folder_name][0][:] return folder_names_and_paths[folder_name][0][:]
def recursive_search(directory): def recursive_search(directory, excluded_dir_names=None):
if not os.path.isdir(directory): if not os.path.isdir(directory):
return [], {} return [], {}
if excluded_dir_names is None:
excluded_dir_names = []
result = [] result = []
dirs = {directory: os.path.getmtime(directory)} dirs = {directory: os.path.getmtime(directory)}
for root, subdir, file in os.walk(directory, followlinks=True): for dirpath, subdirs, filenames in os.walk(directory, followlinks=True, topdown=True):
for filepath in file: print("Checking directory: " + dirpath)
#we os.path,join directory with a blank string to generate a path separator at the end. subdirs[:] = [d for d in subdirs if d not in excluded_dir_names]
result.append(os.path.join(root, filepath).replace(os.path.join(directory,''),'')) for file_name in filenames:
for d in subdir: relative_path = os.path.relpath(os.path.join(dirpath, file_name), directory)
path = os.path.join(root, d) result.append(relative_path)
for d in subdirs:
path = os.path.join(dirpath, d)
dirs[path] = os.path.getmtime(path) dirs[path] = os.path.getmtime(path)
print("Returning from recursive_search" + repr(result))
return result, dirs return result, dirs
def filter_files_extensions(files, extensions): def filter_files_extensions(files, extensions):
@ -159,7 +166,7 @@ def get_filename_list_(folder_name):
folders = folder_names_and_paths[folder_name] folders = folder_names_and_paths[folder_name]
output_folders = {} output_folders = {}
for x in folders[0]: for x in folders[0]:
files, folders_all = recursive_search(x) files, folders_all = recursive_search(x, excluded_dir_names=[".git"])
output_list.update(filter_files_extensions(files, folders[1])) output_list.update(filter_files_extensions(files, folders[1]))
output_folders = {**output_folders, **folders_all} output_folders = {**output_folders, **folders_all}