X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=m_librarian%2Fglst.py;h=5864d7f9687ab4a318b4d39ad20e1d72d7a1a7f3;hb=41c3f360f44b3680c1a3a5ca9defa79a203b811a;hp=a4ac27d723b4b991ea70b1d6c625f7e1b91de224;hpb=d6ef04787834ffeded257d96af4c965ca7055a51;p=m_librarian.git diff --git a/m_librarian/glst.py b/m_librarian/glst.py index a4ac27d..5864d7f 100755 --- a/m_librarian/glst.py +++ b/m_librarian/glst.py @@ -1,5 +1,6 @@ #! /usr/bin/env python +from __future__ import print_function import codecs import os from sqlobject import sqlhub, SQLObjectNotFound @@ -47,18 +48,22 @@ 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) return old_fb2 + old_nonfb2, new_fb2 + new_nonfb2 def import_glst(): return sqlhub.doInTransaction(_import_glst) + connection = sqlhub.processConnection + if connection.dbName == 'sqlite': + connection.query("VACUUM") 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()