Feat(glst): Report imported glst counter

diff --git a/scripts/ml-import.py b/scripts/ml-import.py
index 07c7fbb47e36f69122f81746616380ac737f3f99..bc4b6b39ca7299cd2c17827742422b09812cb14c 100755 (executable)
--- a/scripts/ml-import.py
+++ b/scripts/ml-import.py
@@ -26,7 +26,14 @@ if __name__ == '__main__':
 
     open_db(args.database)
     init_db()
-    import_glst()
+
+    count_old, count_new = import_glst()
+    if count_old:
+        print("Imported %d genres (ignored %d existing)" % (
+            count_new, count_old))
+    else:
+        print("Imported %d genres" % count_new)
+
     use_pbar = ttyProgressBar and not args.no_pbar and sys.stdout.isatty()
     for inpx in args.inpx:
         if use_pbar:

diff --git a/scripts/ml-initdb.py b/scripts/ml-initdb.py
index 6535d4559827ac37b7b4ffa36925f39604ff03b5..71d3598e512bdd8475833b8ef44666d81d457696 100755 (executable)
--- a/scripts/ml-initdb.py
+++ b/scripts/ml-initdb.py
@@ -1,6 +1,5 @@
 #! /usr/bin/env python
 
-from __future__ import print_function
 import argparse
 from m_librarian.config import get_config
 from m_librarian.db import open_db, init_db
@@ -17,8 +16,9 @@ if __name__ == '__main__':
 
     open_db(args.database)
     init_db()
-    old, new = import_glst()
-    if old:
-        print("Imported %d genres (ignored %d existing)" % (new, old))
+    count_old, count_new = import_glst()
+    if count_old:
+        print("Imported %d genres (ignored %d existing)" % (
+            count_new, count_old))
     else:
-        print("Imported %d genres" % new)
+        print("Imported %d genres" % count_new)