Update bot class to work fine with web code entirely removed

CloudBotIRC · Apr 3, 2015 · 91ce4ba · 91ce4ba
1 parent d76a54d
commit 91ce4ba
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cloudbot/bot.py b/cloudbot/bot.py
@@ -22,8 +22,9 @@
 
 try:
     from cloudbot.web.main import WebInterface
+    web_installed = True
 except ImportError:
-    WebInterface = None
+    web_installed = False
 
 logger = logging.getLogger("cloudbot")
 
@@ -98,7 +99,7 @@ def __init__(self, loop=asyncio.get_event_loop()):
         self.db_base = declarative_base(metadata=self.db_metadata, bind=self.db_engine)
 
         # create web interface
-        if self.config.get("web", {}).get("enabled", False):
+        if self.config.get("web", {}).get("enabled", False) and web_installed:
             self.web = WebInterface(self)
 
         # set botvars so plugins can access when loading
@@ -205,7 +206,7 @@ def _init_routine(self):
         yield from asyncio.gather(*[conn.connect() for conn in self.connections.values()], loop=self.loop)
 
         # Activate web interface.
-        if self.config.get("web", {}).get("enabled", False):
+        if self.config.get("web", {}).get("enabled", False) and web_installed:
             self.web.start()
 
         # Run a manual garbage collection cycle, to clean up any unused objects created during initialization

diff --git a/cloudbot/web/templates/layout.html b/cloudbot/web/templates/layout.html
@@ -126,7 +126,7 @@ <h4 class="modal-title">About {{ bot_name }}</h4>
     <script src="/s/js/bootstrap-sortable.js"></script>
     <script>
         $(function () {
-            $('#theme-select').bootstrapThemeSwitcher({'defaultCssFile': '/s/css/bootstrap.min.css', 'excludeBootswatch': 'Paper,Superhero,Simplex,Sandstone,Spacelab'});
+            $('#theme-select').bootstrapThemeSwitcher({'defaultCssFile': '/s/css/bootstrap.min.css', 'excludeBootswatch': 'Paper,superhero,simplex,Sandstone,Spacelab'});
             $().bootstrapThemeSwitcher('loadThemeFromCookie');
             $('[data-toggle="tooltip"]').tooltip();
             $('[data-toggle="popover"]').popover();