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 867d4136590e2a0f4ccee0c429e0e7e270f065bf..6b2e0904157870d2de8c52298e31a64b736c3a0a 100755 (executable)
--- a/m_librarian/glst.py
+++ b/m_librarian/glst.py
@@ -1,16 +1,16 @@
 #! /usr/bin/env python
 
-__all__ = ['import_data']
-
+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')
-    genre_list = []
     try:
         for line in glst_file:
             line = line.strip()
@@ -23,10 +23,9 @@ def parse_glst_file(glst_filename):
                 name, title = parts[1].split(';', 1)
             except (IndexError, ValueError):
                 continue
-            genre_list.append((name, title))
+            yield name, title
     finally:
         glst_file.close()
-    return genre_list
 
 
 def import_glst_file(glst_filename):
@@ -42,23 +41,30 @@ def import_glst_file(glst_filename):
     return old, new
 
 
-def _import_data():
+def _import_glst():
     ml_dir = os.path.dirname(__file__)
     old_fb2, new_fb2 = import_glst_file(
-        os.path.join(ml_dir, 'data', 'genres_fb2.glst'))
+        os.path.join(ml_dir, 'glst', 'genres_fb2.glst'))
     old_nonfb2, new_nonfb2 = import_glst_file(
-        os.path.join(ml_dir, 'data', 'genres_nonfb2.glst'))
-    sqlhub.processConnection.query("VACUUM %s" % Genre.sqlmeta.table)
+        os.path.join(ml_dir, 'glst', 'genres_nonfb2.glst'))
+    connection = sqlhub.processConnection
+    if connection.dbName == 'postgres':
+        connection.query("VACUUM %s" % Genre.sqlmeta.table)
     return old_fb2 + old_nonfb2, new_fb2 + new_nonfb2
 
 
-def import_data():
-    return sqlhub.doInTransaction(_import_data)
+def 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, 'data', 'genres_fb2.glst'))
+    print(parse_glst_file(os.path.join(ml_dir, 'glst', 'genres_fb2.glst')))
+
 
 if __name__ == '__main__':
     test()