|
|
@ -37,6 +37,15 @@ def execShell(cmdstring, cwd=None, timeout=None, shell=True): |
|
|
|
cmd = cmdstring + ' > ' + g_log_file + ' 2>&1' |
|
|
|
cmd = cmdstring + ' > ' + g_log_file + ' 2>&1' |
|
|
|
return mw.execShell(cmd) |
|
|
|
return mw.execShell(cmd) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def writeLogs(data): |
|
|
|
|
|
|
|
# 写输出日志 |
|
|
|
|
|
|
|
try: |
|
|
|
|
|
|
|
fp = open(g_log_file, 'w+') |
|
|
|
|
|
|
|
fp.write(data) |
|
|
|
|
|
|
|
fp.close() |
|
|
|
|
|
|
|
except: |
|
|
|
|
|
|
|
pass |
|
|
|
|
|
|
|
|
|
|
|
def mw_async(f): |
|
|
|
def mw_async(f): |
|
|
|
def wrapper(*args, **kwargs): |
|
|
|
def wrapper(*args, **kwargs): |
|
|
|
thr = threading.Thread(target=f, args=args, kwargs=kwargs) |
|
|
|
thr = threading.Thread(target=f, args=args, kwargs=kwargs) |
|
|
@ -72,7 +81,6 @@ def downloadFile(url, filename): |
|
|
|
writeLogs(str(e)) |
|
|
|
writeLogs(str(e)) |
|
|
|
return True |
|
|
|
return True |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def downloadHook(count, blockSize, totalSize): |
|
|
|
def downloadHook(count, blockSize, totalSize): |
|
|
|
# 下载文件进度回调 |
|
|
|
# 下载文件进度回调 |
|
|
|
global pre |
|
|
|
global pre |
|
|
@ -83,17 +91,6 @@ def downloadHook(count, blockSize, totalSize): |
|
|
|
speed = {'total': totalSize, 'used': used, 'pre': pre1} |
|
|
|
speed = {'total': totalSize, 'used': used, 'pre': pre1} |
|
|
|
writeLogs(json.dumps(speed)) |
|
|
|
writeLogs(json.dumps(speed)) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def writeLogs(data): |
|
|
|
|
|
|
|
# 写输出日志 |
|
|
|
|
|
|
|
try: |
|
|
|
|
|
|
|
fp = open(g_log_file, 'w+') |
|
|
|
|
|
|
|
fp.write(data) |
|
|
|
|
|
|
|
fp.close() |
|
|
|
|
|
|
|
except: |
|
|
|
|
|
|
|
pass |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def runPanelTask(): |
|
|
|
def runPanelTask(): |
|
|
|
try: |
|
|
|
try: |
|
|
|
bash_list = thisdb.getTaskList(status=-1) |
|
|
|
bash_list = thisdb.getTaskList(status=-1) |
|
|
|