zhangyong 5 months ago
parent
commit
75219856b1
7 changed files with 24 additions and 19 deletions
  1. 1 1
      Dockerfile
  2. 6 5
      carry_data_handle.py
  3. 2 1
      carry_video/carry_video.py
  4. 1 3
      common/download_video.py
  5. 2 2
      common/ffmpeg.py
  6. 7 7
      docker-compose.yml
  7. 5 0
      entrypoint.sh

+ 1 - 1
Dockerfile

@@ -6,7 +6,7 @@ COPY . .
 
 ENV TZ=Asia/Shanghai
 
-RUN apt update && apt --no-install-recommends install -y wget xz-utils libgl-dev libglib2.0-dev fonts-wqy-zenhei \
+RUN apt update && apt --no-install-recommends install -y wget xz-utils nscd libgl-dev libglib2.0-dev fonts-wqy-zenhei \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && pip install -r requirements.txt --no-cache-dir \
     && wget -O /tmp/ffmpeg-6.0.1-amd64-static.tar.xz https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-6.0.1-amd64-static.tar.xz \

+ 6 - 5
carry_data_handle.py

@@ -39,6 +39,7 @@ def video_task_start():
                 except Exception as e:
                     logger.error(f"删除文件时出错: {file_path}, 错误: {e}")
     except Exception as e:
+        data = json.loads(data)
         text = (
             f"**负责人**: {data['name']}\n"
             f"**内容**: {data}\n"
@@ -55,8 +56,8 @@ def schedule_tasks():
     schedule.every(4).minutes.do(video_task_start)
 
 if __name__ == '__main__':
-    schedule_tasks()  # 调用任务调度函数
-    while True:
-        schedule.run_pending()
-        time.sleep(1)  # 每秒钟检查一次
-    # video_task_start()
+    # schedule_tasks()  # 调用任务调度函数
+    # while True:
+    #     schedule.run_pending()
+    #     time.sleep(1)  # 每秒钟检查一次
+    video_task_start()

+ 2 - 1
carry_video/carry_video.py

@@ -267,7 +267,8 @@ class CarryViode:
                                       "【 搬运&改造效率工具失败通知 】")
                     return
                 pw_video_list = [video_path, pw_path]
-                video_path = FFmpeg.concatenate_videos(pw_video_list, video_path)  # 视频与片尾拼接到一起
+                logger.info(f"[+] {REDIS_NAME}的{data}数据合并开始拼接")
+                video_path = FFmpeg.concatenate_videos(pw_video_list, file_path)  # 视频与片尾拼接到一起
                 if not video_path:
                     logger.error(f"[+] {REDIS_NAME}的{data}数据合并拼接失败")
                     AliyunLogger.logging(data["name"], "效率工具",data["tag_transport_channel"], data["video_url"],

+ 1 - 3
common/download_video.py

@@ -19,9 +19,7 @@ class DownLoad:
                 "-bsf:a", "aac_adtstoasc",  # 转换 AAC 音频格式
                 video  # 输出文件
             ]
-
-            # 使用 subprocess 运行命令
-            subprocess.run(ffmpeg_cmd_oss, capture_output=True, text=True)
+            subprocess.run(ffmpeg_cmd_oss)
             return video
         else:
             try:

+ 2 - 2
common/ffmpeg.py

@@ -3,6 +3,7 @@ import subprocess
 import time
 
 import cv2
+from loguru import logger
 from mutagen.mp3 import MP3
 
 
@@ -306,12 +307,11 @@ class FFmpeg():
         try:
             result = subprocess.run(ffmpeg_cmd, capture_output=True, text=True)
             if result.returncode != 0:
-                print("ffmpeg 错误信息:", result.stderr)
                 return None
             else:
                 return concatenate_videos_url
         except Exception as e:
-            print("处理视频时出现异常:", e)
+            logger.error(f"[+] 视频合并失败,失败信息{e}")
             return None
 
     """

+ 7 - 7
docker-compose.yml

@@ -114,7 +114,7 @@ services:
 #      - "./carry_data_handle.py:/app/carry_data_handle.py"
     networks:
       - carry_net
-    entrypoint: "python /app/carry_data_handle.py"
+    entrypoint: "./entrypoint.sh"
   worker9:
     depends_on:
       - worker1
@@ -129,7 +129,7 @@ services:
       - REDIS_NAME=task:carry_data_redis_lt
     networks:
       - carry_net
-    entrypoint: "python /app/carry_data_handle.py"
+    entrypoint: "./entrypoint.sh"
   worker10:
     depends_on:
       - worker1
@@ -144,7 +144,7 @@ services:
       - REDIS_NAME=task:carry_data_redis_yht
     networks:
       - carry_net
-    entrypoint: "python /app/carry_data_handle.py"
+    entrypoint: "./entrypoint.sh"
   worker11:
     depends_on:
       - worker1
@@ -159,7 +159,7 @@ services:
       - REDIS_NAME=task:carry_data_redis_lq
     networks:
       - carry_net
-    entrypoint: "python /app/carry_data_handle.py"
+    entrypoint: "./entrypoint.sh"
   worker12:
     depends_on:
       - worker1
@@ -174,7 +174,7 @@ services:
       - REDIS_NAME=task:carry_data_redis_lsy
     networks:
       - carry_net
-    entrypoint: "python /app/carry_data_handle.py"
+    entrypoint: "./entrypoint.sh"
   worker13:
     depends_on:
       - worker1
@@ -189,7 +189,7 @@ services:
       - REDIS_NAME=task:carry_data_redis_zf
     networks:
       - carry_net
-    entrypoint: "python /app/carry_data_handle.py"
+    entrypoint: "./entrypoint.sh"
   worker14:
     depends_on:
       - worker1
@@ -204,7 +204,7 @@ services:
       - REDIS_NAME=task:carry_data_redis_zxq
     networks:
       - carry_net
-    entrypoint: "python /app/carry_data_handle.py"
+    entrypoint: "./entrypoint.sh"
 networks:
   carry_net:
     name: carry_net

+ 5 - 0
entrypoint.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+service nscd start
+
+python /app/carry_data_handle.py