Fix(sqlite): Execute VACUUM outside transaction

[m_librarian.git] / m_librarian / glst.py

diff --git a/m_librarian/glst.py b/m_librarian/glst.py
index 2de36c3a92180b7abaf1b7b76079e51938e93c06..5864d7f9687ab4a318b4d39ad20e1d72d7a1a7f3 100755 (executable)
--- a/m_librarian/glst.py
+++ b/m_librarian/glst.py
@@ -1,12 +1,13 @@
 #! /usr/bin/env python
 
-__all__ = ['import_glst']
-
+from __future__ import print_function
 import codecs
 import os
 from sqlobject import sqlhub, SQLObjectNotFound
 from .db import Genre
 
+__all__ = ['import_glst']
+
 
 def parse_glst_file(glst_filename):
     glst_file = codecs.open(glst_filename, 'r', 'utf-8')
@@ -47,18 +48,22 @@ 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)
+    connection = sqlhub.processConnection
+    if connection.dbName == 'sqlite':
+        connection.query("VACUUM")
 
 
 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()