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

diff --git a/m_librarian/glst.py b/m_librarian/glst.py
index a4ac27d..fedb27b 100755
--- a/m_librarian/glst.py
+++ b/m_librarian/glst.py
@@ -1,6 +1,8 @@
 #! /usr/bin/env python
 
+from __future__ import print_function
 import codecs
+from glob import glob
 import os
 from sqlobject import sqlhub, SQLObjectNotFound
 from .db import Genre
@@ -42,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()