Fix Db schema

[m_librarian.git] / m_librarian / db.py

diff --git a/m_librarian/db.py b/m_librarian/db.py
index e02b95bcad56c13d033b52af576245877d3e9798..6888ab8d418fe7f0c3845d244c95daa7f5e18a28 100755 (executable)
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -1,8 +1,13 @@
 #! /usr/bin/env python
 
+__all__ = ['Author', 'Book', 'Extension', 'Genre', 'Language',
+           'init_db', 'insert_name',
+           ]
+
 import os
 from sqlobject import SQLObject, StringCol, UnicodeCol, IntCol, BoolCol, \
-    ForeignKey, DateCol, connectionForURI, sqlhub, dberrors
+    ForeignKey, DateCol, RelatedJoin, \
+    connectionForURI, sqlhub, SQLObjectNotFound, dberrors
 from .config import ml_conf
 
 try:
@@ -32,7 +37,8 @@ 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)
 
@@ -40,19 +46,21 @@ sqlhub.processConnection = connectionForURI(db_uri)
 class Author(SQLObject):
     name = UnicodeCol(unique=True)
     count = IntCol()
+    books = RelatedJoin('Book', otherColumn='book_id')
 
 
 class Book(SQLObject):
-    author = ForeignKey('Author')
-    genre = ForeignKey('Genre')
+    authors = RelatedJoin('Author')
+    genres = RelatedJoin('Genre')
     title = UnicodeCol()
     series = UnicodeCol()
     ser_no = IntCol()
+    archive = StringCol()
     file = StringCol()
     size = IntCol()
     lib_id = StringCol()
     deleted = BoolCol()
-    ext = ForeignKey('Extension')
+    extension = ForeignKey('Extension')
     date = DateCol()
     language = ForeignKey('Language')
 
@@ -66,6 +74,7 @@ class Genre(SQLObject):
     name = StringCol(unique=True)
     title = UnicodeCol()
     count = IntCol()
+    books = RelatedJoin('Book', otherColumn='book_id')
 
 
 class Language(SQLObject):
@@ -85,7 +94,17 @@ def init_db():
         return
 
 
-if __name__ == '__main__':
+def insert_name(table, name):
+    try:
+        return table.byName(name)
+    except SQLObjectNotFound:
+        return table(name=name, count=0)
+
+
+def test():
     print "DB dirs:", db_dirs
     if db_uri:
         print "DB URI:", db_uri
+
+if __name__ == '__main__':
+    test()