From 665ca47b08623699606d56e424eb096a92afa9fe Mon Sep 17 00:00:00 2001
From: imgyh <1974355683@qq.com>
Date: Mon, 27 Feb 2023 10:27:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(command):=20=E4=BF=AE=E5=A4=8D=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E5=B0=81=E9=9D=A2=E9=9F=B3=E4=B9=90=E6=80=BB=E6=98=AF?=
 =?UTF-8?q?=E4=BC=9A=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TikTokCommand.py |  6 +++---
 TikTokUtils.py   | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/TikTokCommand.py b/TikTokCommand.py
index 17d72fa..95d6a2a 100644
--- a/TikTokCommand.py
+++ b/TikTokCommand.py
@@ -29,11 +29,11 @@ def argument():
     parser.add_argument("--path", "-p", help="下载保存位置",
                         type=str, required=True)
     parser.add_argument("--music", "-m", help="是否下载视频中的音乐(True/False), 默认为True",
-                        type=bool, required=False, default=True)
+                        type=Utils().str2bool, required=False, default=True)
     parser.add_argument("--cover", "-c", help="是否下载视频的封面(True/False), 默认为True, 当下载视频时有效",
-                        type=bool, required=False, default=True)
+                        type=Utils().str2bool, required=False, default=True)
     parser.add_argument("--avatar", "-a", help="是否下载作者的头像(True/False), 默认为True",
-                        type=bool, required=False, default=True)
+                        type=Utils().str2bool, required=False, default=True)
     parser.add_argument("--mode", "-M", help="link是个人主页时, 设置下载发布的作品(post)或喜欢的作品(like)或者用户所有合集(mix), 默认为post",
                         type=str, required=False, default="post")
     args = parser.parse_args()
diff --git a/TikTokUtils.py b/TikTokUtils.py
index bef4109..dc943cd 100644
--- a/TikTokUtils.py
+++ b/TikTokUtils.py
@@ -54,14 +54,24 @@ class Utils(object):
         urls = Urls()
         try:
             response = json.loads(requests.post(
-                url= urls.GET_XB_PATH, data={"param" : url}, headers=headers).text)
+                url=urls.GET_XB_PATH, data={"param": url}, headers=headers).text)
             params = response["param"]
             xb = response["X-Bogus"]
         except Exception as e:
             print('[  错误  ]:X-Bogus接口异常, 可能是访问流量高, 接口限流请稍等几分钟再次尝试')
             return
 
-        return params #, xb
+        return params  # , xb
+
+    def str2bool(self, v):
+        if isinstance(v, bool):
+            return v
+        if v.lower() in ('yes', 'true', 't', 'y', '1'):
+            return True
+        elif v.lower() in ('no', 'false', 'f', 'n', '0'):
+            return False
+        else:
+            return True
 
 
 if __name__ == "__main__":