From 00082f54c3ddd37f8a703c3d87e3593a9fcf186e Mon Sep 17 00:00:00 2001 From: Mr Chen Date: Tue, 26 Mar 2019 16:46:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=A4=8D=E5=88=B6|=E5=89=AA?= =?UTF-8?q?=E5=88=87|=E6=9D=83=E9=99=90|=E5=8E=8B=E7=BC=A9=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- class/core/config_api.py | 3 +- class/core/files_api.py | 177 ++++++++++++++++++++++++++++++++++++++ class/core/public.py | 2 +- route/static/app/files.js | 133 +++++++++++++++------------- 4 files changed, 250 insertions(+), 65 deletions(-) diff --git a/class/core/config_api.py b/class/core/config_api.py index cb4057867..0f60f38a3 100755 --- a/class/core/config_api.py +++ b/class/core/config_api.py @@ -17,8 +17,7 @@ class config_api: # 本版解决自启动问题 # 文件管理重命名 - __version = '0.7.2' - + __version = '0.7.3' def __init__(self): pass diff --git a/class/core/files_api.py b/class/core/files_api.py index 097d53e1a..62924142d 100755 --- a/class/core/files_api.py +++ b/class/core/files_api.py @@ -13,6 +13,7 @@ import shutil from flask import request from flask import send_file, send_from_directory from flask import make_response +from flask import session class files_api: @@ -376,8 +377,184 @@ done tmp = self.getDirSize(logPath) return public.returnJson(True, tmp[0].split()[0]) + def setBatchDataApi(self): + path = request.form.get('path', '').encode('utf-8') + stype = request.form.get('type', '').encode('utf-8') + access = request.form.get('access', '').encode('utf-8') + user = request.form.get('user', '').encode('utf-8') + data = request.form.get('data') + if stype == '1' or stype == '2': + session['selected'] = { + 'path':path, + 'type':stype, + 'access':access, + 'user':user, + 'data':data + } + return public.returnJson(True,'标记成功,请在目标目录点击粘贴所有按钮!') + elif stype == '3': + for key in json.loads(data): + try: + key = key.encode('utf-8') + filename = path+'/'+key + if not self.checkDir(filename): + return public.returnJson(False,'FILE_DANGER'); + os.system('chmod -R '+access+" '"+filename+"'") + os.system('chown -R '+user+':'+user+" '"+filename+"'") + except: + continue; + public.writeLog('文件管理','批量设置权限成功!') + return public.returnJson(True,'批量设置权限成功!') + else: + import shutil + isRecyle = os.path.exists('data/recycle_bin.pl') + data = json.loads(data) + l = len(data); + i = 0; + for key in data: + try: + filename = path + '/'+key.encode('utf-8') + topath = filename; + if not os.path.exists(filename): + continue + + i += 1; + public.writeSpeed(key,i,l); + if os.path.isdir(filename): + if not self.checkDir(filename): + return public.returnJson(False,'请不要花样作死!'); + if isRecyle: + self.mvRecycleBin(topath) + else: + shutil.rmtree(filename) + else: + if key == '.user.ini': + os.system('which chattr && chattr -i ' + filename); + if isRecyle: + self.mvRecycleBin(topath) + else: + os.remove(filename) + except: + continue; + public.writeSpeed(None,0,0); + public.writeLog('文件管理','批量删除成功!') + return public.returnJson(True,'批量删除成功！') + + def checkExistsFilesApi(self): + dfile = request.form.get('dfile', '').encode('utf-8') + filename = request.form.get('filename', '').encode('utf-8') + data = []; + filesx = []; + if filename == '': + filesx = json.loads(session['selected']['data']); + else: + filesx.append(filename); + + print filesx + + for fn in filesx: + if fn == '.': continue + filename = dfile + '/' + fn; + if os.path.exists(filename): + tmp = {} + stat = os.stat(filename) + tmp['filename'] = fn + tmp['size'] = os.path.getsize(filename); + tmp['mtime'] = str(int(stat.st_mtime)); + data.append(tmp) + return public.returnJson(True,'ok', data) + + def batchPasteApi(self): + path = request.form.get('path', '').encode('utf-8') + stype = request.form.get('type', '').encode('utf-8') + # filename = request.form.get('filename', '').encode('utf-8') + import shutil + if not self.checkDir(path): + return public.returnJson(False,'请不要花样作死!'); + i = 0; + myfiles = json.loads(session['selected']['data']) + l = len(myfiles); + if stype == '1': + for key in myfiles: + i += 1 + public.writeSpeed(key,i,l); + try: + + sfile = session['selected']['path'] + '/' + key.encode('utf-8') + dfile = path + '/' + key.encode('utf-8') + + if os.path.isdir(sfile): + shutil.copytree(sfile,dfile) + else: + shutil.copyfile(sfile,dfile) + stat = os.stat(sfile) + os.chown(dfile,stat.st_uid,stat.st_gid) + except: + continue; + msg = public.getInfo('从[{1}]批量复制到[{2}]成功',(session['selected']['path'],path,)) + public.writeLog('文件管理',msg) + else: + for key in myfiles: + try: + i += 1 + public.writeSpeed(key,i,l); + + sfile = session['selected']['path'] + '/' + key.encode('utf-8') + dfile = path + '/' + key.encode('utf-8') + + shutil.move(sfile,dfile) + except: + continue; + msg = public.getInfo('从[{1}]批量移动到[{2}]成功', (session['selected']['path'],path,)) + public.writeLog('文件管理',msg) + public.writeSpeed(None,0,0); + errorCount = len(myfiles) - i + del(session['selected']) + msg = public.getInfo('批量操作成功[{1}],失败[{2}]', (str(i),str(errorCount))) + return public.returnJson(True, msg); + + def copyFileApi(self): + sfile = request.form.get('sfile', '').encode('utf-8') + dfile = request.form.get('dfile', '').encode('utf-8') + + if not os.path.exists(sfile): + return public.returnJson(False,'指定文件不存在!') + + if os.path.isdir(sfile): + return self.copyDir(get) + + import shutil + try: + shutil.copyfile(sfile, dfile) + msg = public.getInfo('复制文件[{1}]到[{2}]成功!', (sfile,dfile,)) + public.writeLog('文件管理',msg) + stat = os.stat(sfile) + os.chown(dfile, stat.st_uid, stat.st_gid) + return public.returnJson(True,'文件复制成功!') + except: + return public.returnJson(False,'文件复制失败!') + + ##### ----- end ----- ### + def copyDir(self, sfile, dfile): + + if not os.path.exists(sfile): + return public.returnJson(False,'指定目录不存在!'); + + if os.path.exists(dfile): + return public.returnJson(False,'指定目录已存在!'); + import shutil + try: + shutil.copytree(sfile, dfile) + stat = os.stat(sfile) + os.chown(dfile,stat.st_uid,stat.st_gid) + msg = public.getInfo('复制目录[{1}]到[{2}]成功!', (sfile,dfile)) + public.writeLog('文件管理',msg) + return public.returnJson(True,'目录复制成功!') + except: + return public.returnJson(False,'目录复制失败!') + # 检查敏感目录 def checkDir(self, path): path = path.replace('//', '/') diff --git a/class/core/public.py b/class/core/public.py index 691499e08..498de2b20 100755 --- a/class/core/public.py +++ b/class/core/public.py @@ -429,7 +429,7 @@ def writeSpeed(title, used, total, speed=0): def getSpeed(): # 取进度 - path = public.getRootDir() + path = getRootDir() data = readFile(path + '/tmp/panelSpeed.pl') if not data: data = json.dumps({'title': None, 'progress': 0, diff --git a/route/static/app/files.js b/route/static/app/files.js index 43c6872ce..b9d0c44ad 100755 --- a/route/static/app/files.js +++ b/route/static/app/files.js @@ -348,8 +348,8 @@ function getFiles(Path) { "+fmp[3]+"\ "+fmp[4]+"\ \ - 复制 | \ - 剪切 | \ + 复制 | \ + 剪切 | \ 重命名 | \ 权限 | \ 压缩 | \ @@ -404,8 +404,8 @@ function getFiles(Path) { "+fmp[3]+"\ "+fmp[4]+"\ \ - 复制batch | \ - 剪切 | \ + 复制 | \ + 剪切 | \ 重命名 | \ 权限 | \ 压缩 | \ @@ -414,7 +414,7 @@ function getFiles(Path) { "; } else{ - Body += "
\ + Body += "
\ \
\
" + fmp[0] + "
\ @@ -428,12 +428,12 @@ function getFiles(Path) { \ \ \ - '+lan.files.file_name+'\ - '+lan.files.file_size+'\ - '+lan.files.file_etime+'\ - '+lan.files.file_auth+'\ - '+lan.files.file_own+'\ - '+lan.files.file_act+'\ + 文件名\ + 大小\ + 修改时间\ + 权限\ + 所有者\ + 操作\ \ \ '+Body+'\ @@ -448,7 +448,7 @@ function getFiles(Path) { $("#DirPathPlace input").val(rdata.PATH); var BarTools = '
\ \
    \
  • 新建空白文件
    • \ @@ -644,14 +644,16 @@ function batch(type,access){ var len = el.length; var data='path='+path+'&type='+type; var name = 'data'; + var datas = []; var oldType = getCookie('BatchPaste'); - + for(var i=0;i"+lan.public.the+"
",{icon:16,time:0,shade: [0.3, '#000']}); + myloadT = layer.msg("
正在处理,请稍候...
",{icon:16,time:0,shade: [0.3, '#000']}); setTimeout(function(){getSpeed('.myspeed');},1000); - $.post('files?action=SetBatchData',data,function(rdata){ + console.log(data); + $.post('files/set_batch_data',data,function(rdata){ layer.close(myloadT); getFiles(path); layer.msg(rdata.msg,{icon:1}); - }); + },'json'); } //批量粘贴 -function BatchPaste(){ +function batchPaste(){ var path = $("#DirPathPlace input").val(); var type = getCookie('BatchPaste'); var data = 'type='+type+'&path='+path; - - $.post('/files?action=CheckExistsFiles',{dfile:path},function(result){ + + $.post('/files/check_exists_files',{dfile:path},function(rdata){ + var result = rdata['data']; if(result.length > 0){ var tbody = ''; for(var i=0;i\
'; - SafeMessage('即将覆盖以下文件',mbody,function(){ - BatchPasteTo(data,path); + safeMessage('即将覆盖以下文件',mbody,function(){ + batchPasteTo(data,path); }); $(".layui-layer-page").css("width","500px"); }else{ - BatchPasteTo(data,path); + batchPasteTo(data,path); } - }); + },'json'); } -function BatchPasteTo(data,path){ - myloadT = layer.msg("
"+lan.public.the+"
",{icon:16,time:0,shade: [0.3, '#000']}); +function batchPasteTo(data,path){ + myloadT = layer.msg("
正在处理,请稍候...
",{icon:16,time:0,shade: [0.3, '#000']}); setTimeout(function(){getSpeed('.myspeed');},1000); - $.post('files?action=BatchPaste',data,function(rdata){ + $.post('files/batch_paste',data,function(rdata){ layer.close(myloadT); setCookie('BatchSelected', null); getFiles(path); layer.msg(rdata.msg,{icon:1}); - }); + },'json'); } @@ -820,7 +824,7 @@ function createFile(type, path) { shift: 5, closeBtn: 2, area: '320px', - title: lan.files.new_empty_file, + title: '新建空白文件', content: '
\
\ \ @@ -839,7 +843,7 @@ function createFile(type, path) { function createDir(type, path) { if (type == 1) { var dirName = $("#newDirName").val(); - layer.msg(lan.public.the, { + layer.msg('正在处理,请稍候...', { icon: 16, time: 10000 }); @@ -857,7 +861,7 @@ function createDir(type, path) { shift: 5, closeBtn: 2, area: '320px', - title: lan.files.new_dir, + title: '新建目录', content: '
\
\ \ @@ -875,8 +879,8 @@ function createDir(type, path) { //删除文件 function deleteFile(fileName){ - layer.confirm(lan.get('recycle_bin_confirm',[fileName]),{title:lan.files.del_file,closeBtn:2,icon:3},function(){ - layer.msg(lan.public.the,{icon:16,time:0,shade: [0.3, '#000']}); + layer.confirm(lan.get('recycle_bin_confirm',[fileName]),{title:'删除文件',closeBtn:2,icon:3},function(){ + layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']}); $.post('/files/delete', 'path=' + encodeURIComponent(fileName), function(rdata) { layer.closeAll(); layer.msg(rdata.msg, { @@ -889,8 +893,8 @@ function deleteFile(fileName){ //删除目录 function deleteDir(dirName){ - layer.confirm(lan.get('recycle_bin_confirm_dir',[dirName]),{title:lan.files.del_dir,closeBtn:2,icon:3},function(){ - layer.msg(lan.public.the,{icon:16,time:0,shade: [0.3, '#000']}); + layer.confirm(lan.get('recycle_bin_confirm_dir',[dirName]),{title:'删除目录',closeBtn:2,icon:3},function(){ + layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']}); $.post('/files/delete_dir', 'path=' + encodeURIComponent(dirName), function(rdata) { layer.closeAll(); layer.msg(rdata.msg, { @@ -905,7 +909,7 @@ function allDeleteFileSub(data,path){ layer.confirm('您确实要把这些文件放入回收站吗?',{title:'批量删除文件',closeBtn:2,icon:3},function(){ layer.msg("
正在处理,请稍候...
",{icon:16,time:0,shade: [0.3, '#000']}); setTimeout(function(){getSpeed('.myspeed');},1000); - $.post('files?action=SetBatchData',data,function(rdata){ + $.post('files/set_batch_data',data,function(rdata){ layer.closeAll(); getFiles(path); layer.msg(rdata.msg,{icon:1}); @@ -914,7 +918,7 @@ function allDeleteFileSub(data,path){ } //重载文件列表 -function ReloadFiles(){ +function reloadFiles(){ setInterval(function(){ var path = $("#DirPathPlace input").val(); getFiles(path); @@ -996,14 +1000,14 @@ function reName(type, fileName) { shift: 5, closeBtn: 2, area: '320px', - title: lan.files.file_menu_rename, + title: '重命名', content: '
\
\ - \ + \
\
\ - \ - \ + \ + \
\
' }); @@ -1012,36 +1016,41 @@ function reName(type, fileName) { }); } //剪切 -function CutFile(fileName) { +function cutFile(fileName) { var path = $("#DirPathPlace input").val(); setCookie('cutFileName', fileName); setCookie('copyFileName', null); - layer.msg(lan.files.mv_ok, { + layer.msg('已剪切', { icon: 1, - time: 1 + time: 1000 }); - getFiles(path); + setTimeout(function(){ + getFiles(path); + },1000); } //复制 -function CopyFile(fileName) { +function copyFile(fileName) { var path = $("#DirPathPlace input").val(); setCookie('copyFileName', fileName); setCookie('cutFileName', null); - layer.msg(lan.files.copy_ok, { + layer.msg('已复制', { icon: 1, - time: 1 + time: 1000 }); - getFiles(path); + + setTimeout(function(){ + getFiles(path); + },1000); } //粘贴 -function PasteFile(fileName) { +function pasteFile(fileName) { var path = $("#DirPathPlace input").val(); var copyName = getCookie('copyFileName'); var cutName = getCookie('cutFileName'); var filename = copyName; if(cutName != 'null' && cutName != undefined) filename=cutName; filename = filename.split('/').pop(); - $.post('/files?action=CheckExistsFiles',{dfile:path,filename:filename},function(result){ + $.post('/files/check_exists_files',{dfile:path,filename:filename},function(result){ if(result.length > 0){ var tbody = ''; for(var i=0;i\
'; - SafeMessage('即将覆盖以下文件',mbody,function(){ - PasteTo(path,copyName,cutName,fileName); + safeMessage('即将覆盖以下文件',mbody,function(){ + pasteTo(path,copyName,cutName,fileName); }); }else{ - PasteTo(path,copyName,cutName,fileName); + pasteTo(path,copyName,cutName,fileName); } - }); + },'json'); } -function PasteTo(path,copyName,cutName,fileName){ +function pasteTo(path,copyName,cutName,fileName){ if (copyName != 'null' && copyName != undefined) { layer.msg(lan.files.copy_the, { icon: 16, time: 0,shade: [0.3, '#000'] }); - $.post('/files?action=CopyFile', 'sfile=' + encodeURIComponent(copyName) + '&dfile=' + encodeURIComponent(path +'/'+ fileName), function(rdata) { + $.post('/files/copy_file', 'sfile=' + encodeURIComponent(copyName) + '&dfile=' + encodeURIComponent(path +'/'+ fileName), function(rdata) { layer.closeAll(); layer.msg(rdata.msg, { icon: rdata.status ? 1 : 2 }); getFiles(path); - }); + },'json'); setCookie('copyFileName', null); setCookie('cutFileName', null); return; @@ -1115,7 +1124,7 @@ function zip(dirName,submits) { if(rdata == null || rdata == undefined){ layer.msg(lan.files.zip_ok,{icon:1}); getFiles(path) - ReloadFiles(); + reloadFiles(); return; } layer.msg(rdata.msg, {icon: rdata.status ? 1 : 2}); @@ -1306,7 +1315,7 @@ function setChmod(action,fileName){ return; } - var toExec = fileName == lan.files.all?'Batch(3,1)':'setChmod(1,\''+fileName+'\')'; + var toExec = fileName == lan.files.all?'batch(3,1)':'setChmod(1,\''+fileName+'\')'; $.post('/files/file_access','filename='+encodeURIComponent(fileName),function(rdata){ // console.log(rdata); layer.open({ @@ -1415,8 +1424,8 @@ function onAccess(){ function RClick(type,path,name){ var displayZip = isZip(type); 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_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_auth, onclick: function() {setChmod(0,path)}}, {text: lan.files.file_menu_zip, onclick: function() {zip(path)}}