add region filter

utils.py

@@ -341,7 +341,7 @@ class FilterVideos(object):
         if not filtered_viewed_result:
             return None
         filtered_viewed_videos = [int(video_id) for video_id in filtered_viewed_result]
-        if pool_type == 'flow':
+        if pool_type == 'flow' or pool_type=='normal':
             # 流量池视频需过滤屏蔽视频
             if region_code is None or shield_config is None:
                 return filtered_viewed_videos

video_recall.py

@@ -2166,7 +2166,7 @@ class PoolRecall(object):
         #print(video_ids)
         filter_ = FilterVideos(request_id=self.request_id,
                                app_type=self.app_type, mid=self.mid, uid=self.uid, video_ids=video_ids)
-        filtered_viewed_videos = filter_.filter_videos(pool_type='rov')
+        filtered_viewed_videos = filter_.filter_videos(pool_type='normal')
         if filtered_viewed_videos is None:
             return recall_result
         print("filtered_viewed_videos:", filtered_viewed_videos)
@@ -2405,7 +2405,7 @@ class PoolRecall(object):
         #print(video_ids)
         filter_ = FilterVideos(request_id=self.request_id,
                                app_type=self.app_type, mid=self.mid, uid=self.uid, video_ids=video_ids)
-        filtered_viewed_videos = filter_.filter_videos(pool_type='rov')
+        filtered_viewed_videos = filter_.filter_videos(pool_type='normal')
         if filtered_viewed_videos is None:
             return recall_result
         #print("filtered_viewed_videos:", filtered_viewed_videos)
@@ -2483,7 +2483,7 @@ class PoolRecall(object):
         # print(video_ids)
         filter_ = FilterVideos(request_id=self.request_id,
                                app_type=self.app_type, mid=self.mid, uid=self.uid, video_ids=video_ids)
-        filtered_viewed_videos = filter_.filter_videos(pool_type='rov')
+        filtered_viewed_videos = filter_.filter_videos(pool_type='normal')
         if filtered_viewed_videos is None:
             return recall_result
         # print("filtered_viewed_videos:", filtered_viewed_videos)
@@ -2521,7 +2521,7 @@ class PoolRecall(object):
         #print(video_ids)
         filter_ = FilterVideos(request_id=self.request_id,
                                app_type=self.app_type, mid=self.mid, uid=self.uid, video_ids=video_ids)
-        filtered_viewed_videos = filter_.filter_videos(pool_type='rov')
+        filtered_viewed_videos = filter_.filter_videos(pool_type='normal')
         if filtered_viewed_videos is None:
             return recall_result
         #print("filtered_viewed_videos:", filtered_viewed_videos)
@@ -2695,7 +2695,7 @@ class PoolRecall(object):
         #print(video_ids)
         filter_ = FilterVideos(request_id=self.request_id,
                                app_type=self.app_type, mid=self.mid, uid=self.uid, video_ids=video_ids)
-        filtered_viewed_videos = filter_.filter_videos(pool_type='rov')
+        filtered_viewed_videos = filter_.filter_videos(pool_type='normal')
         if filtered_viewed_videos is None:
             return recall_result
         #print("filtered_viewed_videos:", filtered_viewed_videos)