zhangyong 1 år sedan
förälder
incheckning
5ddb12de0c
2 ändrade filer med 7 tillägg och 3 borttagningar
  1. 5 1
      agc_assign_main.py
  2. 2 2
      video_agc/agc_video_method.py

+ 5 - 1
agc_assign_main.py

@@ -10,18 +10,22 @@ returned_usernames_today = []
 def video_start(user_data):
     global returned_usernames_today
     user_data_mark = user_data["mark"]
+    video_call = user_data["video_call"]
     # 开始准备执行生成视频脚本
     if user_data_mark is not None and user_data_mark in returned_usernames_today:
         Common.logger("video").info(f"视频脚本参数中的用户名 {user_data_mark} 今天已经返回过,不再启动线程。今天已经返回的用户名:{returned_usernames_today}")
         print(f"视频脚本参数中的用户名 {user_data_mark} 今天已经返回过,不再启动线程。")
         return  # 如果返回了某个用户名,并且今天已经返回过,则不启动线程
+    if video_call is not None and video_call in returned_usernames_today:
+        print(f"视频脚本参数中的脚本{user_data_mark} 今天已经返回过,不再启动线程。")
+        return  # 如果返回了某个用户名,并且今天已经返回过,则不启动线程
     else:
         print(f"视频脚本参数{user_data}")
         mark = AgcVidoe.video_gs_stitching(user_data)
         print(f"返回用户名{mark}")
         if mark:
             Common.logger("video").info(f"返回用户名{mark}")
-            returned_usernames_today.append(user_data_mark)
+            returned_usernames_today.append(mark)
 
 # gs_name_list = Material.feishu_gs_list()
 # video_start(gs_name_list[0])

+ 2 - 2
video_agc/agc_video_method.py

@@ -529,7 +529,7 @@ class AgcVidoe():
                 platform = 'douyin'
             zw_count = cls.get_link_zw_count(mark, "zhannei")
             if zw_count >= int(count):
-                return
+                return video_call
             # 获取所有视频素材ID
             video_list = Material.get_user_id(feishu_id, platform_url)
             limit_count = 35
@@ -537,7 +537,7 @@ class AgcVidoe():
             platform = 'zhannei'
             zw_count = cls.get_link_zn_count(mark, platform)
             if zw_count >= int(count):
-                return
+                return video_call
             limit_count = 1
         url_list = cls.get_url_list(video_list, mark, limit_count)
         if url_list == None: