From 10009b65be5d8417f11ded2c837ea45254a8747d Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Sat, 14 Dec 2024 18:19:31 +0800 Subject: [PATCH 1/3] Update file.py --- web/utils/file.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/web/utils/file.py b/web/utils/file.py index 42244ba48c..340aa1f589 100644 --- a/web/utils/file.py +++ b/web/utils/file.py @@ -89,13 +89,19 @@ def mvFile(sfile, dfile): if not checkDir(sfile): return mw.returnData(False, 'FILE_DANGER') + + try: + pass + except Exception as e: + raise e + try: shutil.move(sfile, dfile) msg = mw.getInfo('移动或重名命文件[{1}]到[{2}]成功!', (sfile, dfile,)) mw.writeLog('文件管理', msg) return mw.returnData(True, '移动或重名命文件成功!') - except: - return mw.returnData(False, '移动或重名命文件失败!') + except Exception as e: + return mw.returnData(False, '移动或重名命文件失败!'. str(e)) def uncompress(sfile, dfile, path): if not os.path.exists(sfile): From 5cf0745da09374e55d3e583b336872f486cf1c8c Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Sat, 14 Dec 2024 18:26:55 +0800 Subject: [PATCH 2/3] Update file.py --- web/utils/file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/utils/file.py b/web/utils/file.py index 340aa1f589..a09d2d9b6b 100644 --- a/web/utils/file.py +++ b/web/utils/file.py @@ -101,7 +101,7 @@ def mvFile(sfile, dfile): mw.writeLog('文件管理', msg) return mw.returnData(True, '移动或重名命文件成功!') except Exception as e: - return mw.returnData(False, '移动或重名命文件失败!'. str(e)) + return mw.returnData(False, '移动或重名命文件失败!'+str(e)) def uncompress(sfile, dfile, path): if not os.path.exists(sfile): From 9d08b7de34cb18f9a0832f70682f7add23046d60 Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Sat, 14 Dec 2024 18:35:26 +0800 Subject: [PATCH 3/3] Update mw.py --- web/core/mw.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/core/mw.py b/web/core/mw.py index a5b1d95bb9..15134c210a 100644 --- a/web/core/mw.py +++ b/web/core/mw.py @@ -126,7 +126,7 @@ def getWwwDir(): def getBackupDir(): import thisdb - backup_path = thisdb.getOption('backup_path') + backup_path = thisdb.getOption('backup_path', default=getFatherDir()+'/backup') return backup_path def setBackupDir(bdir):