X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fdb.py;h=fc3325f516386dfd299758dfab8668d1ae6d9028;hb=fdede95cc489c5519b2e38130d66d4c01775e341;hp=628675ef1e2c9d3ce4573ba1240b542784d5e499;hpb=9b4f50c79b856146e1d90444df10e64797869997;p=m_librarian.git

diff --git a/m_librarian/db.py b/m_librarian/db.py
index 628675e..fc3325f 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)
@@ -147,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:
@@ -206,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():