From 9b2c7c6617f554d30e238e14a8b3cc74b96b19cd Mon Sep 17 00:00:00 2001
From: xaoyaoo <xaoyaoo@qq.com>
Date: Mon, 11 Dec 2023 18:56:04 +0800
Subject: [PATCH] =?UTF-8?q?merge=20=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/CHANGELOG.md |  6 ++++++
 pywxdump/cli.py  | 11 ++---------
 setup.py         |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
index 9bd8b9b..8a631da 100644
--- a/doc/CHANGELOG.md
+++ b/doc/CHANGELOG.md
@@ -1,5 +1,11 @@
 # 更新日志
 
+## v2.3.8 (2023-12-11)
+
+### 优化
+
+- merge 参数修改
+
 ## v2.3.7 (2023-12-11)
 
 ### 优化
diff --git a/pywxdump/cli.py b/pywxdump/cli.py
index ce421ce..873ac44 100644
--- a/pywxdump/cli.py
+++ b/pywxdump/cli.py
@@ -135,7 +135,6 @@ class MainMerge():
         sb_merge.add_argument("-o", "--out_path", type=str, default=os.path.join(os.getcwd(), "decrypted"),
                               help="输出路径(目录或文件名)[默认为当前路径下decrypted文件夹下merge_***.db]", required=False,
                               metavar="")
-        sb_merge.add_argument("-t", "--dbtype", type=str, help="数据库类型(可选值)：[msg,media]", required=False, metavar="")
         return sb_merge
 
     def run(self, args):
@@ -156,15 +155,9 @@ class MainMerge():
 
         print(f"[*] 合并中...（用时较久，耐心等待）")
 
-        if dbtype == "msg":
-            result = merge_db(db_path, out_path)
-        elif dbtype == "media":
-            result = merge_db(db_path, out_path)
-        else:
-            print(f"[-] 未知数据库类型：{dbtype}")
-            return
-        print(f"[+] 合并完成：{result}")
+        result = merge_db(db_path, out_path)
 
+        print(f"[+] 合并完成：{result}")
         return result
 
 
diff --git a/setup.py b/setup.py
index 0fbcc23..28d59b3 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
-version = "2.3.7"
+version = "2.3.8"
 
 install_requires = [
     "psutil",