update

toolbox/douyin/video/download.py

@@ -89,6 +89,9 @@ class VideoDownload(DouyinClient):
             raise AssertionError(f"request failed, status_code: {response.status_code}, text: {response.text}")
         js = response.json()
         aweme_list = js["aweme_list"]
+        max_cursor = js["max_cursor"]
+        min_cursor = js["min_cursor"]
+        has_more = js["has_more"]
 
         result = list()
         for aweme in aweme_list:
@@ -146,7 +149,7 @@ class VideoDownload(DouyinClient):
                 "duration": duration,
             }
             result.append(row)
-        return result
+        return result, max_cursor
 
     async def get_video_list_by_min_date(self, sec_user_id: str, min_date: str = "2025-06-10 00:00:00"):
         #UTC时间
@@ -154,12 +157,11 @@ class VideoDownload(DouyinClient):
 
         result = list()
 
-        stop_flag = False
         max_cursor = 0
         for i in range(1000):
-            if stop_flag:
+            rows, max_cursor = await self.get_video_list_by_user_id(sec_user_id=sec_user_id, max_cursor=max_cursor, count=18)
+            if len(rows) == 0:
                 break
-            rows = await self.get_video_list_by_user_id(sec_user_id=sec_user_id, max_cursor=max_cursor, count=18)
             this_min_date_ = [
                 datetime.fromtimestamp(
                     row["create_time"],
@@ -180,10 +182,6 @@ class VideoDownload(DouyinClient):
                 tags = row["tags"]
                 duration = row["duration"]
 
-                max_cursor_ = int(create_time * 1000)
-                if max_cursor == 0 or max_cursor_ < max_cursor:
-                    max_cursor = max_cursor_
-
                 create_time_ = datetime.fromtimestamp(create_time)
 
                 if create_time_ > min_date_:

toolbox/porter/tasks/video_format_convert_task.py

@@ -65,13 +65,13 @@ class VideoFormatConvertTask(BaseTask):
 
         new_video_info = copy.deepcopy(video_info)
         for k, v in video_info.items():
-            create_time = v["create_time"]
+            # create_time = v["create_time_str"]
             filename = v["filename"]
             # url_list = v["url_list"]
             # video_id = v["video_id"]
-            title = v["title"]
-            desc = v["desc"]
-            tags = v["tags"]
+            # title = v["title"]
+            # desc = v["desc"]
+            # tags = v["tags"]
 
             format_convert_output_file = v.get("format_convert_output_file")
             if format_convert_output_file is None:

toolbox/porter/tasks/video_to_bilibili_task.py

@@ -143,12 +143,17 @@ class VideoToBilibiliTask(BaseTask):
                     logger.info(f"{self.flag}上传视频时找不到文件：{filename}")
                     continue
                 logger.info(f"{self.flag}上传视频：{filename}")
-                video_id = await asyncio.to_thread(
-                    # self.bilibili_video_manager.upload_video_draft_and_publish,
-                    self.bilibili_video_manager.upload_video_and_publish,
-                    filename=filename,
-                    metadata=metadata,
-                )
+                try:
+                    video_id = await asyncio.to_thread(
+                        # self.bilibili_video_manager.upload_video_draft_and_publish,
+                        self.bilibili_video_manager.upload_video_and_publish,
+                        filename=filename,
+                        metadata=metadata,
+                    )
+                except Exception as error:
+                    logger.info(f"{self.flag}上传视频失败; filename: {filename}, error type: {type(error)}, error text: {str(error)}")
+                    await asyncio.sleep(self.check_interval * 100)
+                    continue
                 if self.remove_after_upload:
                     logger.info(f"{self.flag}删除本地文件：{filename}")
                     os.remove(filename)

toolbox/porter/tasks/video_to_youtube_task.py

@@ -116,7 +116,7 @@ class VideoToYoutubeTask(BaseTask):
             tags = v["tags"]
 
             title_and_tags = title
-            for tag in tags:
+            for tag in list(set(tags)):
                 if len(title_and_tags) > 80:
                     title_and_tags = title_and_tags[:80]
                     break
@@ -152,11 +152,16 @@ class VideoToYoutubeTask(BaseTask):
                     continue
 
                 logger.info(f"{self.flag}上传视频：{filename}")
-                video_id = await asyncio.to_thread(
-                    youtube_video_manager.upload_video,
-                    filename=filename,
-                    metadata=video_metadata,
-                )
+                try:
+                    video_id = await asyncio.to_thread(
+                        youtube_video_manager.upload_video,
+                        filename=filename,
+                        metadata=video_metadata,
+                    )
+                except Exception as error:
+                    logger.info(f"{self.flag}上传视频失败; filename: {filename}, error type: {type(error)}, error text: {str(error)}")
+                    await asyncio.sleep(self.check_interval * 100)
+                    continue
                 if self.playlist_id is not None:
                     logger.info(f"{self.flag}将视频添加至播放列表：{self.playlist_title}，{self.playlist_id}")
                     await asyncio.to_thread(