Remove library.cli completely

setup/test.py

@@ -8,7 +8,7 @@ import unittest
 
 from setup import Command
 
-TEST_MODULES = frozenset('srv db polish opf css docx cfi matcher icu smartypants build misc library'.split())
+TEST_MODULES = frozenset('srv db polish opf css docx cfi matcher icu smartypants build misc dbcli'.split())
 
 
 def find_tests(which_tests=None):
@@ -66,8 +66,8 @@ def find_tests(which_tests=None):
         a(find_tests())
         from calibre.utils.shared_file import find_tests
         a(find_tests())
-    if ok('library'):
-        from calibre.library.test_cli import find_tests
+    if ok('dbcli'):
+        from calibre.db.cli.tests import find_tests
         a(find_tests())
 
     tests = unittest.TestSuite(ans)

src/calibre/db/cli/cmd_check_library.py

@@ -4,6 +4,9 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
+import csv
+import sys
+
 readonly = False
 version = 0  # change this if you change signature of implementation()
 
@@ -17,6 +20,24 @@ def option_parser(get_parser, args):
     pass
 
 
+def _print_check_library_results(checker, check, as_csv=False, out=sys.stdout):
+    attr = check[0]
+    list = getattr(checker, attr, None)
+    if list is None:
+        return
+
+    if as_csv:
+        to_output = [(check[1], i[0], i[1]) for i in list]
+        csv_print = csv.writer(out)
+        for line in to_output:
+            csv_print.writerow(line)
+
+    else:
+        print(check[1], file=out)
+        for i in list:
+            print('    %-40.40s - %-40.40s' % (i[0], i[1]), file=out)
+
+
 def main(opts, args, dbctx):
     raise NotImplementedError('TODO: implement this')
     return 0

src/calibre/db/cli/tests.py

@@ -14,7 +14,7 @@ import unittest
 from cStringIO import StringIO
 
 
-from calibre.library.cli import _print_check_library_results
+from calibre.db.cli.cmd_check_library import _print_check_library_results
 
 
 class Checker(object):