cyonjan/PyWxDump
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
xaoyaoo 2024-08-11 11:05:38 +08:00
parent 472611153a
commit be4075df80
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pywxdump/wx_core/merge_db.py
View File

@ -420,7 +420,6 @@ def merge_real_time_db(key, merge_path: str, db_paths: [dict] or dict, real_time
os.makedirs(merge_path_base) os.makedirs(merge_path_base)
endbs = [] endbs = []
for db_info in db_paths: for db_info in db_paths:
db_path = os.path.abspath(db_info['db_path']) db_path = os.path.abspath(db_info['db_path'])
if not os.path.exists(db_path): if not os.path.exists(db_path):
@ -430,8 +429,7 @@ def merge_real_time_db(key, merge_path: str, db_paths: [dict] or dict, real_time
endbs = '" "'.join(list(set(endbs))) endbs = '" "'.join(list(set(endbs)))
if not os.path.exists(real_time_exe_path if real_time_exe_path else ""): if not os.path.exists(real_time_exe_path if real_time_exe_path else ""):
# 获取当前文件夹路径 current_path = os.path.dirname(__file__) # 获取当前文件夹路径
current_path = os.path.dirname(__file__)
real_time_exe_path = os.path.join(current_path, "tools", "realTime.exe") real_time_exe_path = os.path.join(current_path, "tools", "realTime.exe")
if not os.path.exists(real_time_exe_path): if not os.path.exists(real_time_exe_path):
raise FileNotFoundError("未找到实时数据库合并工具") raise FileNotFoundError("未找到实时数据库合并工具")
@ -442,15 +440,14 @@ def merge_real_time_db(key, merge_path: str, db_paths: [dict] or dict, real_time
# os.system(cmd) # os.system(cmd)
p = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=merge_path_base, p = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=merge_path_base,
creationflags=subprocess.CREATE_NO_WINDOW) creationflags=subprocess.CREATE_NO_WINDOW)
# p.communicate() out, err = p.communicate() # 查看返回值
# 查看返回值
out, err = p.communicate()
if out and out.decode("utf-8").find("SUCCESS") >= 0: if out and out.decode("utf-8").find("SUCCESS") >= 0:
wx_core_loger.info(f"合并实时数据库成功{out}") wx_core_loger.info(f"合并实时数据库成功{out}")
return True, merge_path return True, merge_path
if err: if err:
wx_core_loger.error(f"合并实时数据库失败\n{out}\n{err}") wx_core_loger.error(f"合并实时数据库失败\n{out}\n{err}")
return False, err return False, err
return False, "未知错误"
@wx_core_error @wx_core_error
@ -474,7 +471,8 @@ def all_merge_real_time_db(key, wx_path, merge_path: str, real_time_exe_path=Non
if not db_paths[0]: if not db_paths[0]:
return False, db_paths[1] return False, db_paths[1]
db_paths = db_paths[1] db_paths = db_paths[1]
code, ret = merge_real_time_db(key=key, merge_path=merge_path, db_paths=db_paths, real_time_exe_path=real_time_exe_path) code, ret = merge_real_time_db(key=key, merge_path=merge_path, db_paths=db_paths,
real_time_exe_path=real_time_exe_path)
if code: if code:
return True, merge_path return True, merge_path
else: else: