X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fdb.py;h=064ca9a0d8a75cd89667feaddfecc9be450ff358;hb=7b3352daa8d57878f0d727f1a4f4b1f2fc9609da;hp=9ae5ce0c539239bc563508deaad15b6fb5e5bdd5;hpb=35190cea6dda6d65537b110f82a5d3f5277bd94c;p=m_librarian.git

diff --git a/m_librarian/db.py b/m_librarian/db.py
index 9ae5ce0..064ca9a 100755
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -2,9 +2,11 @@
 
 from __future__ import print_function
 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
 
@@ -53,7 +55,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)
@@ -72,6 +74,38 @@ 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])
+
+    @property
+    def ext(self):
+        return self.extension.name
+
+    @property
+    def lang(self):
+        return self.language.name
+
 
 class BookGenre(SQLObject):
     class sqlmeta:
@@ -145,10 +179,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 Exception:
-            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, '/')