Merge pull request #40 from halfcrazy/remove-app-paramater

移除传递的app参数，在具体plugin中使用current_app来替代

Author: dongweiming

slack_bot/app.py

@@ -1,7 +1,6 @@
 # coding=utf-8
 import os
 import re
-from functools import partial
 
 from flask import Flask
 
@@ -31,18 +30,18 @@ def create_app(config=None):
 
     redis_store.init_app(app)
     cache.init_app(app)
+    app.cache = cache
     app.plugin_modules = plugin_modules
 
     slackbot = SlackBot(app)
-    _callback = partial(callback, app=app)
-    slackbot.set_handler(_callback)
+    slackbot.set_handler(callback)
     slackbot.filter_outgoing(_filter)
 
     return app
 
 
 @timeout(30.0)
-def callback(kwargs, app):
+def callback(kwargs):
     s = convert2str(kwargs['text'])
     trigger_word = convert2str(kwargs['trigger_word'])
     # remove trigger_words
@@ -61,7 +60,7 @@ def callback(kwargs, app):
 
     for plugin_module in plugin_modules:
         if plugin_module.test(data):
-            ret = plugin_module.handle(data, cache=cache, app=app)
+            ret = plugin_module.handle(data)
             if not isinstance(ret, tuple):
                 text = ret
                 attaches = None

slack_bot/plugins/airpollution.py

@@ -29,6 +29,7 @@
 import json
 from bs4 import BeautifulSoup
 
+from slack_bot.ext import cache
 from utils import gen_attachment
 
 description = """
@@ -52,7 +53,7 @@ def test(data):
     return len(req) > 0
 
 
-def get_desc(cityname, cityshort, cache=None, app=None):
+def get_desc(cityname, cityshort):
     if cache is not None:
         r = cache.get('airpollution.%s' % (cityshort))
         if r:
@@ -77,21 +78,21 @@ def get_desc(cityname, cityshort, cache=None, app=None):
     image_url = soup.find(id='tr_pm25').find(id='td_pm25').find(
         'img').attrs.get('src')
     title = soup.find('title').text
-    attaches = [gen_attachment(text, image_url, app=app, title=title,
+    attaches = [gen_attachment(text, image_url, title=title,
                                title_link=title_link)]
     return text, attaches
 
 
-def handle(data, cache=None, app=None, **kwargs):
+def handle(data):
     message = data['message']
     reqs = filter(lambda p: p[0].encode('utf-8') in message, city)
     req = reqs[0]
     try:
-        return get_desc(req[0], req[1], cache, app=app)
+        return get_desc(req[0], req[1])
     except Exception as e:
         print 'Error: {}'.format(e)
     return '空气查询失败, 请重试!', []
 
 
 if __name__ == '__main__':
-    print handle({'message': '北京空气'}, None)
+    print handle({'message': '北京空气'})

slack_bot/plugins/baidumap.py

@@ -6,6 +6,7 @@
 import cPickle as pickle
 from datetime import datetime
 
+from flask import current_app as app
 import requests
 
 from utils import to_pinyin
@@ -193,7 +194,7 @@ def test(data):
     return REGEX.search(message)
 
 
-def handle(data, cache, app, **kwargs):
+def handle(data):
     if app is None:
         ak = '18691b8e4206238f331ad2e1ca88357e'
     else:
@@ -239,9 +240,9 @@ def handle(data, cache, app, **kwargs):
 
 
 if __name__ == '__main__':
-    print handle({'message': '我想从兆维工业园到北京南站'}, None, None)
-    print handle({'message': '我想从人大到北京南站'}, None, None)
-    print handle({'message': '我想从人大到豆瓣'}, None, None)
-    print handle({'message': '我想从兆维工业园到北京南站 步行'}, None, None)
-    print handle({'message': '我想从兆维工业园到北京南站 开车'}, None, None)
-    print handle({'message': '从酒仙桥去798'}, None, None)
+    print handle({'message': '我想从兆维工业园到北京南站'})
+    print handle({'message': '我想从人大到北京南站'})
+    print handle({'message': '我想从人大到豆瓣'})
+    print handle({'message': '我想从兆维工业园到北京南站 步行'})
+    print handle({'message': '我想从兆维工业园到北京南站 开车'})
+    print handle({'message': '从酒仙桥去798'})

slack_bot/plugins/dianping.py

@@ -3,6 +3,7 @@
 import hashlib
 from functools import partial
 
+from flask import current_app as app
 import requests
 
 from baidumap import address2geo
@@ -110,7 +111,7 @@ def test(data):
                 for i in ['有什么美食', '大众点评', '附近美食']])
 
 
-def handle(data, app=None, **kwargs):
+def handle(data):
     message = data['message']
     if app is None:
         appkey = '41502445'

slack_bot/plugins/earthquake.py

@@ -56,7 +56,7 @@ def jw(a, b):
     return '，'.join((aa, bb))
 
 
-def handle(data, **kwargs):
+def handle(data):
     r = urllib2.urlopen(
         'http://data.earthquake.cn/datashare/globeEarthquake_csn.html',
         timeout=5)
@@ -66,4 +66,4 @@ def handle(data, **kwargs):
         (t[7], jw(t[2], t[3]), ' '.join(t[0:2]), t[5], t[4], t[6])
 
 if __name__ == '__main__':
-    print handle({'message': '地震了吗？'}, None)
+    print handle({'message': '地震了吗？'})

slack_bot/plugins/events.py

@@ -6,6 +6,7 @@
 import requests
 from bs4 import BeautifulSoup
 
+from slack_bot.ext import cache
 from utils import check_cache
 
 description = """
