OSDN Git Service

age local test version
[pybbs/pybbs.git] / index.py
index 8ce5012..7a0a28d 100755 (executable)
--- a/index.py
+++ b/index.py
@@ -4,6 +4,8 @@ import shutil,copy
 import tornado.auth
 import tornado.escape
 import tornado.web
+import tornado.wsgi
+import wsgiref.simple_server
 from tinydb import TinyDB,Query,where
 from tinydb.operations import delete
 from datetime import datetime
@@ -80,33 +82,38 @@ class NaviHandler(tornado.web.RequestHandler):
 
 class TitleHandler(NaviHandler):
     def get(self):
-        self.render('title.htm',coll=self.name(),full=self.full,
-                    count=self.count,title=self.title,update=self.update)            
-
-    def count(self,dbname):
-        if dbname in self.application.db.tables():
-            return len(self.application.db.table(dbname))
-        else:
-            return ''
-
-    def title(self,dbname):
-        if dbname in self.application.db.tables():
-            table = self.application.db.table(dbname)
+        rec = sorted(self.title(),key=lambda x: x['date2'])
+        self.render('title.htm',coll=rec,full=self.full)  
+        
+    def title(self):
+        for x in self.name():
+            item = {}
+            item['name'] = x
+            table = self.application.db.table(x)
+            i = len(table)
+            item['count'] = i            
             if table.contains(where('number') == 1) == True:
-                dic = table.get(where('number') == 1)
-                return dic['title']
+                s = table.get(where('number') == 1)['title']
             else:
-                return ''
-            
-    def update(self,dbname):
-        if dbname in self.application.db.tables():
-            table = self.application.db.table(dbname)
-            i = len(table)
+                s = ''
+            item['title'] = s   
             if i == 0:
-                return ''
+                item['date'] = ''
+                item['date2'] = 0
             else:
-                rec = sorted(table.all(),key=lambda x: x['number'])
-                return rec[i-1]['date']
+                rec = sorted(table.all(),key=lambda k: k['number'])
+                s = rec[i-1]['date']
+                item['date'] = s
+                i = datetime.strptime(s,'%Y/%m/%d %H:%M')
+                year = datetime.now().year-i.year
+                if year == 0:
+                    j = 800
+                elif year == 1:
+                    j = 400
+                else:
+                    j = 0
+                item['date2'] = j+31*(i.month-1)+i.day
+            yield item
         
 class RegistHandler(tornado.web.RequestHandler):
     def post(self,dbname):
@@ -128,7 +135,7 @@ class RegistHandler(tornado.web.RequestHandler):
                 break
         for line in com.splitlines(True):
             for word in words:
-                if word in line:
+                if word in line.lower():
                     error = error + u'タグ違反.('+word+')'       
             i += len(line)
             text = text+'<p>'+self.link(line)+'<br></p>'
@@ -143,12 +150,12 @@ class RegistHandler(tornado.web.RequestHandler):
         if len(article) == 0:
             no = 1
         else:
-            item = article.all()[len(article)-1]
+            item = sorted(article.all(),key=lambda x: x['number'])[len(article)-1]
             no = item['number']+1
         if error == '':
-            reg = {'number':no,'name':na,'title':sub,'comment':text,'password':pw,'date':datetime.now().strftime('%Y/%m/%d %H:%M')}
+            s = datetime.now()
+            reg = {'number':no,'name':na,'title':sub,'comment':text,'raw':com,'password':pw,'date':s.strftime('%Y/%m/%d %H:%M')}
             article.insert(reg)
-            restart()
             self.set_cookie('username',tornado.escape.url_escape(na))
             self.redirect('/'+dbname+'#article')
         else:
@@ -196,9 +203,13 @@ class AdminHandler(BaseHandler):
         else:
             check = ''
         pos = self.application.gpos(dbname,page)
-        restart()
-        self.application.db = TinyDB(json)
-        self.render('modules/admin.htm',position=pos,records=rec,mente=check,password=mente['password'],db=dbname)
+        i = mente['count']
+        start = (pos-1)*i
+        if start < 0:
+            start = len(table)-i
+            if start < 0:
+                start = 0
+        self.render('modules/admin.htm',position=pos,records=rec[start:start+i],mente=check,password=mente['password'],db=dbname)
 
 class AdminConfHandler(BaseHandler):
     @tornado.web.authenticated
@@ -216,23 +227,23 @@ class AdminConfHandler(BaseHandler):
             word = self.get_argument('pass','')
             if word == '':
                 self.render('regist.htm',content='パスワードを設定してください')
+                return
             else:
-                self.application.db.update({'mentenance':mente,'password':word},where('kinds') == 'conf')     
+                self.application.db.update({'mentenance':mente,'password':word},where('kinds') == 'conf')  
         elif func == 'del':
             table = self.application.db.table(dbname)
             for x in self.get_arguments('item'):
                 table.remove(where('number') == int(x))
-        restart()
         self.redirect('/'+dbname+'/admin/0/')
         
     def store(self):
         self.application.db.close()
