X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=m_librarian%2Fglst.py;h=cf581b1d14c1f0c6a1a70891fbb291b4f5f31971;hb=9b4f50c79b856146e1d90444df10e64797869997;hp=b94381377e35072e98817665b18042cc2ac9c55a;hpb=1129afc4d0d93b43886522af59bacea93ec3d54d;p=m_librarian.git

diff --git a/m_librarian/glst.py b/m_librarian/glst.py
index b943813..cf581b1 100755
--- a/m_librarian/glst.py
+++ b/m_librarian/glst.py
@@ -1,16 +1,16 @@
 #! /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')
-    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):
@@ -49,8 +48,10 @@ 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)
+    elif connection.dbName == 'sqlite':
+        connection.query("VACUUM")
     return old_fb2 + old_nonfb2, new_fb2 + new_nonfb2
 
 
@@ -60,7 +61,8 @@ def import_glst():
 
 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()