X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fdb.py;h=42735afe8f3b9b2fa1c12b1a90d2b72ddcda9be1;hb=51aa2c71d5bebc4be0c98f00c97d2f47fcde4d3a;hp=56b194d0ac5621145d935d4343468249e7174adf;hpb=2aec5f3920d5ba9f7add67a1980e4321f5b7689b;p=m_librarian.git

diff --git a/m_librarian/db.py b/m_librarian/db.py
index 56b194d..42735af 100755
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -1,9 +1,11 @@
 #! /usr/bin/env python
 
+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
 
 __all__ = ['Author', 'Book', 'Extension', 'Genre', 'Language',
@@ -20,6 +22,12 @@ class Author(SQLObject):
     books = RelatedJoin('Book', otherColumn='book_id',
                         intermediateTable='author_book',
                         createRelatedTable=False)
+
+    @property
+    def fullname(self):
+        fullnames = filter(None, (self.surname, self.name, self.misc_name))
+        return ' '.join(fullnames)
+
     full_name_idx = DatabaseIndex(surname, name, misc_name, unique=True)
     count_idx = DatabaseIndex(count)
 
@@ -124,7 +132,7 @@ def find_sqlite_dburi(db_dirs=None):
     else:
         # octal; -rw-------;
         # make the database file/directory readable/writeable only by the user
-        os.umask(0066)
+        os.umask(0o66)
         db_dir = db_dirs[0]
         try:
             os.makedirs(db_dir)
@@ -142,19 +150,14 @@ def open_db(db_uri=None):
         except:
             db_uri = find_sqlite_dburi()
 
-    if db_uri.startswith(os.sep) \
-            or os.altsep and db_uri.startswith(os.altsep) \
-            or db_uri.startswith(os.pardir + os.sep) \
-            or os.altsep and db_uri.startswith(os.pardir + os.altsep) \
-            or db_uri.startswith(os.curdir + os.sep) \
-            or os.altsep and db_uri.startswith(os.curdir + os.altsep):
+    if '://' not in db_uri:
         db_uri = 'sqlite://' + os.path.abspath(db_uri).replace(os.sep, '/')
 
     sqlhub.processConnection = connection = connectionForURI(db_uri)
 
     if connection.dbName == 'sqlite':
         def lower(s):
-            if isinstance(s, basestring):
+            if isinstance(s, string_type):
                 return s.lower()
             return s
 
@@ -219,8 +222,8 @@ def update_counters():
 
 def test():
     db_dirs = find_sqlite_db_dirs()
-    print "DB dirs:", db_dirs
-    print "DB URI:", find_sqlite_dburi()
+    print("DB dirs:", db_dirs)
+    print("DB URI:", find_sqlite_dburi())
 
 if __name__ == '__main__':
     test()