Fix a bug in opening existing SQLite db

[m_librarian.git] / m_librarian / db.py

diff --git a/m_librarian/db.py b/m_librarian/db.py
index e78f8f17c49b41b45e101f56d858469b42f3e0f9..d176e7bc629fee4583ac325ea41743ea1fa4cef5 100755 (executable)
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -1,8 +1,8 @@
 #! /usr/bin/env python
 
 import os
-from sqlobject import SQLObject, StringCol, UnicodeCol, IntCol, \
-    connectionForURI, sqlhub
+from sqlobject import SQLObject, StringCol, UnicodeCol, IntCol, BoolCol, \
+    ForeignKey, DateCol, connectionForURI, sqlhub, dberrors
 from .config import ml_conf
 
 try:
@@ -32,30 +32,60 @@ if not db_uri:
         except OSError:  # Perhaps already exists
             pass
         db_file = os.path.join(db_dir, 'm_librarian.sqlite')
-        db_uri = 'sqlite://%s' % db_file.replace(os.sep, '/')
+
+    db_uri = 'sqlite://%s' % db_file.replace(os.sep, '/')
 
 sqlhub.processConnection = connectionForURI(db_uri)
 
 
 class Author(SQLObject):
-    name = UnicodeCol()
+    name = UnicodeCol(unique=True)
     count = IntCol()
 
 
 class Book(SQLObject):
-    name = UnicodeCol()
+    author = ForeignKey('Author')
+    genre = ForeignKey('Genre')
+    title = UnicodeCol()
+    series = UnicodeCol()
+    ser_no = IntCol()
+    file = StringCol()
+    size = IntCol()
+    lib_id = StringCol()
+    deleted = BoolCol()
+    ext = ForeignKey('Extension')
+    date = DateCol()
+    language = ForeignKey('Language')
 
 
 class Extension(SQLObject):
-    name = StringCol()
+    name = StringCol(unique=True)
+    count = IntCol()
+
+
+class Genre(SQLObject):
+    name = StringCol(unique=True)
+    title = UnicodeCol()
     count = IntCol()
 
 
 class Language(SQLObject):
-    name = StringCol()
+    name = StringCol(unique=True)
     count = IntCol()
 
 
+def init_db():
+    try:
+        Book.select()[0]
+    except IndexError:  # Table exists but is empty
+        return
+    except dberrors.Error:
+        for table in Author, Extension, Genre, Language, Book:
+            table.createTable()
+    else:
+        return
+
+
 if __name__ == '__main__':
     print "DB dirs:", db_dirs
     if db_uri: