|
|
@ -146,7 +146,7 @@ def uncompress(sfile, dfile, path): |
|
|
|
if extension == 'rar' and not mw.checkBinExist('rar'): |
|
|
|
if extension == 'rar' and not mw.checkBinExist('rar'): |
|
|
|
return mw.returnData(False, 'rar解压命令不存在,请安装!') |
|
|
|
return mw.returnData(False, 'rar解压命令不存在,请安装!') |
|
|
|
if extension == '7z' and not mw.checkBinExist('7z'): |
|
|
|
if extension == '7z' and not mw.checkBinExist('7z'): |
|
|
|
return mw.returnData(False, '7z解药命令不存在,请安装!') |
|
|
|
return mw.returnData(False, '7z解压命令不存在,请安装!') |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cmd = "cd " + path + " " |
|
|
|
cmd = "cd " + path + " " |
|
|
@ -294,10 +294,14 @@ def zip(sfile, dfile, stype, path): |
|
|
|
if stype == 'zip': |
|
|
|
if stype == 'zip': |
|
|
|
mw.execShell("cd '" + path + "' && zip '" + dfile + "' -r '" + sfile + "' > " + tmps + " 2>&1") |
|
|
|
mw.execShell("cd '" + path + "' && zip '" + dfile + "' -r '" + sfile + "' > " + tmps + " 2>&1") |
|
|
|
elif stype == '7z': |
|
|
|
elif stype == '7z': |
|
|
|
|
|
|
|
if not mw.checkBinExist('7z'): |
|
|
|
|
|
|
|
return mw.returnData(False, '7z解压命令不存在,请安装!') |
|
|
|
mw.execShell("cd '" + path + "' && 7z a '" + dfile + "' -r '" + sfile + "' > " + tmps + " 2>&1") |
|
|
|
mw.execShell("cd '" + path + "' && 7z a '" + dfile + "' -r '" + sfile + "' > " + tmps + " 2>&1") |
|
|
|
elif stype == 'tar_gz': |
|
|
|
elif stype == 'tar_gz': |
|
|
|
mw.execShell("cd '" + path + "' && tar -zcvf '" + dfile + "' " + sfile + " > " + tmps + " 2>&1") |
|
|
|
mw.execShell("cd '" + path + "' && tar -zcvf '" + dfile + "' " + sfile + " > " + tmps + " 2>&1") |
|
|
|
elif stype == 'rar': |
|
|
|
elif stype == 'rar': |
|
|
|
|
|
|
|
if not mw.checkBinExist('rar'): |
|
|
|
|
|
|
|
return mw.returnData(False, 'rar解压命令不存在,请安装!') |
|
|
|
mw.execShell("cd '" + path + "' && rar a '" + dfile + "' '" + sfile + "' > " + tmps + " 2>&1") |
|
|
|
mw.execShell("cd '" + path + "' && rar a '" + dfile + "' '" + sfile + "' > " + tmps + " 2>&1") |
|
|
|
else: |
|
|
|
else: |
|
|
|
sfiles = '' |
|
|
|
sfiles = '' |
|
|
|