zhangyong 9 months ago
parent
commit
98a73f2480
2 changed files with 12 additions and 10 deletions
  1. 11 9
      channel_ks/ks_feed_list.py
  2. 1 1
      common/sql_help.py

+ 11 - 9
channel_ks/ks_feed_list.py

@@ -258,22 +258,24 @@ class KsFeedVideo:
                     main_mv_url = feed["main_mv_url"]  # 视频链接
                     main_mv_url = feed["main_mv_url"]  # 视频链接
                     thumbnail_url = feed["thumbnail_url"]  # 视频封面
                     thumbnail_url = feed["thumbnail_url"]  # 视频封面
                     user_id = feed["user_id"]  # 用户id非用户主页id
                     user_id = feed["user_id"]  # 用户id非用户主页id
-                    time_status = cls.get_video_data(time_data)
-                    if time_status:
-                        sqlCollect.insert_ks_data(user_name, user_sex, time_data, caption, view_count, like_count, share_count, duration, main_mv_url, thumbnail_url, user_id, '1', photo_id, category_name, age=None, oss_object=None, video_uid=None)
-                        continue
-                    video_percent = '%.2f' % (share_count / view_count)
-                    special = float(0.1)
-                    if float(video_percent) < special or share_count < 500 or duration < 10 or duration > 600:
-                        sqlCollect.insert_ks_data(user_name, user_sex, time_data, caption, view_count, like_count, share_count, duration, main_mv_url, thumbnail_url, user_id, '1', photo_id, category_name, age=None, oss_object=None, video_uid=None)
-                        continue
+                    # time_status = cls.get_video_data(time_data)
+                    # if time_status:
+                    #     sqlCollect.insert_ks_data(user_name, user_sex, time_data, caption, view_count, like_count, share_count, duration, main_mv_url, thumbnail_url, user_id, '1', photo_id, category_name, age=None, oss_object=None, video_uid=None)
+                    #     continue
                     value, age = cls.analyze_photo(photo_id)
                     value, age = cls.analyze_photo(photo_id)
+
                     if value:
                     if value:
                         sqlCollect.insert_ks_data(user_name, user_sex, time_data, caption, view_count, like_count,
                         sqlCollect.insert_ks_data(user_name, user_sex, time_data, caption, view_count, like_count,
                                                   share_count, duration, main_mv_url, thumbnail_url, user_id, '1',
                                                   share_count, duration, main_mv_url, thumbnail_url, user_id, '1',
                                                   photo_id, category_name, age, oss_object=None, video_uid=None)
                                                   photo_id, category_name, age, oss_object=None, video_uid=None)
 
 
                         continue
                         continue
+                    video_percent = '%.2f' % (share_count / view_count)
+                    special = float(0.1)
+                    if float(video_percent) < special or share_count < 500 or duration < 30 or duration > 600:
+                        sqlCollect.insert_ks_data(user_name, user_sex, time_data, caption, view_count, like_count, share_count, duration, main_mv_url, thumbnail_url, user_id, '1', photo_id, category_name, age, oss_object=None, video_uid=None)
+                        continue
+
                     oss_object_key = Oss.channel_upload_oss(main_mv_url, photo_id)
                     oss_object_key = Oss.channel_upload_oss(main_mv_url, photo_id)
                     time.sleep(2)
                     time.sleep(2)
                     oss_object = oss_object_key.get("oss_object_key")
                     oss_object = oss_object_key.get("oss_object_key")

+ 1 - 1
common/sql_help.py

@@ -27,7 +27,7 @@ class sqlCollect():
         return True
         return True
 
 
     @classmethod
     @classmethod
-    def insert_ks_data(cls, user_name: str, user_sex: str, time_data, caption: str, view_count: str, like_count: str, share_count: str, duration: str, main_mv_url: str, thumbnail_url: str, user_id: str, status: str, photo_id: str,  category_name: str, age: Optional[str] = None, oss_object: Optional[str] = None, video_uid: Optional[str] = None):
+    def insert_ks_data(cls, user_name: str, user_sex: str, time_data, caption: str, view_count: str, like_count: str, share_count: str, duration: str, main_mv_url: str, thumbnail_url: str, user_id: str, status: str, photo_id: str,  category_name: str, age: str, oss_object: Optional[str] = None, video_uid: Optional[str] = None):
         current_time = datetime.now()
         current_time = datetime.now()
         formatted_time = current_time.strftime("%Y-%m-%d %H:%M:%S")
         formatted_time = current_time.strftime("%Y-%m-%d %H:%M:%S")
         insert_sql = f"""INSERT INTO ks_category_video (user_name, user_sex, time_data, caption, view_count, like_count, share_count, duration, main_mv_url, thumbnail_url, user_id, status, age_proportion, video_oss_path, pq_video_id, update_time, photo_id, category_name) values ("{user_name}", "{user_sex}", "{time_data}", "{caption}", "{view_count}", "{like_count}", "{share_count}", "{duration}", "{main_mv_url}", "{thumbnail_url}", "{user_id}", "{status}", "{age}", "{oss_object}", "{video_uid}", "{formatted_time}", "{photo_id}", "{category_name}")"""
         insert_sql = f"""INSERT INTO ks_category_video (user_name, user_sex, time_data, caption, view_count, like_count, share_count, duration, main_mv_url, thumbnail_url, user_id, status, age_proportion, video_oss_path, pq_video_id, update_time, photo_id, category_name) values ("{user_name}", "{user_sex}", "{time_data}", "{caption}", "{view_count}", "{like_count}", "{share_count}", "{duration}", "{main_mv_url}", "{thumbnail_url}", "{user_id}", "{status}", "{age}", "{oss_object}", "{video_uid}", "{formatted_time}", "{photo_id}", "{category_name}")"""