zhangyong 1 rok temu
rodzic
commit
482698faab
2 zmienionych plików z 36 dodań i 34 usunięć
  1. 33 33
      agc_assign_main.py
  2. 3 1
      video_agc/agc_video_method.py

+ 33 - 33
agc_assign_main.py

@@ -27,38 +27,38 @@ def video_start(user_data):
             Common.logger("video").info(f"返回用户名{mark}")
             Common.logger("video").info(f"返回用户名{mark}")
             returned_usernames_today.append(mark)
             returned_usernames_today.append(mark)
 
 
-gs_name_list = Material.feishu_gs_list()
-video_start(gs_name_list[0])
+# gs_name_list = Material.feishu_gs_list()
+# video_start(gs_name_list[0])
 
 
 
 
-# def clear_returned_usernames():
-#     returned_usernames_today.clear()
-#     print("returned_usernames_today 已清空")
-#
-# # 定义定时任务
-# def video_task():
-#     print("开始执行生成视频脚.")
-#     data = Material.feishu_gs_list()
-#     # 创建一个线程池
-#     with concurrent.futures.ThreadPoolExecutor() as executor:
-#         futures = [executor.submit(video_start, user_data) for user_data in data]
-#         # 等待所有任务执行完成
-#         for future in concurrent.futures.as_completed(futures):
-#             try:
-#                 # 获取每个任务的执行结果
-#                 result = future.result()
-#                 print("处理结果:", result)
-#             except Exception as e:
-#                 print("处理任务时出现异常:", e)
-#     print("执行生成视频脚结束")
-#
-# # 每天0点10清空集合
-# schedule.every().day.at("00:05").do(clear_returned_usernames)
-#
-# #每10分钟执行次脚本
-# schedule.every(10).minutes.do(video_task)
-#
-#
-# while True:
-#     schedule.run_pending()
-#     time.sleep(1)
+def clear_returned_usernames():
+    returned_usernames_today.clear()
+    print("returned_usernames_today 已清空")
+
+# 定义定时任务
+def video_task():
+    print("开始执行生成视频脚.")
+    data = Material.feishu_gs_list()
+    # 创建一个线程池
+    with concurrent.futures.ThreadPoolExecutor() as executor:
+        futures = [executor.submit(video_start, user_data) for user_data in data]
+        # 等待所有任务执行完成
+        for future in concurrent.futures.as_completed(futures):
+            try:
+                # 获取每个任务的执行结果
+                result = future.result()
+                print("处理结果:", result)
+            except Exception as e:
+                print("处理任务时出现异常:", e)
+    print("执行生成视频脚结束")
+
+# 每天0点10清空集合
+schedule.every().day.at("00:05").do(clear_returned_usernames)
+
+#每10分钟执行次脚本
+schedule.every(10).minutes.do(video_task)
+
+
+while True:
+    schedule.run_pending()
+    time.sleep(1)

+ 3 - 1
video_agc/agc_video_method.py

@@ -642,7 +642,9 @@ class AgcVidoe():
                 if os.path.isfile(s_path):
                 if os.path.isfile(s_path):
                     os.remove(s_path)
                     os.remove(s_path)
                     # 清空所有mp4数据
                     # 清空所有mp4数据
-                cls.clear_mp4_files(video_path_url)
+                for file_path in videos:
+                    os.remove(file_path[3])
+                    print(f"已删除文件:{file_path[3]}")
             return ''
             return ''
         except Exception as e:
         except Exception as e:
             Common.logger("gs_video").warning(f"{mark}的视频拼接失败:{e}\n")
             Common.logger("gs_video").warning(f"{mark}的视频拼接失败:{e}\n")