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

diff --git a/m_librarian/glst.py b/m_librarian/glst.py
index b943813..fedb27b 100755
--- a/m_librarian/glst.py
+++ b/m_librarian/glst.py
@@ -1,16 +1,17 @@
 #! /usr/bin/env python
 
-__all__ = ['import_glst']
-
+from __future__ import print_function
 import codecs
+from glob import glob
 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 +24,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):
@@ -44,23 +44,35 @@ def import_glst_file(glst_filename):
 
 def _import_glst():
     ml_dir = os.path.dirname(__file__)
-    old_fb2, new_fb2 = import_glst_file(
-        os.path.join(ml_dir, 'glst', 'genres_fb2.glst'))
-    old_nonfb2, new_nonfb2 = import_glst_file(
-        os.path.join(ml_dir, 'glst', 'genres_nonfb2.glst'))
+    count_old = count_new = 0
+    for glst_file in glob(os.path.join(ml_dir, 'glst', '*.glst')):
+        _count_old, _count_new = import_glst_file(glst_file)
+        count_old += _count_old
+        count_new += _count_new
     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
+    return count_old, count_new
 
 
 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'))
+    for i, (name, title) in enumerate(parse_glst_file(
+        os.path.join(ml_dir, 'glst', 'genres_fb2_flibusta.glst')
+    )):
+        if i < 5:
+            print(name, title)
+        else:
+            break
+
 
 if __name__ == '__main__':
     test()