fix sqlalchemy bug

diff --git a/rainbowstream/config.py b/rainbowstream/config.py
index 183bfe35e84c2b9a604c5847fc2ca81b22b24505..a5e542d5afcd492338ae2ea7f568b5ff2c4d5c2e 100644 (file)
--- a/rainbowstream/config.py
+++ b/rainbowstream/config.py
@@ -3,9 +3,6 @@ import re
 import os
 import os.path
 
-from .db import *
-
-db = RainbowDB()
 
 # Regular expression for comments
 comment_re = re.compile(

diff --git a/rainbowstream/db.py b/rainbowstream/db.py
index 775c8563d51dd6d81c79d9ae42b2d1417a22008b..5bfb04081c715ad1b8f2690b1527a42987e9222a 100644 (file)
--- a/rainbowstream/db.py
+++ b/rainbowstream/db.py
@@ -1,6 +1,5 @@
 import os
 from sqlalchemy import create_engine
-from sqlalchemy import update
 from sqlalchemy.orm import sessionmaker
 from .table_def import *
 

diff --git a/rainbowstream/rainbow.py b/rainbowstream/rainbow.py
index ed3d07fdf61cb0bb658a9560bf8f4651090ccc3f..51ab7ddd956563a5f942d1138ac27004765579ad 100644 (file)
--- a/rainbowstream/rainbow.py
+++ b/rainbowstream/rainbow.py
@@ -139,6 +139,7 @@ def get_decorated_name():
 
     files = os.listdir('rainbowstream/colorset')
     themes = [f.split('.')[0] for f in files if f.split('.')[-1] == 'json']
+    themes += ['custom']
     g['themes'] = themes
     db.theme_store(c['theme'])