X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fdb.py;h=9ae5ce0c539239bc563508deaad15b6fb5e5bdd5;hb=c36e520339e5c0043fa6861f43ff5915999eb980;hp=ecabfdbcfd146cf583ea2d8aa6dcfe1e1a7d1be0;hpb=061a45aba1f91ec167eb9ac283a4c0a0afb52798;p=m_librarian.git

diff --git a/m_librarian/db.py b/m_librarian/db.py
index ecabfdb..9ae5ce0 100755
--- a/m_librarian/db.py
+++ b/m_librarian/db.py
@@ -5,6 +5,7 @@ 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',
@@ -146,7 +147,7 @@ def open_db(db_uri=None):
     if db_uri is None:
         try:
             db_uri = get_config().get('database', 'URI')
-        except:
+        except Exception:
             db_uri = find_sqlite_dburi()
 
     if '://' not in db_uri:
@@ -156,7 +157,7 @@ def open_db(db_uri=None):
 
     if connection.dbName == 'sqlite':
         def lower(s):
-            if isinstance(s, basestring):
+            if isinstance(s, string_type):
                 return s.lower()
             return s
 
@@ -205,18 +206,42 @@ def insert_author(surname, name, misc_name):
         return Author(surname=surname, name=name, misc_name=misc_name, count=0)
 
 
-def update_counters():
+def update_counters(pbar_cb=None):
+    if pbar_cb:
+        count = 0
+        for table in Author, Extension, Genre, Language:
+            count += table.select().count()
+        pbar_cb.set_max(count)
+
+    if pbar_cb:
+        count = 0
+
     for author in Author.select():
         author.count = AuthorBook.select(AuthorBook.q.author == author).count()
+        if pbar_cb:
+            count += 1
+            pbar_cb.display(count)
 
     for ext in Extension.select():
         ext.count = Book.select(Book.q.extension == ext.id).count()
+        if pbar_cb:
+            count += 1
+            pbar_cb.display(count)
 
     for genre in Genre.select():
         genre.count = BookGenre.select(BookGenre.q.genre == genre).count()
+        if pbar_cb:
+            count += 1
+            pbar_cb.display(count)
 
     for language in Language.select():
         language.count = Book.select(Book.q.language == language.id).count()
+        if pbar_cb:
+            count += 1
+            pbar_cb.display(count)
+
+    if pbar_cb:
+        pbar_cb.close()
 
 
 def test():
@@ -224,5 +249,6 @@ def test():
     print("DB dirs:", db_dirs)
     print("DB URI:", find_sqlite_dburi())
 
+
 if __name__ == '__main__':
     test()