Add database type to global config -- no user-config for the moment

1 files changed, 12 insertions, 11 deletions

diff --git a/portato/db/__init__.py b/portato/db/__init__.py
index d36f900..5537c5e 100644
--- a/portato/db/__init__.py
+++ b/portato/db/__init__.py
@@ -13,29 +13,26 @@
 from __future__ import absolute_import
 
 from ..session import Session, SectionDict
-from ..helper import debug, warning
+from ..helper import debug, warning, error
+
+class UnknownDatabaseTypeError (Exception):
+    pass
 
 _SESSION = None
-_TYPE = None
 
 types = {
         "sql": (_("SQLite"), _("Uses an SQLite-database to store package information.\nMay take longer to generate at the first time, but has advantages if portato is re-started with an unchanged portage tree. Additionally it allows to use fast SQL expressions for fetching the data.")),
         "dict": (_("Hashmap"), _("Uses an in-memory hashmap to store package information.\nHas been used since at least version 0.3.3, but all information has to be regenerated on each startup."))
         }
 
-def _set_type(t):
-    global _TYPE
-    _TYPE = t
-
-def Database():
-    global _SESSION, _TYPE
+def Database(type):
+    global _SESSION
 
     if _SESSION is None:
         _SESSION = Session("db.cfg", name = "DB")
-        _SESSION.add_handler((["type"], _set_type, lambda: _TYPE), default = ["sql"])
         _SESSION.load()
 
-    if _TYPE == "sql":
+    if type == "sql":
         debug("Using SQLDatabase")
         try:
             from .sql import SQLDatabase
@@ -46,7 +43,11 @@ def Database():
         else:
             return SQLDatabase(SectionDict(_SESSION, "SQL"))
 
-    elif _TYPE == "dict":
+    elif type == "dict":
         debug("Using DictDatabase")
         from .dict import DictDatabase
         return DictDatabase(SectionDict(_SESSION, "dict"))
+    
+    else:
+        error(_("Unknown database type: %s"), type)
+        raise UnknownDatabaseTypeError, "type"