holm/easydiffusion
1
0
Fork 0
forked from extern/easydiffusion
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #435 from JeLuF/sanitize

Browse Source 
Sanitize session id's before using them as path components
This commit is contained in:
cmdr2 2022-11-03 10:57:12 +05:30 committed by GitHub
commit 74e64a4387
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ui/sd_internal/runtime.py
View File

@ -363,13 +363,21 @@ def load_model_real_esrgan():
thread_data.model_real_esrgan.model.name = thread_data.real_esrgan_file thread_data.model_real_esrgan.model.name = thread_data.real_esrgan_file
print('loaded ', thread_data.real_esrgan_file, 'to', thread_data.model_real_esrgan.device, 'precision', thread_data.precision) print('loaded ', thread_data.real_esrgan_file, 'to', thread_data.model_real_esrgan.device, 'precision', thread_data.precision)
def get_session_out_path(disk_path, session_id):
if disk_path is None: return None
if session_id is None: return None
session_out_path = os.path.join(disk_path, filename_regex.sub('_',session_id))
os.makedirs(session_out_path, exist_ok=True)
return session_out_path
def get_base_path(disk_path, session_id, prompt, img_id, ext, suffix=None): def get_base_path(disk_path, session_id, prompt, img_id, ext, suffix=None):
if disk_path is None: return None if disk_path is None: return None
if session_id is None: return None if session_id is None: return None
if ext is None: raise Exception('Missing ext') if ext is None: raise Exception('Missing ext')
session_out_path = os.path.join(disk_path, session_id) session_out_path = get_session_out_path(disk_path, session_id)
os.makedirs(session_out_path, exist_ok=True)
prompt_flattened = filename_regex.sub('_', prompt)[:50] prompt_flattened = filename_regex.sub('_', prompt)[:50]
@ -574,8 +582,7 @@ def do_mk_img(req: Request):
print(f"target t_enc is {t_enc} steps") print(f"target t_enc is {t_enc} steps")
if req.save_to_disk_path is not None: if req.save_to_disk_path is not None:
session_out_path = os.path.join(req.save_to_disk_path, req.session_id) session_out_path = get_session_out_path(req.save_to_disk_path, req.session_id)
os.makedirs(session_out_path, exist_ok=True)
else: else:
session_out_path = None session_out_path = None