@@ -224,7 +225,7 @@ def test(data):
     return '最近有什么活动' in data['message']
 
 
-def handle(data, cache=None, **kwargs):
+def handle(data):
     message = data['message']
     if not isinstance(message, unicode):
         message = message.decode('utf-8')
@@ -237,5 +238,5 @@ def handle(data, cache=None, **kwargs):
 
 
 if __name__ == '__main__':
-    print handle({'message': '最近有什么活动'}, None, None)
-    print handle({'message': '最近有什么活动 上海'}, None, None)
+    print handle({'message': '最近有什么活动'})
+    print handle({'message': '最近有什么活动 上海'})

slack_bot/plugins/github_issue.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+from flask import current_app as app
 import requests
 
 description = """
@@ -15,7 +16,7 @@ def test(data):
     return 'issue' in data['message']
 
 
-def handle(data, app, **kwargs):
+def handle(data):
     org_name = app.config.get('ORG_NAME', 'python-cn')
     repos = requests.get(REPO_API.format(org=org_name)).json()
     rv = ''
@@ -39,4 +40,4 @@ def handle(data, app, **kwargs):
     from flask import Flask
     app = Flask(__name__)
     app.config['org_name'] = 'python-cn'
-    print handle(None, None, app)
+    print handle(None)

slack_bot/plugins/help.py

@@ -1,4 +1,5 @@
 # coding=utf-8
+from flask import current_app
 
 description = """
 帮助信息，触发条件: "help [私聊]". 比如:
@@ -20,7 +21,8 @@ def test(data):
     return 'help' in data['message']
 
 
-def handle(data, app, **kwargs):
+def handle(data):
+    app = current_app
     plugin_modules = app.plugin_modules if app else []
     docs = []
     for plugin in plugin_modules:

slack_bot/plugins/movie.py

@@ -1,5 +1,6 @@
 # coding=utf-8
 
+from flask import current_app as app
 import requests
 from bs4 import BeautifulSoup
 
@@ -17,7 +18,7 @@
 LATER_URL = 'http://movie.douban.com/later/{0}/'
 
 
-def get_later_movie_info(city, app):
+def get_later_movie_info(city):
     r = requests.get(LATER_URL.format(city))
     soup = BeautifulSoup(r.text)
     items = soup.find(id='showing-soon').findAll('div', {'item'})
@@ -28,13 +29,13 @@ def get_later_movie_info(city, app):
         content = '|'.join([li.text for li in i.findAll('li')[:4]])
         image_url = i.find('a').find('img').attrs.get('src', '')
         # SA好变态, 感觉是防盗链了，下同
-        image_url = upload_image(image_url, 'thumb', app)
+        image_url = upload_image(image_url, 'thumb')
         yield u'<{url}|{title}> {content}'.format(**locals()), gen_attachment(
             content, image_url, image_type='thumb', title=title,
             title_link=url)
 
 
-def get_current_movie_info(city, app):
+def get_current_movie_info(city):
     r = requests.get(CURRENT_URL.format(city))
     soup = BeautifulSoup(r.text)
     items = soup.find(id='nowplaying').find('ul', {'class': 'lists'}).findAll(
@@ -48,7 +49,7 @@ def get_current_movie_info(city, app):
         content = '|'.join([li.text for li in i.findAll('li')[:4]])
         url = i.find('a').attrs.get('href', '')
         image_url = img.attrs.get('src', '')
-        image_url = upload_image(image_url, 'thumb', app)
+        image_url = upload_image(image_url, 'thumb')
         count += 1
         yield u'<{url}|{title}>'.format(**locals()), gen_attachment(
             content, image_url, image_type='thumb', title=title,
@@ -60,7 +61,7 @@ def test(data):
         any([i in data['message'] for i in ['上映', '热映', '有什么', '将']])
 
 
-def handle(data, app, **kwargs):
+def handle(data):
     message = data['message']
     if not isinstance(message, unicode):
         message = message.decode('utf-8')
@@ -78,5 +79,5 @@ def handle(data, app, **kwargs):
 
 
 if __name__ == '__main__':
-    print handle({'message': '最近要将上映的电影'}, None)
-    print handle({'message': '有什么电影 上海'}, None)
+    print handle({'message': '最近要将上映的电影'})
+    print handle({'message': '有什么电影 上海'})

slack_bot/plugins/orz.py

@@ -42,7 +42,7 @@ def test(data):
     return False
 
 
-def handle(data, **kwargs):
+def handle(data):
     mobai_icon = ':mb:'
     return mobai_icon * random.randrange(1, 10)