diff --git a/class/core/config_api.py b/class/core/config_api.py index 9cb9a929b..d1c260d91 100755 --- a/class/core/config_api.py +++ b/class/core/config_api.py @@ -16,15 +16,8 @@ from flask import request class config_api: # 本版解决自启动问题 - # openresty 自启动 done - # php 自启动 done - # mysql 自启动 done - # memcached 自启动 done - # redis 自启动 done - # pureftp 自启动 done - # sphinx 自启动 done - # 修复rsync自启动问题 - __version = '0.6.0' + # 文件管理重命名 + __version = '0.7.1' def __init__(self): pass diff --git a/class/core/files_api.py b/class/core/files_api.py index b020be87e..f9dc40d4b 100755 --- a/class/core/files_api.py +++ b/class/core/files_api.py @@ -61,6 +61,27 @@ class files_api: path = request.form.get('path', '').encode('utf-8') return self.zip(sfile, dfile, stype, path) + # 移动文件或目录 + def mvFileApi(self): + sfile = request.form.get('sfile', '').encode('utf-8') + dfile = request.form.get('dfile', '').encode('utf-8') + if not self.checkFileName(get.dfile): + return public.returnJson(False, '文件名中不能包含特殊字符!') + if not os.path.exists(get.sfile): + return public.returnJson(False, '指定文件不存在!') + + if not self.checkDir(get.sfile): + return public.returnJson(False, 'FILE_DANGER') + + import shutil + try: + shutil.move(sfile, dfile) + msg = public.getInfo('移动文件或目录[{1}]到[{2}]成功!', (sfile, dfile,)) + public.writeLog('文件管理', msg) + return public.returnJson(True, '移动文件或目录成功!') + except: + return public.returnJson(False, '移动文件或目录失败!') + def deleteApi(self): path = request.form.get('path', '').encode('utf-8') return self.delete(path) @@ -73,26 +94,28 @@ class files_api: def setFileAccessApi(self): if public.isAppleSystem(): - return public.returnJson(True,'开发机不设置!') + return public.returnJson(True, '开发机不设置!') filename = request.form.get('filename', '').encode('utf-8') user = request.form.get('user', '').encode('utf-8') access = request.form.get('access', '755') sall = '-R' try: - if not self.checkDir(filename): + if not self.checkDir(filename): return public.returnJson(False, '请不要花样作死') if not os.path.exists(filename): - return public.returnJson(False,'指定文件不存在!') + return public.returnJson(False, '指定文件不存在!') os.system('chmod ' + sall + ' ' + access + " '" + filename + "'") - os.system('chown ' + sall + ' ' + user + ':' + user + " '" + filename + "'") - msg = public.getInfo('设置[{1}]权限为[{2}]所有者为[{3}]', (filename,access,user,)) + os.system('chown ' + sall + ' ' + user + + ':' + user + " '" + filename + "'") + msg = public.getInfo( + '设置[{1}]权限为[{2}]所有者为[{3}]', (filename, access, user,)) public.writeLog('文件管理', msg) - return public.returnJson(True,'设置成功!') + return public.returnJson(True, '设置成功!') except: - return public.returnJson(False,'设置失败!') + return public.returnJson(False, '设置失败!') def getDirSizeApi(self): path = request.form.get('path', '').encode('utf-8') diff --git a/route/static/app/files.js b/route/static/app/files.js index ffef98086..4810f2936 100755 --- a/route/static/app/files.js +++ b/route/static/app/files.js @@ -350,9 +350,9 @@ function getFiles(Path) { \ 复制 | \ 剪切 | \ - 重命名 | \ + 重命名 | \ 权限 | \ - 压缩 | \ + 压缩 | \ 删除\ "; } else { @@ -406,9 +406,9 @@ function getFiles(Path) { \ "+lan.files.file_menu_copy+" | \ "+lan.files.file_menu_mv+" | \ - "+lan.files.file_menu_rename+" | \ + "+lan.files.file_menu_rename+" | \ "+lan.files.file_menu_auth+" | \ - "+lan.files.file_menu_zip+" | \ + "+lan.files.file_menu_zip+" | \ "+bodyZip+download+"\ "+lan.files.file_menu_del+"\ "; @@ -680,7 +680,7 @@ function Batch(type,access){ names += el[i].value + ','; } } - Zip(names); + zip(names); return; } @@ -973,7 +973,7 @@ function downloadFile(action){ //重命名 -function ReName(type, fileName) { +function reName(type, fileName) { if (type == 1) { var path = $("#DirPathPlace input").val(); var newFileName = encodeURIComponent(path + '/' + $("#newFileName").val()); @@ -1003,7 +1003,7 @@ function ReName(type, fileName) { \
\ \ - \ + \
\ ' }); @@ -1097,7 +1097,7 @@ function PasteTo(path,copyName,cutName,fileName){ //压缩目录 -function Zip(dirName,submits) { +function zip(dirName,submits) { var path = $("#DirPathPlace input").val(); if(submits != undefined){ if(dirName.indexOf(',') == -1){ @@ -1143,7 +1143,7 @@ function Zip(dirName,submits) { +'' +'
' +'' - +'' + +'' +'
' +'' }); @@ -1417,9 +1417,9 @@ function RClick(type,path,name){ var options = {items:[ {text: lan.files.file_menu_copy, onclick: function() {CopyFile(path)}}, {text: lan.files.file_menu_mv, onclick: function() {CutFile(path)}}, - {text: lan.files.file_menu_rename, onclick: function() {ReName(0,name)}}, + {text: lan.files.file_menu_rename, onclick: function() {reName(0,name)}}, {text: lan.files.file_menu_auth, onclick: function() {setChmod(0,path)}}, - {text: lan.files.file_menu_zip, onclick: function() {Zip(path)}} + {text: lan.files.file_menu_zip, onclick: function() {zip(path)}} ]}; if(type == "dir"){