Feat(db): Add book.genre_list_* properties

[m_librarian.git] / m_librarian / db.py

diff --git a/m_librarian/db.py b/m_librarian/db.py
index ecabfdbcfd146cf583ea2d8aa6dcfe1e1a7d1be0..88b0b11609632658e18c69eb5be00acf3b2f277e 100755 (executable)
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -5,6 +5,7 @@ import os
 from sqlobject import SQLObject, StringCol, UnicodeCol, IntCol, BoolCol, \
     ForeignKey, DateCol, DatabaseIndex, RelatedJoin, \
     connectionForURI, sqlhub, SQLObjectNotFound, dberrors
+from .compat import string_type
 from .config import get_config
 
 __all__ = ['Author', 'Book', 'Extension', 'Genre', 'Language',
@@ -52,7 +53,7 @@ class Book(SQLObject):
     series = UnicodeCol(notNull=True)
     ser_no = IntCol()
     archive = StringCol(notNull=True)
-    file = StringCol(notNull=True)
+    file = UnicodeCol(notNull=True)
     size = IntCol(notNull=True)
     lib_id = StringCol(notNull=True)
     deleted = BoolCol(notNull=True)
@@ -71,6 +72,30 @@ class Book(SQLObject):
     date_idx = DatabaseIndex(date)
     language_idx = DatabaseIndex(language)
 
+    @property
+    def author1(self):
+        return self.authors[0].fullname
+
+    @property
+    def author_list(self):
+        return u', '.join([a.fullname for a in self.authors])
+
+    @property
+    def genre1name(self):
+        return self.genres[0].name
+
+    @property
+    def genre1title(self):
+        return self.genres[0].title
+
+    @property
+    def genre_name_list(self):
+        return u', '.join([g.name for g in self.genres])
+
+    @property
+    def genre_title_list(self):
+        return u', '.join([g.title for g in self.genres])
+
 
 class BookGenre(SQLObject):
     class sqlmeta:
@@ -144,10 +169,7 @@ def find_sqlite_dburi(db_dirs=None):
 
 def open_db(db_uri=None):
     if db_uri is None:
-        try:
-            db_uri = get_config().get('database', 'URI')
-        except:
-            db_uri = find_sqlite_dburi()
+        db_uri = get_config().get('database', 'URI') or find_sqlite_dburi()
 
     if '://' not in db_uri:
         db_uri = 'sqlite://' + os.path.abspath(db_uri).replace(os.sep, '/')
@@ -156,7 +178,7 @@ def open_db(db_uri=None):
 
     if connection.dbName == 'sqlite':
         def lower(s):
-            if isinstance(s, basestring):
+            if isinstance(s, string_type):
                 return s.lower()
             return s
 
@@ -205,18 +227,42 @@ def insert_author(surname, name, misc_name):
         return Author(surname=surname, name=name, misc_name=misc_name, count=0)
 
 
-def update_counters():
+def update_counters(pbar_cb=None):
+    if pbar_cb:
+        count = 0
+        for table in Author, Extension, Genre, Language:
+            count += table.select().count()
+        pbar_cb.set_max(count)
+
+    if pbar_cb:
+        count = 0
+
     for author in Author.select():
         author.count = AuthorBook.select(AuthorBook.q.author == author).count()
+        if pbar_cb:
+            count += 1
+            pbar_cb.display(count)
 
     for ext in Extension.select():
         ext.count = Book.select(Book.q.extension == ext.id).count()
+        if pbar_cb:
+            count += 1
+            pbar_cb.display(count)
 
     for genre in Genre.select():
         genre.count = BookGenre.select(BookGenre.q.genre == genre).count()
+        if pbar_cb:
+            count += 1
+            pbar_cb.display(count)
 
     for language in Language.select():
         language.count = Book.select(Book.q.language == language.id).count()
+        if pbar_cb:
+            count += 1
+            pbar_cb.display(count)
+
+    if pbar_cb:
+        pbar_cb.close()
 
 
 def test():
@@ -224,5 +270,6 @@ def test():
     print("DB dirs:", db_dirs)
     print("DB URI:", find_sqlite_dburi())
 
+
 if __name__ == '__main__':
     test()