cli cleanup to use the class

errata_tool/cli/batch.py

@@ -1,4 +1,4 @@
-from errata_tool.connector import ErrataConnector
+from errata_tool.batch import BatchSearch
 
 
 def add_parser(subparsers):
@@ -20,45 +20,35 @@ def add_parser(subparsers):
 
     # "list"
     list_parser = sub.add_parser('list')
-    list_parser.set_defaults(func=list_func)
-
-
-def get_errata_by_batch(connector, batch_name_or_id):
-    """search for and return list of errata by name or id of batch"""
-    args = {}
 
-    try:
-        args['id'] = int(batch_name_or_id)
-    except ValueError:
-        args['name'] = batch_name_or_id
-
-    data = connector.get_filter('/api/v1/batches', 'filter', **args)
-
-    return data
+    list_parser.add_argument('--summary', action='store_true',
+                             help="show a bit more details for each advisory"
+                             " and list of advisory ids")
+    list_parser.set_defaults(func=list_func)
 
 
 def get(args):
-    et = ErrataConnector()
-    e = get_errata_by_batch(et, args.batch_name_or_id)
+    bs = BatchSearch()
+
+    batch_result = bs.search(args.batch_name_or_id)
 
     # show the raw json returned
-    print(e)
+    print(batch_result.data)
+
     if args.summary:
-        print("batch: {0} [{1}]".format(e['data'][0]['attributes']['name'], e['data'][0]['id']))
+        print(batch_result)
+
 
-        print("Release: {0} [{1}]".format(e['data'][0]['relationships']['release']['name'],
-            e['data'][0]['relationships']['release']['id']))
+def list_func(args):
+    bs = BatchSearch()
 
-        #errata_list = e['data'][0]['relationships']['errata']
-        #print(errata_list)
-        #errata_id_list = [ i for i in errata_list]
-        #print(errata_id_list)
-        id_list = [advisory['id'] for advisory in e['data'][0]['relationships']['errata']]
-        print("Advisories: " + ",".join([str(entry) for entry in id_list]))
+    batch_list = bs.list()
 
+    print("Found {0} batches".format(len(batch_list)))
+    print(bs._data)
 
+    print(batch_list)
 
-def list_func(args):
-    et = ErrataConnector()
-    e = et._get('/api/v1/batches')
-    print(e)
+    if args.summary:
+        for batch_result in batch_list:
+            print(batch_result)