77from aiohttp import web
88from urllib import parse
99from comfy .cli_args import args
10- import folder_paths
10+ import folder_paths
1111from .app_settings import AppSettings
1212
1313default_user = "default"
@@ -65,7 +65,7 @@ def get_request_user_filepath(self, request, file, type="userdata", create_dir=T
6565 # Check if filename is url encoded
6666 if "%" in file :
6767 file = parse .unquote (file )
68-
68+
6969 # prevent leaving /{type}/{user}
7070 path = os .path .abspath (os .path .join (user_root , file ))
7171 if os .path .commonpath ((user_root , path )) != user_root :
@@ -165,30 +165,30 @@ def get_user_data_path(request, check_exists = False, param = "file"):
165165 file = request .match_info .get (param , None )
166166 if not file :
167167 return web .Response (status = 400 )
168-
168+
169169 path = self .get_request_user_filepath (request , file )
170170 if not path :
171171 return web .Response (status = 403 )
172-
172+
173173 if check_exists and not os .path .exists (path ):
174174 return web .Response (status = 404 )
175-
175+
176176 return path
177177
178178 @routes .get ("/userdata/{file}" )
179179 async def getuserdata (request ):
180180 path = get_user_data_path (request , check_exists = True )
181181 if not isinstance (path , str ):
182182 return path
183-
183+
184184 return web .FileResponse (path )
185185
186186 @routes .post ("/userdata/{file}" )
187187 async def post_userdata (request ):
188188 path = get_user_data_path (request )
189189 if not isinstance (path , str ):
190190 return path
191-
191+
192192 overwrite = request .query ["overwrite" ] != "false"
193193 if not overwrite and os .path .exists (path ):
194194 return web .Response (status = 409 )
@@ -197,7 +197,7 @@ async def post_userdata(request):
197197
198198 with open (path , "wb" ) as f :
199199 f .write (body )
200-
200+
201201 resp = os .path .relpath (path , self .get_request_user_filepath (request , None ))
202202 return web .json_response (resp )
203203
@@ -208,25 +208,25 @@ async def delete_userdata(request):
208208 return path
209209
210210 os .remove (path )
211-
211+
212212 return web .Response (status = 204 )
213213
214214 @routes .post ("/userdata/{file}/move/{dest}" )
215215 async def move_userdata (request ):
216216 source = get_user_data_path (request , check_exists = True )
217217 if not isinstance (source , str ):
218218 return source
219-
219+
220220 dest = get_user_data_path (request , check_exists = False , param = "dest" )
221221 if not isinstance (source , str ):
222222 return dest
223-
223+
224224 overwrite = request .query ["overwrite" ] != "false"
225225 if not overwrite and os .path .exists (dest ):
226226 return web .Response (status = 409 )
227227
228228 print (f"moving '{ source } ' -> '{ dest } '" )
229229 shutil .move (source , dest )
230-
230+
231231 resp = os .path .relpath (dest , self .get_request_user_filepath (request , None ))
232232 return web .json_response (resp )
0 commit comments