xinyun/ComfyUI
1
0
Fork 0
mirror of https://git.datalinker.icu/comfyanonymous/ComfyUI synced 2026-09-13 12:07:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor listuserdata

Browse Source
This commit is contained in:
huchenlei 2024-10-31 15:57:40 -04:00
parent daa1565b93
commit b6d6a357a7
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/user_manager.py
View File

@ -9,10 +9,25 @@ from urllib import parse
from comfy.cli_args import args from comfy.cli_args import args
import folder_paths import folder_paths
from .app_settings import AppSettings from .app_settings import AppSettings
from typing import TypedDict
default_user = "default" default_user = "default"
class FileInfo(TypedDict):
path: str
size: int
modified: int
def getFileInfo(path: str, relative_to: str) -> FileInfo:
return {
"path": os.path.relpath(path, relative_to),
"size": os.path.getsize(path),
"modified": os.path.getmtime(path)
}
class UserManager(): class UserManager():
def __init__(self): def __init__(self):
user_directory = folder_paths.get_user_directory() user_directory = folder_paths.get_user_directory()
@ -154,6 +169,7 @@ class UserManager():
recurse = request.rel_url.query.get('recurse', '').lower() == "true" recurse = request.rel_url.query.get('recurse', '').lower() == "true"
full_info = request.rel_url.query.get('full_info', '').lower() == "true" full_info = request.rel_url.query.get('full_info', '').lower() == "true"
split_path = request.rel_url.query.get('split', '').lower() == "true"
# Use different patterns based on whether we're recursing or not # Use different patterns based on whether we're recursing or not
if recurse: if recurse:
@ -161,26 +177,22 @@ class UserManager():
else: else:
pattern = os.path.join(glob.escape(path), '*') pattern = os.path.join(glob.escape(path), '*')
results = glob.glob(pattern, recursive=recurse) def process_full_path(full_path: str) -> FileInfo | str | list[str]:
full_path = full_path.replace(os.sep, '/')
if full_info:
return getFileInfo(full_path, path)
if full_info: rel_path = os.path.relpath(full_path, path)
results = [ if split_path:
{ return [rel_path] + rel_path.split('/')
'path': os.path.relpath(x, path).replace(os.sep, '/'),
'size': os.path.getsize(x),
'modified': os.path.getmtime(x)
} for x in results if os.path.isfile(x)
]
else:
results = [
os.path.relpath(x, path).replace(os.sep, '/')
for x in results
if os.path.isfile(x)
]
split_path = request.rel_url.query.get('split', '').lower() == "true" return rel_path
if split_path and not full_info:
results = [[x] + x.split('/') for x in results] results = [
process_full_path(full_path)
for full_path in glob.glob(pattern, recursive=recurse)
if os.path.isfile(full_path)
]
return web.json_response(results) return web.json_response(results)