diff --git a/wwwroot/delete_folder_or_file.dspy b/wwwroot/delete_folder_or_file.dspy index bc6709e..2524b3a 100644 --- a/wwwroot/delete_folder_or_file.dspy +++ b/wwwroot/delete_folder_or_file.dspy @@ -3,9 +3,10 @@ orgid = await get_userorgid() dbname = get_module_dbname('filemgr') debug(f'delete_folder_or_file.dspy:here') db = DBPools() +filemgr = RagFileMgr(params_kw.fiid) +delfiles = [] async with db.sqlorContext(dbname) as sor: debug(f'delete_folder_or_file.dspy:here') - filemgr = RagFileMgr(params_kw.fiid) ownerid = await get_userorgid() debug(f'delete_folder_or_file.dspy:here') if params_kw.filetype == 'folder': @@ -28,11 +29,14 @@ async with db.sqlorContext(dbname) as sor: } } ]) - await filemgr._del_folder(sor, params_kw.id, ownerid) + delfiles = await filemgr._del_folder(sor, params_kw.id, ownerid) debug(f'delete_folder_or_file.dspy:here') else: - await filemgr._del_file(sor, params_kw.id, ownerid) + dfile = await filemgr._del_file(sor, params_kw.id, ownerid) + delfiles.append(dfile) debug(f'delete_folder_or_file.dspy:here') +user = await get_user() +await filemgr.file_deleted(request, delfiles, user) return UiMessage(title='delete file', message='delete success') debug(f'delete_folder_or_file.dspy:here') return UiError(title='delete file', message='delete failed')