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

Use overridden user directory.

Browse Source
This commit is contained in:
Robin Huang 2024-09-04 12:12:59 -07:00
parent 12f88d8342
commit 5440eb7e1a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/user_manager.py
View File

@ -7,16 +7,15 @@ import shutil
from aiohttp import web from aiohttp import web
from urllib import parse from urllib import parse
from comfy.cli_args import args from comfy.cli_args import args
from folder_paths import user_directory import folder_paths
from .app_settings import AppSettings from .app_settings import AppSettings
default_user = "default" default_user = "default"
users_file = os.path.join(user_directory, "users.json")
class UserManager(): class UserManager():
def __init__(self): def __init__(self):
global user_directory user_directory = folder_paths.get_user_directory()
self.settings = AppSettings(self) self.settings = AppSettings(self)
if not os.path.exists(user_directory): if not os.path.exists(user_directory):
@ -35,6 +34,9 @@ class UserManager():
else: else:
self.users = {"default": "default"} self.users = {"default": "default"}
def get_users_file(self):
return os.path.join(folder_paths.get_user_directory(), "users.json")
def get_request_user_id(self, request): def get_request_user_id(self, request):
user = "default" user = "default"
if args.multi_user and "comfy-user" in request.headers: if args.multi_user and "comfy-user" in request.headers:
@ -46,7 +48,7 @@ class UserManager():
return user return user
def get_request_user_filepath(self, request, file, type="userdata", create_dir=True): def get_request_user_filepath(self, request, file, type="userdata", create_dir=True):
global user_directory user_directory = folder_paths.get_user_directory()
if type == "userdata": if type == "userdata":
root_dir = user_directory root_dir = user_directory
@ -55,6 +57,7 @@ class UserManager():
user = self.get_request_user_id(request) user = self.get_request_user_id(request)
path = user_root = os.path.abspath(os.path.join(root_dir, user)) path = user_root = os.path.abspath(os.path.join(root_dir, user))
print(f"User: {user}, Path: {path}")
# prevent leaving /{type} # prevent leaving /{type}
if os.path.commonpath((root_dir, user_root)) != root_dir: if os.path.commonpath((root_dir, user_root)) != root_dir:
@ -87,7 +90,7 @@ class UserManager():
self.users[user_id] = name self.users[user_id] = name
global users_file global users_file
with open(users_file, "w") as f: with open(self.get_users_file(), "w") as f:
json.dump(self.users, f) json.dump(self.users, f)
return user_id return user_id