项目目录调整

README.md

@@ -14,7 +14,7 @@
 
     pip3 install -r requirements.txt
 
-    python3 main.py
+    python3 app.py
 
 浏览器访问即可,端口默认8080
 

src/main.py → app.py

@@ -7,8 +7,8 @@
 from tornado.options import define, options
 import tornado.web
 import tornado.websocket
-from net.socket import SocketHandler
-from net.web import WebHandler, UpdateHandler, RegHandler
+from handlers.socket import SocketHandler
+from handlers.web import WebHandler, UpdateHandler, RegHandler
 from db import torndb
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
@@ -54,8 +54,8 @@ def main():
     tornado.options.parse_command_line()
     app = Application()
     app.listen(8080)
-    tornado.ioloop.IOLoop.current().start()
     logger.info('listening on 8080')
+    tornado.ioloop.IOLoop.current().start()
 
 
 if __name__ == '__main__':

src/core/player.py → core/player.py

@@ -4,7 +4,7 @@
 from tornado.websocket import WebSocketHandler
 
 from core import rule
-from net.protocol import Protocol as Pt
+from handlers.protocol import Protocol as Pt
 
 logger = logging.getLogger('ddz')
 

src/core/robot.py → core/robot.py

@@ -5,15 +5,15 @@
 
 from core import rule
 from core.player import Player
-from net.protocol import Protocol as Pt
+from handlers.protocol import Protocol as Pt
 
 logger = logging.getLogger('ddz')
 
 
 class AiPlayer(Player):
 
     def __init__(self, uid: int, username: str, player: Player):
-        from net.loopback import LoopBackSocketHandler
+        from handlers.loopback import LoopBackSocketHandler
         super().__init__(uid, username, LoopBackSocketHandler(self))
         self.room = player.room
 

src/core/table.py → core/table.py

@@ -5,7 +5,7 @@
 from tornado.ioloop import IOLoop
 
 from core.robot import AiPlayer
-from net.protocol import Protocol as Pt
+from handlers.protocol import Protocol as Pt
 
 logger = logging.getLogger('ddz')
 

src/net/loopback.py → handlers/loopback.py

@@ -1,6 +1,6 @@
 from tornado.ioloop import IOLoop
 
-from net.socket import SocketHandler
+from handlers.socket import SocketHandler
 
 
 class LoopBackSocketHandler(SocketHandler):

src/net/web.py → handlers/web.py

@@ -3,7 +3,7 @@
 import bcrypt
 from tornado.escape import json_encode
 
-from net.base import BaseHandler
+from handlers.base import BaseHandler
 
 
 class WebHandler(BaseHandler):