qnloft
/
ComfyUI
mirror of https://github.com/comfyanonymous/ComfyUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Return right type when none specified in upload route. 

Switch time.time to time.perf_counter for custom node import times.
This commit is contained in:
comfyanonymous 2023-05-13 15:31:22 -04:00
parent db4d3a8494
commit b0505eb7ab
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nodes.py
View File

@ -1338,9 +1338,9 @@ def load_custom_nodes():
for possible_module in possible_modules: for possible_module in possible_modules:
module_path = os.path.join(custom_node_path, possible_module) module_path = os.path.join(custom_node_path, possible_module)
if os.path.isfile(module_path) and os.path.splitext(module_path)[1] != ".py": continue if os.path.isfile(module_path) and os.path.splitext(module_path)[1] != ".py": continue
time_before = time.time() time_before = time.perf_counter()
success = load_custom_node(module_path) success = load_custom_node(module_path)
node_import_times.append((time.time() - time_before, module_path, success)) node_import_times.append((time.perf_counter() - time_before, module_path, success))
if len(node_import_times) > 0: if len(node_import_times) > 0:
print("\nImport times for custom nodes:") print("\nImport times for custom nodes:")

9
server.py
View File

@ -115,22 +115,23 @@ class PromptServer():
def get_dir_by_type(dir_type): def get_dir_by_type(dir_type):
if dir_type is None: if dir_type is None:
type_dir = folder_paths.get_input_directory() dir_type = "input"
elif dir_type == "input":
if dir_type == "input":
type_dir = folder_paths.get_input_directory() type_dir = folder_paths.get_input_directory()
elif dir_type == "temp": elif dir_type == "temp":
type_dir = folder_paths.get_temp_directory() type_dir = folder_paths.get_temp_directory()
elif dir_type == "output": elif dir_type == "output":
type_dir = folder_paths.get_output_directory() type_dir = folder_paths.get_output_directory()
return type_dir return type_dir, dir_type
def image_upload(post, image_save_function=None): def image_upload(post, image_save_function=None):
image = post.get("image") image = post.get("image")
overwrite = post.get("overwrite") overwrite = post.get("overwrite")
image_upload_type = post.get("type") image_upload_type = post.get("type")
upload_dir = get_dir_by_type(image_upload_type) upload_dir, image_upload_type = get_dir_by_type(image_upload_type)
if image and image.file: if image and image.file:
filename = image.filename filename = image.filename