Merge pull request #641 from midoks/dev

修复站点备份目录未指定默认值
midoks · Dec 14, 2024 · de351c7 · de351c7
2 parents 80c1c0b + 9d08b7d
commit de351c7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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):

diff --git 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):