update

toolbox/douyin/video/download.py

@@ -100,7 +100,7 @@ class VideoDownload(DouyinClient):
 
             # video
             video = aweme["video"]
-            video_url_list = video["play_addr"]["url_list"]
+            url_list = video["play_addr"]["url_list"]
 
             # tags
             text_extra = aweme["text_extra"]
@@ -128,7 +128,7 @@ class VideoDownload(DouyinClient):
                 "create_time_str": create_time_str,
                 "title": title,
                 "desc": desc,
-                "video_url_list": video_url_list,
+                "url_list": url_list,
                 "tags": tags,
             }
             result.append(row)
@@ -154,7 +154,7 @@ class VideoDownload(DouyinClient):
                 create_time_str = row["create_time_str"]
                 title = row["title"]
                 desc = row["desc"]
-                video_url_list = row["video_url_list"]
+                url_list = row["url_list"]
                 tags = row["tags"]
 
                 max_cursor_ = int(create_time * 1000)
@@ -169,7 +169,7 @@ class VideoDownload(DouyinClient):
                         "create_time_str": create_time_str,
                         "title": title,
                         "desc": desc,
-                        "video_url_list": video_url_list,
+                        "url_list": url_list,
                         "tags": tags,
                     }
                     result.append(task)

toolbox/porter/tasks/douyin_live_record_task.py

@@ -244,7 +244,7 @@ class DouyinLiveRecordTask(BaseTask):
             "title": title,
             "desc": "",
             "tags": tags,
-            "url": live_url,
+            "url_list": ["live_url"],
 
             "video_id": video_id,
         }

toolbox/porter/tasks/douyin_video_download_task.py

@@ -57,7 +57,7 @@ class DouyinVideoDownloadTask(BaseTask):
             credentials_info=credentials_info
         )
 
-    async def save_downloaded_video_info(self, create_time: str, filename: Path, video_url_list: List[str], video_id: str, title: str, desc: str, tags: List[str]) -> str:
+    async def save_downloaded_video_info(self, create_time: str, filename: Path, url_list: List[str], video_id: str, title: str, desc: str, tags: List[str]) -> str:
         video_info = await self.load_downloaded_video_info()
         video_info[video_id] = {
             "create_time": create_time,
@@ -65,7 +65,7 @@ class DouyinVideoDownloadTask(BaseTask):
             "title": title,
             "desc": desc,
             "tags": tags,
-            "video_url_list": video_url_list,
+            "url_list": url_list,
             "video_id": video_id,
         }
         async with aiofiles.open(self.output_video_info_file.as_posix(), "w", encoding="utf-8") as f:
@@ -119,9 +119,9 @@ class DouyinVideoDownloadTask(BaseTask):
             create_time_str = new_video["create_time_str"]
             title = new_video["title"]
             desc = new_video["desc"]
-            video_url_list = new_video["video_url_list"]
+            url_list = new_video["url_list"]
             tags = new_video["tags"]
-            video_url = random.sample(video_url_list, k=1)[0]
+            video_url = random.sample(url_list, k=1)[0]
 
             downloaded_video_aweme_id_set = await self.get_downloaded_video_aweme_id_set()
             if aweme_id in downloaded_video_aweme_id_set:
@@ -145,7 +145,7 @@ class DouyinVideoDownloadTask(BaseTask):
                 except Exception as e:
                     logger.error(f"download video failed; error type: {type(e)}, error text: {str(e)}, url: {video_url}")
                     continue
-                await self.save_downloaded_video_info(create_time_str, filename, video_url_list, aweme_id, title, desc, tags)
+                await self.save_downloaded_video_info(create_time_str, filename, url_list, aweme_id, title, desc, tags)
 
     async def do_task(self):
         await self.download_new_video_list_by_min_date(self.min_date)

toolbox/porter/tasks/video_to_bilibili_task.py

@@ -97,7 +97,7 @@ class VideoToBilibiliTask(BaseTask):
         for k, v in video_info.items():
             create_time = v["create_time"]
             filename = v["filename"]
-            # video_url_list = v["video_url_list"]
+            # url_list = v["url_list"]
             # video_id = v["video_id"]
             title = v["title"]
             desc = v["desc"]

toolbox/porter/tasks/video_to_youtube_task.py

@@ -102,7 +102,7 @@ class VideoToYoutubeTask(BaseTask):
         for k, v in video_info.items():
             create_time = v["create_time"]
             filename = v["filename"]
-            # url = v["url"]
+            # url_list = v["url_list"]
             # video_id = v["video_id"]
             title = v["title"]
             desc = v["desc"]