Check if DB pathname starts with the current directory

[m_librarian.git] / m_librarian / db.py

diff --git a/m_librarian/db.py b/m_librarian/db.py
index 93631679139da91072146144debc2419950e5a1d..56b194d0ac5621145d935d4343468249e7174adf 100755 (executable)
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -1,16 +1,16 @@
 #! /usr/bin/env python
 
-__all__ = ['Author', 'Book', 'Extension', 'Genre', 'Language',
-           'AuthorBook', 'BookGenre', 'open_db', 'init_db',
-           'insert_name', 'insert_author', 'update_counters',
-           ]
-
 import os
 from sqlobject import SQLObject, StringCol, UnicodeCol, IntCol, BoolCol, \
     ForeignKey, DateCol, DatabaseIndex, RelatedJoin, \
     connectionForURI, sqlhub, SQLObjectNotFound, dberrors
 from .config import get_config
 
+__all__ = ['Author', 'Book', 'Extension', 'Genre', 'Language',
+           'AuthorBook', 'BookGenre', 'open_db', 'init_db',
+           'insert_name', 'insert_author', 'update_counters',
+           ]
+
 
 class Author(SQLObject):
     surname = UnicodeCol(notNull=True)
@@ -76,13 +76,13 @@ class BookGenre(SQLObject):
 
 
 class Extension(SQLObject):
-    name = StringCol(notNull=True, unique=True)
+    name = UnicodeCol(notNull=True, unique=True)
     count = IntCol(notNull=True)
     count_idx = DatabaseIndex(count)
 
 
 class Genre(SQLObject):
-    name = StringCol(notNull=True, unique=True)
+    name = UnicodeCol(notNull=True, unique=True)
     title = UnicodeCol(notNull=True)
     count = IntCol(notNull=True)
     books = RelatedJoin('Book', otherColumn='book_id',
@@ -93,7 +93,7 @@ class Genre(SQLObject):
 
 
 class Language(SQLObject):
-    name = StringCol(notNull=True, unique=True)
+    name = UnicodeCol(notNull=True, unique=True)
     count = IntCol(notNull=True)
     count_idx = DatabaseIndex(count)
 
@@ -142,11 +142,21 @@ 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):
+        db_uri = 'sqlite://' + os.path.abspath(db_uri).replace(os.sep, '/')
+
     sqlhub.processConnection = connection = connectionForURI(db_uri)
 
     if connection.dbName == 'sqlite':
         def lower(s):
-            return s.lower()
+            if isinstance(s, basestring):
+                return s.lower()
+            return s
 
         sqlite = connection.module
 
@@ -198,13 +208,13 @@ def update_counters():
         author.count = AuthorBook.select(AuthorBook.q.author == author).count()
 
     for ext in Extension.select():
-        ext.count = Book.select(Book.q.extension == ext.name).count()
+        ext.count = Book.select(Book.q.extension == ext.id).count()
 
     for genre in Genre.select():
         genre.count = BookGenre.select(BookGenre.q.genre == genre).count()
 
     for language in Language.select():
-        language.count = Book.select(Book.q.language == language.name).count()
+        language.count = Book.select(Book.q.language == language.id).count()
 
 
 def test():