修改通知消息

agc_assign_main.py

@@ -32,43 +32,44 @@ def video_start(user_data):
             returned_usernames_today.append(mark)
             zd_count = user_data["zd_count"]  # 生成总条数
             # 总条数
-            result = re.match(r'([^0-9]+)', mark).group()
+            result = re.match(r'([^0-9]+)', user_data_mark).group()
             all_count = AgcVidoe.get_link_gs_count(result)
             if all_count >= int(zd_count):
-                Feishu.bot('recommend', 'AGC完成通知', '今日脚本跟随视频拼接任务完成啦～', mark.split("-")[0], mark_name)
+                Feishu.bot('recommend', 'AGC完成通知', '今日脚本跟随视频拼接任务完成啦～', user_data_mark.split("-")[0], mark_name)
 
-# 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)