liqian vor 2 Jahren
Ursprung
Commit
93b9c46c66
2 geänderte Dateien mit 12 neuen und 20 gelöschten Zeilen
  1. 3 0
      config.py
  2. 9 20
      laohaokan_recommend_update.py

+ 3 - 0
config.py

@@ -341,6 +341,9 @@ class BaseConfig(object):
         ],
     }
 
+    # 老好看宗教实验数据
+    LHK_RULE_PARAMS = {'data': 'lhk_data', 'rule': 'lhk_rule'}
+
     # 不区分地域数据使用相对48h数据
     RULE_PARAMS_REGION_APP_TYPE_48H = {
         'rule_params': {

+ 9 - 20
laohaokan_recommend_update.py

@@ -1,4 +1,5 @@
 import datetime
+import gevent
 from db_helper import RedisHelper
 from config import set_config
 from log import Log
@@ -6,6 +7,7 @@ from log import Log
 config_, env = set_config()
 log_ = Log()
 initial_param = {'data': 'data1', 'rule': 'rule4'}
+new_param = config_.LHK_RULE_PARAMS
 redis_helper = RedisHelper()
 
 
@@ -98,28 +100,15 @@ def merge_with_region(now_date, now_h, region, religion_video_id_list):
                                                        religion_video_id_list=religion_video_id_list)
 
 
-
-    # region_h_data = redis_helper.get_all_data_from_zset(region_h_key_name)
-    # region_h_video_ids = [int(video_id) for video_id, _ in region_h_data]
-    # religion_video_id_list = [video_id for video_id in religion_video_id_list if video_id not in region_h_video_ids]
-    # new_region_h_video_ids = []
-    # for i, video_id in enumerate(region_h_video_ids):
-    #     new_region_h_video_ids.append(video_id)
-    #     if i % 2 == 1 and len(religion_video_id_list) > 0:
-    #         new_region_h_video_ids.append(religion_video_id_list[0])
-    #         religion_video_id_list = religion_video_id_list[1:]
-    # # 按照排序给定分数
-    # new_region_h_result = {}
-    # step = 100 / (len(new_region_h_video_ids) * 2)
-    # for i, video_id in enumerate(new_region_h_video_ids):
-    #     score = 100 - i * step
-    #     new_region_h_result[int(video_id)] = score
-
-
-
-
 def merge_videos(now_date, now_h):
     """将宗教视频插入到默认视频列表中"""
     # 获取宗教视频列表
     religion_videos = get_religion_videos(now_date=now_date)
     religion_video_id_list = [int(video_id) for video_id, _ in religion_videos]
+    region_code_list = [code for region, code in config_.REGION_CODE.items()]
+    task_list = [
+        gevent.spawn(merge_with_region, now_date, now_h, region, religion_video_id_list)
+        for region in region_code_list
+    ]
+
+    gevent.joinall(task_list)