update github_bot script

521xueweihan · 521xueweihan · commit c6feca785ab7 · 2017-04-06T20:33:00.000+08:00
diff --git a/script/github_bot/README.md b/script/github_bot/README.md
@@ -32,6 +32,10 @@
 **最后**：`python github_bot.py`
 
 ## 开发日志
+#### 2017-4-6
+1. GitHub Api 更新，event 最多获取 300 条
+2. 新注册帐号 521hellogithub 用于获取每天的数据
+
 #### 2017-3-28
 增加收集项目 star 临界值
 
diff --git a/script/github_bot/github_bot.py b/script/github_bot/github_bot.py
@@ -29,7 +29,7 @@
 }
 
 API = {
-    'events': 'https://api.github.com/users/{username}/received_events/public'.format(username=ACCOUNT['username'])
+    'events': 'https://api.github.com/users/{username}/received_events'.format(username=ACCOUNT['username'])
 }
 
 # 发送邮件，邮箱的信息
@@ -48,7 +48,7 @@
 DAY = 1
 
 # 项目stars临界值
-STARS = 200
+STARS = 100
 
 # qq邮件服务文档：http://service.mail.qq.com/cgi-bin/help?id=28
 
@@ -59,21 +59,22 @@
         <th>头像</th>
         <th>用户名</th>
         <th>项目名</th>
-        <th>starred日期</th>
-        <th>项目star数量</th>
+        <th>starred 日期</th>
+        <th>项目 star 数量</th>
       </tr>
       {project_info_string}
     </table>
 """
 
 
-def get_data(page=1, per_page=100):
+def get_data(page=1):
     """
     从目标源获取数据
+    https://developer.github.com/v3/activity/events/
+    GitHub 规定：默认每页 30 条，最多 300 条目
     """
 
-    args = '?page={page}&per_page={per_page}'.format(
-        page=page, per_page=per_page)
+    args = '?page={page}'.format(page=page)
 
     response = requests.get(API['events']+args,
                             auth=(ACCOUNT['username'], ACCOUNT['password']))
@@ -82,8 +83,22 @@ def get_data(page=1, per_page=100):
         resp_json = response.json()
         return resp_json
     else:
-        logging.error('请求api失败：', status_code)
-        return None
+        logging.error('请求 event api 失败：', status_code)
+        return []
+
+
+def get_all_data():
+    """
+    获取全部 300 条的数据
+    https://developer.github.com/v3/activity/events/
+    GitHub 规定：默认每页 30 条，最多 300 条目
+    """
+    all_data_list = []
+    for i in range(10):
+        response_json = get_data(i+1)
+        if response_json:
+            all_data_list.extend(response_json)
+    return all_data_list
 
 
 def check_condition(data):
@@ -151,7 +166,7 @@ def make_content():
     """
     生成发布邮件的内容
     """
-    json_data = get_data()
+    json_data = get_all_data()
     data = analyze(json_data)
     content = []
     project_info_list = get_stars(data)
@@ -180,10 +195,10 @@ def send_email(receivers, email_content):
         CONTENT_FORMAT.format(project_info_string=''.join(email_content)),
         'html', 'utf-8'
     )
-    message['From'] = Header(u'Github机器人', 'utf-8')
+    message['From'] = Header(u'GitHub 机器人', 'utf-8')
     message['To'] = Header(u'削微寒', 'utf-8')
 
-    subject = u'今日Github热点'  # 设置邮件主题
+    subject = u'今日 GitHub 热点'  # 设置邮件主题
     message['Subject'] = Header(subject, 'utf-8')
     try:
         smtp_obj = smtplib.SMTP_SSL()  # qq邮箱要求是https连接，所以需要用SMTP_SSL
