zhangyong 1 năm trước cách đây
mục cha
commit
18e6791d65

+ 39 - 43
data_main.py

@@ -15,48 +15,44 @@ def kuaishou_start(user_data):
     print(f"执行快手数据抓取{user_data}")
     kuaishouAuthor.get_kuaishou_videoList(user_data)
 
+# 定义定时任务
+def douyin_task():
+    data = Material.get_all_user("douyin")
+    # 创建一个线程池
+    with concurrent.futures.ThreadPoolExecutor() as executor:
+        futures = [executor.submit(douyin_start, user_data) for user_data in data]
+        # 等待所有任务执行完成
+        for future in concurrent.futures.as_completed(futures):
+            # 获取每个任务的执行结果
+            result = future.result()
+            print("处理结果:", result)
+    print("抖音数据抓取定时任务执行完成")
 
-data = Material.get_all_user("kuaishou")
-kuaishou_start(data[5])
-
-# # 定义定时任务
-# def douyin_task():
-#     data = Material.get_all_user("douyin")
-#     # 创建一个线程池
-#     with concurrent.futures.ThreadPoolExecutor() as executor:
-#         futures = [executor.submit(douyin_start, user_data) for user_data in data]
-#         # 等待所有任务执行完成
-#         for future in concurrent.futures.as_completed(futures):
-#             # 获取每个任务的执行结果
-#             result = future.result()
-#             print("处理结果:", result)
-#     print("抖音数据抓取定时任务执行完成")
-#
-#
-# # 定义定时任务
-# def kuanshou_task():
-#     data = Material.get_all_user("kuaishou")
-#     # 创建一个线程池
-#     with concurrent.futures.ThreadPoolExecutor() as executor:
-#         futures = [executor.submit(kuaishou_start, user_data) for user_data in data]
-#         # 等待所有任务执行完成
-#         for future in concurrent.futures.as_completed(futures):
-#             # 获取每个任务的执行结果
-#             result = future.result()
-#             print("处理结果:", result)
-#     print("快手数据抓取定时任务执行完成.")
-#
-#
-# # schedule.every(2).minutes.do(douyin_task)
-# #
-# # schedule.every(2).minutes.do(kuanshou_task)
-# schedule.every(8).hours.do(douyin_task)
-#
-# schedule.every(8).hours.do(kuanshou_task)
-#
-# # 持续运行,直到手动终止
-# while True:
-#     schedule.run_pending()
-#     time.sleep(1)
-#
+
+# 定义定时任务
+def kuanshou_task():
+    data = Material.get_all_user("kuaishou")
+    # 创建一个线程池
+    with concurrent.futures.ThreadPoolExecutor() as executor:
+        futures = [executor.submit(kuaishou_start, user_data) for user_data in data]
+        # 等待所有任务执行完成
+        for future in concurrent.futures.as_completed(futures):
+            # 获取每个任务的执行结果
+            result = future.result()
+            print("处理结果:", result)
+    print("快手数据抓取定时任务执行完成.")
+
+
+# schedule.every(2).minutes.do(douyin_task)
 #
+# schedule.every(2).minutes.do(kuanshou_task)
+schedule.every(8).hours.do(douyin_task)
+
+schedule.every(8).hours.do(kuanshou_task)
+
+# 持续运行,直到手动终止
+while True:
+    schedule.run_pending()
+    time.sleep(1)
+
+

+ 1 - 1
extract_data/douyin/douyin_author.py

@@ -150,7 +150,7 @@ class douyinAuthor():
                                     if count > 5:
                                         Common.logger("douyin").info(
                                             f"重复视频不在抓取该用户,用户主页id:{account_id}")
-                                        break
+                                        return
                                     continue
                                 video_url = data[j].get('video').get('play_addr').get('url_list')[0]  # 视频链接
 

+ 1 - 1
extract_data/kuaishou/kuaishou_author.py

@@ -142,7 +142,7 @@ class kuaishouAuthor():
                                 if count > 5:
                                     Common.logger("kuaishou").info(
                                         f"重复视频不在抓取该用户,用户主页id:{account_id}")
-                                    break
+                                    return
                                 continue
                             channel_name = mark+'/kuaishou'
                             oss_object_key = Oss.video_sync_upload_oss(video_url, video_id, account_id, channel_name)

+ 1 - 2
video_agc/agc_video_method.py

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