Move web to a seperate package, add more functions

Author: dmptrluke

cloudbot/bot.py

@@ -18,9 +18,13 @@
 from cloudbot.plugin import PluginManager
 from cloudbot.event import Event, CommandEvent, RegexEvent, EventType
 from cloudbot.util import database, formatting
-from cloudbot.web import WebInterface
 from cloudbot.clients.irc import IrcClient
 
+try:
+    from cloudbot.web.main import WebInterface
+except ImportError:
+    WebInterface = None
+
 logger = logging.getLogger("cloudbot")
 
 

cloudbot/web/__init__.py

@@ -0,0 +1 @@
+__author__ = 'Luke'

cloudbot/web.py cloudbot/web/main.pycloudbot/web.py renamed to cloudbot/web/main.py

@@ -1,8 +1,16 @@
 import asyncio
 
+from tornado import gen
 from tornado.web import RequestHandler, Application, url
 from tornado.platform.asyncio import AsyncIOMainLoop
 
+from jinja2 import Environment, PackageLoader
+
+
+def get_template_env():
+    env = Environment(loader=PackageLoader('cloudbot.web.templates'))
+    return env
+
 
 def get_application():
     app = Application([
@@ -12,6 +20,7 @@ def get_application():
 
 
 class TestHandler(RequestHandler):
+    @gen.coroutine
     def get(self):
         self.write("Hello world!\n")
 
@@ -22,6 +31,9 @@ def __init__(self, bot, port=8080, address="0.0.0.0"):
         self.port = port
         self.address = address
 
+        self.template = get_application()
+        self.template_env = get_template_env()
+
         self.app = None
 
         # Install tornado IO loop.

cloudbot/web/templates/__init__.py

@@ -0,0 +1 @@
+__author__ = 'Luke'