diff --git a/TikTok.py b/TikTok.py index c258ac0..89cf807 100644 --- a/TikTok.py +++ b/TikTok.py @@ -95,7 +95,7 @@ class TikTok(object): # https://www.douyin.com/collection/7093490319085307918 urlstr = str(r.request.path_url) - if "/share/user/" in urlstr: + if "/user/" in urlstr: # 获取用户 sec_uid if '?' in r.request.path_url: for one in re.finditer(r'user\/([\d\D]*)([?])', str(r.request.path_url)): @@ -104,7 +104,7 @@ class TikTok(object): for one in re.finditer(r'user\/([\d\D]*)', str(r.request.path_url)): key = one.group(1) key_type = "user" - elif "/share/video/" in urlstr: + elif "/video/" in urlstr: # 获取作品 aweme_id key = re.findall('video/(\d+)?', urlstr)[0] key_type = "aweme" @@ -112,9 +112,13 @@ class TikTok(object): # 获取note aweme_id key = re.findall('note/(\d+)?', urlstr)[0] key_type = "aweme" - elif "/share/mix/detail/" in urlstr: + elif "/mix/detail/" in urlstr: # 获取合集 id - key = re.findall('/share/mix/detail/(\d+)?', urlstr)[0] + key = re.findall('/mix/detail/(\d+)?', urlstr)[0] + key_type = "mix" + elif "/collection/" in urlstr: + # 获取合集 id + key = re.findall('/collection/(\d+)?', urlstr)[0] key_type = "mix" elif "/music/" in urlstr: # 获取原声 id diff --git a/TikTokCommand.py b/TikTokCommand.py index b44f84f..358886c 100644 --- a/TikTokCommand.py +++ b/TikTokCommand.py @@ -23,7 +23,7 @@ from TikTokUtils import Utils def argument(): parser = argparse.ArgumentParser(description='抖音批量下载工具 使用帮助') parser.add_argument("--link", "-l", - help="作品(视频或图集)、直播、合集、音乐集合、个人主页抖音分享链接(删除文案, 保证只有URL, https://v.douyin.com/kcvMpuN/)", + help="作品(视频或图集)、直播、合集、音乐集合、个人主页的分享链接或者电脑浏览器网址(删除文案, 保证只有URL, https://v.douyin.com/kcvMpuN/ 或者 https://www.douyin.com/开头的)", type=str, required=True) parser.add_argument("--path", "-p", help="下载保存位置", type=str, required=True)