X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fdb.py;h=064ca9a0d8a75cd89667feaddfecc9be450ff358;hb=481aa96f41354b071fd4e361c90c33015d8fb8f3;hp=fc3325f516386dfd299758dfab8668d1ae6d9028;hpb=224d6b313acf206e754e8ca1678893c387074be9;p=m_librarian.git diff --git a/m_librarian/db.py b/m_librarian/db.py index fc3325f..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 @@ -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, '/')