X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fglst.py;h=a4ac27d723b4b991ea70b1d6c625f7e1b91de224;hb=d6ef04787834ffeded257d96af4c965ca7055a51;hp=6ff58de3d93fef990806ce1e4638d8ec5299ed21;hpb=75821715e295abf0f67faaf80be3f03ac939d47c;p=m_librarian.git

diff --git a/m_librarian/glst.py b/m_librarian/glst.py
index 6ff58de..a4ac27d 100755
--- a/m_librarian/glst.py
+++ b/m_librarian/glst.py
@@ -5,10 +5,11 @@ 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()
@@ -21,10 +22,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):
@@ -40,23 +40,25 @@ 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 in ('postgres', 'sqlite'):
+        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():
+    return sqlhub.doInTransaction(_import_glst)
 
 
 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()