Merge branch 'feature/weibo' into 'test'

fix

See merge request alpha/saturn!103

api/management/commands/weibo_commands.py

 """ 微博帖子入库榜单脚本 """
+from co
 import time
 import os
 import re
 from datetime import datetime
+from collections import defaultdict
 import json
 import requests
 from random import randint
@@ -15,7 +17,7 @@ from engine.logger import info_logger, error_logger, logging_exception
 
 
 IMAGE_SUFFIX = '-w'
-FILE_PATH = '/Users/zhongshangwu/workspace/gengmei/like/saturn/weibo/'
+FILE_PATH = '/srv/apps/saturn/weibo/'
 
 
 class Command(BaseCommand):
@@ -132,13 +134,13 @@ class Command(BaseCommand):
             return comment, replies
 
         images = []
-        if not comment["images"] and len(reply) > 1:
+        if not comment["images"] and reply:
 
-            normal_images = set(reply[0]["images"])
-            for info in reply[1:]:
-                info_images = set(info["images"])
-                normal_images = normal_images & info_images
-            comment["images"] = list(normal_images)
+            counter = defaultdict(int)
+            for info in reply:
+                for image in info["images"]:
+                    counter[image] += 1
+            comment["images"] = [url for url, count in counter if count > 1]
 
         for info in reply:
             if self.filter_second_comment(info["content"], comment["images"], info["images"]):
@@ -228,7 +230,7 @@ class Command(BaseCommand):
                         }
 
             else:  # -> to pictorial comment
-                if len(self.stats[weibo_id]["first_comments"]) > 50:
+                if len(self.stats[weibo_id]["first_comments"]) >= 50:
                     continue
 
                 top_comments_obj = rpc_invoker['venus/community/crawl/replys'](data=[comment], platform=platform, pictorial_id=pictorial_id).unwrap()