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

diff --git a/m_librarian/glst.py b/m_librarian/glst.py
index cf581b1..206dcc4 100755
--- a/m_librarian/glst.py
+++ b/m_librarian/glst.py
@@ -1,8 +1,10 @@
 #! /usr/bin/env python
 
 from __future__ import print_function
+from glob import glob
 import codecs
 import os
+
 from sqlobject import sqlhub, SQLObjectNotFound
 from .db import Genre
 
@@ -43,25 +45,34 @@ 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 == 'postgres':
         connection.query("VACUUM %s" % Genre.sqlmeta.table)
-    elif connection.dbName == 'sqlite':
-        connection.query("VACUUM")
-    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__':