merge命令错误修复

doc/CHANGELOG.md

@@ -1,5 +1,12 @@
 # 更新日志
 
+## v2.3.4 (2023-12-09)
+
+### 优化
+
+- 修复部分bug
+- merge命令错误修复
+
 ## v2.3.3 (2023-12-08)
 
 ### 新功能

pywxdump/cli.py

@@ -134,7 +134,7 @@ class MainMerge():
         sb_merge.add_argument("-t", "--dbtype", type=str, help="数据库类型(可选值)：[msg,media]", required=True, metavar="")
         sb_merge.add_argument("-i", "--db_path", type=str, help="数据库路径(文件路径，使用英文[,]分割)", required=True, metavar="")
         sb_merge.add_argument("-o", "--out_path", type=str, default=os.path.join(os.getcwd(), "decrypted"),
-                              help="输出路径(必须是目录)[默认为当前路径下decrypted文件夹]", required=False,
+                              help="输出路径(目录或文件名)[默认为当前路径下decrypted文件夹下merge_***.db]", required=False,
                               metavar="")
         return sb_merge
 

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.3"
+version = "2.3.4"
 
 install_requires = [
     "psutil",