更新douyin/douyin.py, douyin/douyin_download_ui.py, douyin/抖音短视频合集批量下载器v0.3.exe

已删除douyin/抖音短视频合集批量下载器v0.2.exe

douyin/douyin.py

@@ -19,7 +19,11 @@ def get_video_url(url, cookies):
         RENDER_DATA, = re.findall(
             r'<script id="RENDER_DATA" type="application/json">([^<>]+)</script>', res.text)
         data = json.loads(unquote(RENDER_DATA))
-        key = '8' if url.find("collection") != -1 else '34'
+        for key in data:
+            if not key.isdigit():
+                continue
+            if "aweme" in data[key] and 'detail' in data[key]['aweme']:
+                break
         try:
             detail = data[key]['aweme']['detail']
             title = detail['desc']

douyin/douyin_download_ui.py

@@ -6,17 +6,14 @@ __author__ = '小小明'
 __time__ = '2022/1/23'
 
 import os
-import re
+import subprocess as sub
 import sys
 
 import PySimpleGUI as sg
-import requests
 
-from douyin import get_video_url, download_douyin, parse_vdouyin_url
+from douyin import download_douyin, parse_vdouyin_url
 from tools import get_chrome_path
 
-import subprocess as sub
-
 sg.change_look_and_feel("Python")
 # 布局设置
 layout = [
@@ -51,7 +48,7 @@ def resource_path(relative_path):
     return os.path.join(base_path, relative_path)
 
 
-window = sg.Window('抖音短视频下载器v0.2 By 小小明', layout, icon=resource_path("./douyin.ico"))
+window = sg.Window('抖音短视频下载器v0.3 By 小小明', layout, icon=resource_path("./douyin.ico"))
 window.finalize()
 print("注意：程序依赖80以上版本的谷歌游览器！仅支持https://v.douyin.com/和https://www.douyin.com/video/开头的抖音视频下载。")
 window["save_dir"].Update(os.path.abspath("."))
@@ -64,7 +61,8 @@ while True:
         url = values["url"]
         if url.startswith("https://v.douyin.com/"):
             url = parse_vdouyin_url(url)
-        if not url.startswith("https://www.douyin.com/video/") and not url.startswith("https://www.douyin.com/collection/"):
+        if not url.startswith("https://www.douyin.com/video/") and not url.startswith(
+                "https://www.douyin.com/collection/"):
             print("视频地址无效！！！仅支持https://www.douyin.com/video/开头的抖音地址")
             continue
         window["url"].Update(url)
@@ -107,6 +105,7 @@ while True:
             print("未获取到注册表项HKEY_CLASSES_ROOT\ChromeHTML\Application，请检查本地是否已经安装谷歌游览器！！！")
             continue
         sub.Popen(f'"{chrome_path}" {values["url"]}', shell=False)
+        # sub.Popen(executable=chrome_path, args=(values["url"],), shell=False)
     elif event == "打开输出目录":
         if os.path.exists(values['save_dir']):
             save_dir = os.path.abspath(values['save_dir'])