update

web/admin/files/__init__.py

@@ -105,6 +105,13 @@ def delete():
     return file.fileDelete(path)
 
 
+# 删除文件
+@blueprint.route('/delete_dir', endpoint='delete_dir', methods=['POST'])
+def delete_dir():
+    path = request.form.get('path', '')
+    return file.dirDelete(path)
+
+
 # 回收站文件
 @blueprint.route('/get_recycle_bin', endpoint='get_recycle_bin', methods=['POST'])
 def get_recycle_bin():

web/utils/file.py

@@ -286,7 +286,7 @@ def fileDelete(path):
     try:
         recycle_bin = model.getOption('recycle_bin')
         if recycle_bin == 'open':
-            if file.mvRecycleBin(path):
+            if mvRecycleBin(path):
                 return mw.returnData(True, '已将文件移动到回收站!')
             return mw.returnData(False, '移动到回收站失败!') 
         os.remove(path)
@@ -295,6 +295,24 @@ def fileDelete(path):
     except Exception as e:
         return mw.returnData(False, '删除文件失败!')
 
+def dirDelete(path):
+    if not os.path.exists(path):
+        return mw.returnData(False, '指定文件不存在!')
+
+    # 检查是否为.user.ini
+    if path.find('.user.ini'):
+        os.system("which chattr && chattr -i '" + path + "'")
+    try:
+        recycle_bin = model.getOption('recycle_bin')
+        if recycle_bin == 'open':
+            if mvRecycleBin(path):
+                return mw.returnData(True, '已将文件移动到回收站!')
+        mw.execShell('rm -rf ' + path)
+        mw.writeLog('文件管理', '删除{1}成功！', (path,))
+        return mw.returnData(True, '删除文件成功!')
+    except:
+        return mw.returnData(False, '删除文件失败!')
+
 # 关闭
 def toggleRecycleBin():
     recycle_bin = model.getOption('recycle_bin')
@@ -352,7 +370,7 @@ def mvRecycleBin(path):
     rb_file = rb_dir + '/' + path.replace('/', '_mw_') + '_t_' + str(time.time())
     try:
         import shutil
-        shutil.move(path, rb_dir)
+        shutil.move(path, rb_file)
         mw.writeLog('文件管理', mw.getInfo('移动[{1}]到回收站成功!', (path,)))
         return True
     except Exception as e: