X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fdb.py;h=9081a422e0389b0da6f60c7cb94487b8ca3ed061;hb=12e046208dda7a46efc4b02dde9a1cb507a940ba;hp=9ae5ce0c539239bc563508deaad15b6fb5e5bdd5;hpb=35190cea6dda6d65537b110f82a5d3f5277bd94c;p=m_librarian.git diff --git a/m_librarian/db.py b/m_librarian/db.py index 9ae5ce0..9081a42 100755 --- a/m_librarian/db.py +++ b/m_librarian/db.py @@ -53,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) @@ -72,6 +72,10 @@ class Book(SQLObject): date_idx = DatabaseIndex(date) language_idx = DatabaseIndex(language) + @property + def author1(self): + return self.authors[0].fullname + class BookGenre(SQLObject): class sqlmeta: @@ -145,10 +149,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, '/')