update

data/porter_tasks/porter_task_chenjieshen_douyin_live_record_to_hf_netdisk.json

@@ -218,19 +218,69 @@
   {
     "enable": true,
     "type": "video_format_convert",
-    "task_name": "陈杰森",
+    "task_name": "陈杰森-primary",
     "video_info_file": "data/tasks/chenjieshen_douyin_live_record_to_hf_netdisk/live_record/陈杰森/file_info.json",
-    "target_dir": "data/tasks/chenjieshen_douyin_live_record_to_hf_netdisk/live_record/陈杰森/ready_to_hf_netdisk",
+    "target_dir": "data/tasks/chenjieshen_douyin_live_record_to_hf_netdisk/live_record/陈杰森-primary/ready_to_hf_netdisk",
     "check_interval": 10,
     "remove_after_upload": true,
-    "format_pairs": [["flv", "mp4"]]
+    "remove_after_upload_delay": 3600,
+    "format_pairs": [["flv", "mp4"]],
+    "cmd_plan": "primary"
   },
   {
     "enable": true,
     "type": "file_to_hf_netdisk",
-    "task_name": "陈杰森",
-    "src_dir": "data/tasks/chenjieshen_douyin_live_record_to_hf_netdisk/live_record/陈杰森/ready_to_hf_netdisk",
-    "tgt_dir": "xianyu/customers/陈杰森/{date_str}",
+    "task_name": "陈杰森-primary",
+    "src_dir": "data/tasks/chenjieshen_douyin_live_record_to_hf_netdisk/live_record/陈杰森-primary/ready_to_hf_netdisk",
+    "tgt_dir": "xianyu/customers/陈杰森-primary/{date_str}",
+    "repo_id": "tianxing1994/hf_netdisk",
+    "check_interval": 10,
+    "key_of_credentials": "hf_miyuki_write_token",
+    "remove_after_upload": true,
+    "exclude_files": ["file_info.json"]
+  },
+  {
+    "enable": true,
+    "type": "video_format_convert",
+    "task_name": "陈杰森-secondary",
+    "video_info_file": "data/tasks/chenjieshen_douyin_live_record_to_hf_netdisk/live_record/陈杰森/file_info.json",
+    "target_dir": "data/tasks/chenjieshen_douyin_live_record_to_hf_netdisk/live_record/陈杰森-secondary/ready_to_hf_netdisk",
+    "check_interval": 10,
+    "remove_after_upload": false,
+    "remove_after_upload_delay": 1,
+    "format_pairs": [["flv", "mp4"]],
+    "cmd_plan": "secondary"
+  },
+  {
+    "enable": true,
+    "type": "file_to_hf_netdisk",
+    "task_name": "陈杰森-secondary",
+    "src_dir": "data/tasks/chenjieshen_douyin_live_record_to_hf_netdisk/live_record/陈杰森-secondary/ready_to_hf_netdisk",
+    "tgt_dir": "xianyu/customers/陈杰森-secondary/{date_str}",
+    "repo_id": "tianxing1994/hf_netdisk",
+    "check_interval": 10,
+    "key_of_credentials": "hf_miyuki_write_token",
+    "remove_after_upload": true,
+    "exclude_files": ["file_info.json"]
+  },
+  {
+    "enable": true,
+    "type": "video_format_convert",
+    "task_name": "陈杰森-tertiary",
+    "video_info_file": "data/tasks/chenjieshen_douyin_live_record_to_hf_netdisk/live_record/陈杰森/file_info.json",
+    "target_dir": "data/tasks/chenjieshen_douyin_live_record_to_hf_netdisk/live_record/陈杰森-tertiary/ready_to_hf_netdisk",
+    "check_interval": 10,
+    "remove_after_upload": false,
+    "remove_after_upload_delay": 1,
+    "format_pairs": [["flv", "mp4"]],
+    "cmd_plan": "tertiary"
+  },
+  {
+    "enable": true,
+    "type": "file_to_hf_netdisk",
+    "task_name": "陈杰森-tertiary",
+    "src_dir": "data/tasks/chenjieshen_douyin_live_record_to_hf_netdisk/live_record/陈杰森-tertiary/ready_to_hf_netdisk",
+    "tgt_dir": "xianyu/customers/陈杰森-tertiary/{date_str}",
     "repo_id": "tianxing1994/hf_netdisk",
     "check_interval": 10,
     "key_of_credentials": "hf_miyuki_write_token",

toolbox/porter/tasks/video_format_convert_task.py

@@ -20,6 +20,24 @@ from toolbox.porter.tasks.base_task import BaseTask
 from project_settings import environment, project_path, time_zone_info
 
 
+class AsyncDelayTask(object):
+    def __init__(self, delay: float, coro_or_future: Union[Coroutine, asyncio.Future]):
+        self.delay = delay
+        self.coro_or_future = coro_or_future
+
+    async def run(self):
+        await asyncio.sleep(self.delay)
+        return await self.coro_or_future
+
+
+async def remove_file(filename: str):
+    try:
+        logger.info(f"删除文件：{filename}")
+        os.remove(filename)
+    except FileNotFoundError:
+        logger.info(f"文件不存在，跳过删除：{filename}")
+
+
 @BaseTask.register("video_format_convert")
 class VideoFormatConvertTask(BaseTask):
     def __init__(self,
@@ -29,6 +47,8 @@ class VideoFormatConvertTask(BaseTask):
                  check_interval: int,
                  format_pairs: List[Tuple[str, str]],
                  remove_after_upload: bool = False,
+                 remove_after_upload_delay: float = 0.1,
+                 cmd_plan: str = "primary",
                  **kwargs
                  ):
         super().__init__(
@@ -39,6 +59,8 @@ class VideoFormatConvertTask(BaseTask):
         self.target_dir: Path = Path(target_dir)
         self.format_pairs = format_pairs
         self.remove_after_upload = remove_after_upload
+        self.remove_after_upload_delay = remove_after_upload_delay
+        self.cmd_plan = cmd_plan
 
         if not os.path.isabs(video_info_file):
             self.video_info_file = project_path / video_info_file
@@ -73,15 +95,21 @@ class VideoFormatConvertTask(BaseTask):
             # desc = v["desc"]
             # tags = v["tags"]
 
-            format_convert_output_file = v.get("format_convert_output_file")
+            format_convert_output_file = v.get(self.flag)
             if format_convert_output_file is None:
                 logger.info(f"{self.flag}视频格式转换开始：{filename}")
                 output_file = self.convert_fmt(filename)
                 if self.remove_after_upload:
-                    logger.info(f"{self.flag}删除本地文件：{filename}")
-                    os.remove(filename)
+                    logger.info(f"{self.flag}创建文件删除任务：{filename}")
+                    task = asyncio.ensure_future(
+                        AsyncDelayTask(
+                            delay=self.remove_after_upload_delay,
+                            coro_or_future=remove_file(filename)
+                        ).run()
+                    )
+                    # await task
                 logger.info(f"{self.flag}视频格式转换成功：{filename}")
-                v["format_convert_output_file"] = output_file
+                v[self.flag] = output_file
                 new_video_info[k] = v
         await self.save_video_info(new_video_info)
 
@@ -107,15 +135,46 @@ class VideoFormatConvertTask(BaseTask):
         output_file_ = input_file.parent / f"{uuid.uuid4()}{output_file.suffix}"
         os.rename(input_file.as_posix(), input_file_.as_posix())
 
-        command = [
-            "ffmpeg",
-            "-i", input_file_.as_posix(),
-            "-c:v", "copy",  # 视频流不重新编码，速度快
-            "-c:a", "aac",  # 音频流转换为 AAC（mp4 通用）
-            "-strict", "experimental",  # 某些 ffmpeg 版本需要
-            "-y",
-            output_file_.as_posix()
-        ]
+        if self.cmd_plan == "primary":
+            command = [
+                "ffmpeg",
+                "-i", input_file_.as_posix(),
+                "-c:v", "copy",  # 视频流不重新编码，速度快
+                "-c:a", "aac",  # 音频流转换为 AAC（mp4 通用）
+                "-strict", "experimental",  # 某些 ffmpeg 版本需要
+                "-y",
+                output_file_.as_posix()
+            ]
+        elif self.cmd_plan == "secondary":
+            command = [
+                "ffmpeg",
+                "-i", input_file_.as_posix(),
+                "-crf", "23", # 视频质量（18-28，数值越小质量越高，文件越大）
+                "-c:a", "aac",
+                "-b:a", "128k", # 音频比特率
+                output_file_.as_posix(),
+            ]
+        elif self.cmd_plan == "tertiary":
+            command = [
+                "ffmpeg",
+                "-i", input_file_.as_posix(),
+                "-c:v", "libx264",
+                "-crf", "28",
+                "-preset", "slow",
+                "-c:a", "aac",
+                "-b:a", "96k",
+                output_file_.as_posix(),
+            ]
+        else:
+            command = [
+                "ffmpeg",
+                "-i", input_file_.as_posix(),
+                "-c:v", "copy",  # 视频流不重新编码，速度快
+                "-c:a", "aac",  # 音频流转换为 AAC（mp4 通用）
+                "-strict", "experimental",  # 某些 ffmpeg 版本需要
+                "-y",
+                output_file_.as_posix()
+            ]
 
         try:
             subprocess.run(command, check=True)