update

[simple-tornado-bot/simple-tornado-bot.git] / bot.py

diff --git a/bot.py b/bot.py
index 377e193..15704c1 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -18,18 +18,18 @@ from linebot.models import TextSendMessage
 
 class WebHookHandler(tornado.web.RequestHandler):   
     def get(self):
-        mes = self.get_argument('code','')
-        self.name = 'glove'
+        mes = self.get_argument('code', '')
+        self.uid = ''
         self.write(self.main(mes))
         
-    def main(self,no):
+    def main(self, no):
         pz = pytz.timezone('Asia/Tokyo')
         now = datetime.now(pz)
         t = now.hour
         w = now.weekday()
         if (w < 5)and(t >= 9)and(t < 16):
             return u'仕事中.'
-        table = self.users(self.name)
+        table, na = self.users
         item = table.find({'no':re.compile(no,re.IGNORECASE)})
         if item.count() == 1:
             x = item[0]
@@ -48,35 +48,38 @@ class WebHookHandler(tornado.web.RequestHandler):
             ans = self.itr(sorted(list1, key=lambda k:k['no']))
         else:
             ans = self.itr(table.find().sort('no'))
-            ans = '-*-glove list-*-\n'+ans
+            ans = '-*-'+na+' list-*-\n'+ans
         return ans
     
-    def itr(self,item):
+    def itr(self, item):
         ans = ''
         for x in item:
             ans += '【'+x['no']+'】 '
         return ans
     
-    def setting(self,name,dbname):
+    def setting(self, dbname):
         client = pymongo.MongoClient(uri)[ac]
-        if dbname in client.tables():
+        if dbname in client.collection_names(include_system_collections=False):
             db = client['users']
-            item = db.find_one(name)
-            if item['dbname'] == dbname:
+            item = db.find_one({'name':self.uid})
+            if not item:
+                db.insert({'user':self.id, 'dbname':dbname})
+            elif item['dbname'] == dbname:
                 return False
             else:
-                item.update({'user':name,'dbname':dbname})
+                db.update({'user':self.uid, 'dbname':dbname})
                 return True
-    
-    def users(self,name):
+
+    def users(self):
         client = pymongo.MongoClient(uri)[ac]
         db = client['users']
-        item = db.find_one(name)
+        item = db.find_one({'name':self.uid})
         if item:
-            return client[item['dbname']]
+            x = item['dbname']
+            return client[x], x
         else:
-            db.insert({'name':name,'dbname':'glove'})
-            return client['glove']
+            db.insert({'name':self.uid, 'dbname':'glove'})
+            return client['glove'], 'glove'
                 
     def post(self):
         '''
@@ -92,15 +95,13 @@ class WebHookHandler(tornado.web.RequestHandler):
         dic = tornado.escape.json_decode(self.request.body)              
         for event in dic['events']:
             if 'replyToken' in event:
-                x = event['replyToken']
-                y = event['message']['text']
-                if self.setting(x,y):
-                    self.name = y
-                    linebot.reply_message(x,
+                x = event['message']['text']
+                self.uid = event['source']['userId']
+                if self.setting(x):
+                    linebot.reply_message(event['replyToken'],
                         TextSendMessage(text=u'設定完了.'))
                 else:
-                    self.name = x
-                    linebot.reply_message(x,
+                    linebot.reply_message(event['replyToken'],
                         TextSendMessage(text=self.main(x))
                     )
         
@@ -111,10 +112,11 @@ class DummyHandler(tornado.web.RequestHandler):
             f = open(x)
             data = f.read()
             f.close()
-            self.main(x[2:-4],data)
+            self.main(x[2:-4], data)
     
-    def main(self,name,data):
-        table = self.db[name]
+    def main(self, name, data):
+        if name == 'requirements':
+            return
         item = []
         for x in data.split('\n'):
             if x[0] == '@':
@@ -123,6 +125,7 @@ class DummyHandler(tornado.web.RequestHandler):
             else:
                 dic['no'] = x
                 item.append(dic)
+        table = self.db[name]
         table.remove()
         for x in item:
             table.insert(x)