From a7571f614e3529ca52cbe576257c4ad931041723 Mon Sep 17 00:00:00 2001
From: xaoyaoo <xaoyaoo@qq.com>
Date: Fri, 19 Apr 2024 17:33:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=95=B0=E6=8D=AE=E5=BA=93=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pywxdump/api/api.py          | 38 ++++++++++++++++++------------------
 pywxdump/wx_info/merge_db.py |  9 ++++++++-
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/pywxdump/api/api.py b/pywxdump/api/api.py
index efa04cc..386097f 100644
--- a/pywxdump/api/api.py
+++ b/pywxdump/api/api.py
@@ -636,6 +636,25 @@ def get_wxinfo():
     return ReJson(0, wxinfos)
 
 
+@api.route('/api/biasaddr', methods=["GET", 'POST'])
+@error9999
+def biasaddr():
+    """
+    BiasAddr
+    :return:
+    """
+    mobile = request.json.get("mobile")
+    name = request.json.get("name")
+    account = request.json.get("account")
+    key = request.json.get("key", "")
+    wxdbPath = request.json.get("wxdbPath", "")
+    if not mobile or not name or not account:
+        return ReJson(1002)
+    pythoncom.CoInitialize()
+    rdata = BiasAddr(account, mobile, name, key, wxdbPath).run()
+    return ReJson(0, str(rdata))
+
+
 @api.route('/api/decrypt', methods=["GET", 'POST'])
 @error9999
 def decrypt():
@@ -656,25 +675,6 @@ def decrypt():
     return ReJson(0, str(wxinfos))
 
 
-@api.route('/api/biasaddr', methods=["GET", 'POST'])
-@error9999
-def biasaddr():
-    """
-    BiasAddr
-    :return:
-    """
-    mobile = request.json.get("mobile")
-    name = request.json.get("name")
-    account = request.json.get("account")
-    key = request.json.get("key", "")
-    wxdbPath = request.json.get("wxdbPath", "")
-    if not mobile or not name or not account:
-        return ReJson(1002)
-    pythoncom.CoInitialize()
-    rdata = BiasAddr(account, mobile, name, key, wxdbPath).run()
-    return ReJson(0, str(rdata))
-
-
 @api.route('/api/merge', methods=["GET", 'POST'])
 @error9999
 def merge():
diff --git a/pywxdump/wx_info/merge_db.py b/pywxdump/wx_info/merge_db.py
index 7a6e505..62ac6f7 100644
--- a/pywxdump/wx_info/merge_db.py
+++ b/pywxdump/wx_info/merge_db.py
@@ -216,7 +216,14 @@ def merge_db(db_paths, save_path="merge.db", CreateTime: int = 0, endCreateTime:
         # alias, file_path
         databases = {f"MSG{i}": db_path for i, db_path in enumerate(db_paths)}
     elif isinstance(db_paths, str):
-        databases = {"MSG": db_paths}
+        # 判断是否是文件or文件夹
+        if os.path.isdir(db_paths):
+            db_paths = [os.path.join(db_paths, i) for i in os.listdir(db_paths) if i.endswith(".db")]
+            databases = {f"MSG{i}": db_path for i, db_path in enumerate(db_paths)}
+        elif os.path.isfile(db_paths):
+            databases = {"MSG": db_paths}
+        else:
+            raise FileNotFoundError("db_paths 不存在")
     else:
         raise TypeError("db_paths 类型错误")