-        shutil.copy('static/db/db.json','static/db/bak.json')
-        self.application.db = TinyDB(json)
+        shutil.copy(st.json,st.bak)
+        self.application.db = TinyDB(st.json)
         
     def restore(self):
         database = self.application.db
-        bak = TinyDB('static/db/bak.json')
+        bak = TinyDB(st.bak)
         for x in database.tables():
             if self.application.collection(x) == True:
                 database.purge_table(x)
@@ -242,34 +253,67 @@ class AdminConfHandler(BaseHandler):
           
 class UserHandler(tornado.web.RequestHandler):
     def post(self,dbname):
-        num = int(self.get_argument('number'))
-        pas = self.get_argument('password')
-        table = self.application.db.table(dbname)
-        qwr = Query()
-        obj = table.get(qwr.number == num)
-        if obj and(obj['password'] == pas):
-            table.remove(qwr.number == num)
+        num = self.get_argument('number')
+        if num.isdigit() == True:
+            num = int(num)
+            pas = self.get_argument('password')
+            table = self.application.db.table(dbname)
+            qwr = Query()
+            obj = table.get(qwr.number == num)
+            if obj and(obj['password'] == pas):
+                table.remove(qwr.number == num)
         self.redirect('/'+dbname)
       
 class SearchHandler(tornado.web.RequestHandler):       
     def post(self,dbname):
-        word = self.get_argument('word1')
-        radiobox = self.get_argument('filter')
-        self.set_cookie('search',word)
-        table = self.application.db.table(dbname)            
-        self.render('modules/search.htm',records=table.search(where(radiobox).matches(word)),word1=word,db=dbname)
+        self.word = tornado.escape.url_unescape(self.get_argument('word1'))
+        self.radiobox = self.get_argument('filter')
+        self.set_cookie('search',tornado.escape.url_escape(self.word))         
+        rec = sorted(self.search(dbname),key=lambda x: x['number'])
+        self.render('modules/search.htm',records=rec,word1=self.word,db=dbname)
     
     def get(self,dbname):
-        word = self.get_cookie('search')
-        self.render('modules/search.htm',records={},word1=word,db=dbname)
+        if self.application.collection(dbname) == False:
+            raise tornado.web.HTTPError(404)
+            return
+        word = self.get_cookie('search','')
+        word = tornado.escape.url_unescape(word)
+        self.render('modules/search.htm',records=[],word1=word,db=dbname)
         
+    def search(self,dbname):
+        table = self.application.db.table(dbname)    
+        element = self.word.split()
+        if len(element) == 0:
+            element = ['']
+        while len(element) < 3:
+            element.append(element[0])
+        if self.radiobox == 'comment':
+            query = (Query().raw.search(element[0])) | (Query().raw.search(element[1])) | (Query().raw.search(element[2]))
+        else:
+            query = (Query().name == element[0]) | (Query().name == element[1]) | (Query().name == element[2])
+        if self.radiobox == 'comment':    
+            for x in table.search(query):
+                com = ''
+                for text in x['raw'].splitlines(True):                  
+                    for word in self.word.split():                        
+                        if text.find(word) > -1:
+                            com = com +'<p style=background-color:yellow>'+text+'<br></p>'  
+                            break                          
+                    else:
+                        com = com+'<p>'+text+'<br></p>'
+                x['comment'] = com
+                yield x       
+        else:
+            for x in table.search(query):
+                yield x
+                                        
 class FooterModule(tornado.web.UIModule):
     def render(self,number,url,link):
         return self.render_string('modules/footer.htm',index=number,url=url,link=link)
     
 class Application(tornado.web.Application):    
     def __init__(self):
-        self.db = TinyDB(json)
+        self.db = TinyDB(st.json)
         handlers = [(r'/',NaviHandler),(r'/login',LoginHandler),(r'/logout',LogoutHandler),(r'/title',TitleHandler),
                     (r'/([a-zA-Z0-9_]+)',IndexHandler),(r'/([a-zA-Z0-9_]+)/([0-9]+)/',IndexHandler),
                     (r'/([a-zA-Z0-9_]+)/admin/([0-9]+)/',AdminHandler),(r'/([a-zA-Z0-9_]+)/admin/([a-z]+)/',AdminConfHandler),(r'/([a-zA-Z0-9_]+)/userdel',UserHandler),
@@ -294,15 +338,17 @@ class Application(tornado.web.Application):
         return pos
     
     def collection(self,name):
-        for x in self.db.tables():
-            if x == name:
-                return True
+        if name in self.db.tables():
+            return True
         else:
             return False
 
-json = 'static/db/db.json'
-app = Application()
+class static():
+    json = 'static/db/db.json'
+    bak = 'static/db/bak.json'
 
-def restart():
-    app.db.close()
-    app.db = TinyDB(json)    
+st = static()
+app = tornado.wsgi.WSGIAdapter(Application())
+if __name__ == '__main__':
+    server = wsgiref.simple_server.make_server('',8888,app)
+    server.serve_forever()