Fix(glst): Return counter after VACUUM

[m_librarian.git] / m_librarian / glst.py

diff --git a/m_librarian/glst.py b/m_librarian/glst.py
index a4ac27d723b4b991ea70b1d6c625f7e1b91de224..6b2e0904157870d2de8c52298e31a64b736c3a0a 100755 (executable)
--- a/m_librarian/glst.py
+++ b/m_librarian/glst.py
@@ -1,5 +1,6 @@
 #! /usr/bin/env python
 
+from __future__ import print_function
 import codecs
 import os
 from sqlobject import sqlhub, SQLObjectNotFound
@@ -47,18 +48,23 @@ def _import_glst():
     old_nonfb2, new_nonfb2 = import_glst_file(
         os.path.join(ml_dir, 'glst', 'genres_nonfb2.glst'))
     connection = sqlhub.processConnection
-    if connection.dbName in ('postgres', 'sqlite'):
+    if connection.dbName == 'postgres':
         connection.query("VACUUM %s" % Genre.sqlmeta.table)
     return old_fb2 + old_nonfb2, new_fb2 + new_nonfb2
 
 
 def import_glst():
-    return sqlhub.doInTransaction(_import_glst)
+    count_old, count_new = sqlhub.doInTransaction(_import_glst)
+    connection = sqlhub.processConnection
+    if connection.dbName == 'sqlite':
+        connection.query("VACUUM")
+    return count_old, count_new
 
 
 def test():
     ml_dir = os.path.dirname(__file__)
-    print parse_glst_file(os.path.join(ml_dir, 'glst', 'genres_fb2.glst'))
+    print(parse_glst_file(os.path.join(ml_dir, 'glst', 'genres_fb2.glst')))
+
 
 if __name__ == '__main__':
     test()