zhangyong vor 1 Jahr
Ursprung
Commit
c2350bcb75
2 geänderte Dateien mit 46 neuen und 44 gelöschten Zeilen
  1. 43 43
      agc_main.py
  2. 3 1
      video_agc/agc_video_method.py

+ 43 - 43
agc_main.py

@@ -25,49 +25,49 @@ def video_start(user_data):
             Common.logger("video").info(f"返回用户名{mark}")
             returned_usernames_today.append(user_data_mark)
 
-# name_list = Material.feishu_list()
-# video_start(name_list[4])
-
-def job_feishu_bot():
-    name_list = Material.feishu_name()
-    count_list = sqlHelp.get_count_list(name_list)
-    Feishu.bot('recommend', 'AGC视频', f'{"".join(count_list)}', 'all', '所有人')
-    print("机器人通知完成")
-
-def clear_returned_usernames():
-    returned_usernames_today.clear()
-    print("returned_usernames_today 已清空")
-
-# 定义定时任务
-def video_task():
-    print("开始执行生成视频脚.")
-    data = Material.feishu_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):
-            # 获取每个任务的执行结果
-            result = future.result()
-            print("处理结果:", result)
-    print("执行生成视频脚结束")
-
-
-# 每天0点10清空集合
-schedule.every().day.at("00:10").do(clear_returned_usernames)
-
-#每10分钟执行次脚本
-schedule.every(10).minutes.do(video_task)
-
-
-
-
-# 每天下午1:30执行任务
-schedule.every().day.at("15:00").do(job_feishu_bot)
-
-while True:
-    schedule.run_pending()
-    time.sleep(1)
+name_list = Material.feishu_list()
+video_start(name_list[5])
+
+# def job_feishu_bot():
+#     name_list = Material.feishu_name()
+#     count_list = sqlHelp.get_count_list(name_list)
+#     Feishu.bot('recommend', 'AGC视频', f'{"".join(count_list)}', 'all', '所有人')
+#     print("机器人通知完成")
+#
+# def clear_returned_usernames():
+#     returned_usernames_today.clear()
+#     print("returned_usernames_today 已清空")
+#
+# # 定义定时任务
+# def video_task():
+#     print("开始执行生成视频脚.")
+#     data = Material.feishu_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):
+#             # 获取每个任务的执行结果
+#             result = future.result()
+#             print("处理结果:", result)
+#     print("执行生成视频脚结束")
+#
+#
+# # 每天0点10清空集合
+# schedule.every().day.at("00:10").do(clear_returned_usernames)
+#
+# #每10分钟执行次脚本
+# schedule.every(10).minutes.do(video_task)
+#
+#
+#
+#
+# # 每天下午1:30执行任务
+# schedule.every().day.at("15:00").do(job_feishu_bot)
+#
+# while True:
+#     schedule.run_pending()
+#     time.sleep(1)
 
 # list = Material.feishu_list()
 # AgcVidoe.video_stitching(list)

+ 3 - 1
video_agc/agc_video_method.py

@@ -243,7 +243,9 @@ class AgcVidoe():
             subtitle_cmd = f"subtitles={s_path}:force_style='Fontsize=12,Fontname=wqy-zenhei,Bold=1,Outline=0,PrimaryColour=&H000000,SecondaryColour=&H000000'"
         else:
             # subtitle_cmd = "drawtext=text='分享、转发给群友':fontsize=28:fontcolor=black:x=(w-text_w)/2:y=h-text_h-15"
-            subtitle_cmd = f"subtitles='text:分享、转发给群友':force_style='Fontsize=18,Fontname=wqy-zenhei,Bold=1,Outline=0,PrimaryColour=&H000000,SecondaryColour=&H000000'"
+            subtitle_cmd =  "drawtext=text='分享、转发给群友':x=(w-text_w)/2:y=h-text_h-15:fontsize=28:fontcolor=black:fontfile=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttc"
+
+
         # 背景色参数
         background_cmd = "drawbox=y=ih-65:color=yellow@1.0:width=iw:height=0:t=fill"
         # 分辨率参数