requested changes applied

Author: xb058t

web/client/codechecker_client/cmd_line_client.py

@@ -641,50 +641,46 @@ def handle_list_runs(args):
     runs = get_run_data(client, run_filter, sort_mode)
 
     if hasattr(args, 'enabled_checkers') and args.enabled_checkers:
-        results = get_run_results(client,
-                                  [run.runId for run in runs],
-                                  constants.MAX_QUERY_SIZE,
-                                  0,
-                                  None,
-                                  ttypes.ReportFilter(),
-                                  None,
-                                  None)
-        enabled_checkers = {}
-        for result in results:
-            if result.analyzerName not in enabled_checkers:
-                enabled_checkers[result.analyzerName] = set()
-            enabled_checkers[result.analyzerName].add(result.checkerId)
+        enabled_checkers: Dict[str, List[str]] = {}
+        for run in runs:
+            info_list: List[ttypes.AnalysisInfo] = client.getAnalysisInfo(
+                ttypes.AnalysisInfoFilter(runId=run.runId),
+                constants.MAX_QUERY_SIZE,
+                0)
+            for info in info_list:
+                analyzers = info.checkers.keys()
+                for analyzer in analyzers:
+                    if analyzer not in enabled_checkers:
+                        enabled_checkers[analyzer] = []
+
+                    checkers = info.checkers.get(analyzer, {})
+                    for checker in checkers:
+                        if checkers[checker].enabled:
+                            enabled_checkers[analyzer].append(checker)
 
         if args.output_format == 'plaintext':
-            print("Enabled checkers:")
             for analyzer, checkers in enabled_checkers.items():
                 print(analyzer + ":")
                 for checker in checkers:
                     print("  " + checker)
-
         elif args.output_format == 'csv':
-            separator = ','
+            separator = ';'
             print("Analyzer" + separator + "Checker")
             for analyzer, checkers in enabled_checkers.items():
                 for checker in checkers:
                     print(analyzer + separator + checker)
-
         elif args.output_format == 'json':
-            converted = {}
-            for analyzer, checkers in enabled_checkers.items():
-                converted[analyzer] = list(checkers)
-            print(json.dumps(converted, indent=2))
-
+            print(json.dumps(enabled_checkers, indent=4))
         elif args.output_format == 'table':
             header = ['Analyzer', 'Checker']
             rows = [
                 (analyzer, checker)
                 for analyzer, checkers in enabled_checkers.items()
                 for checker in checkers]
             print(twodim.to_str(args.output_format, header, rows))
-
         else:
             LOG.error("Unsupported output format: %s", args.output_format)
+        return
 
     if args.output_format == 'json':
         # This json is different from the json format printed by the
@@ -729,6 +725,7 @@ def handle_list_runs(args):
                          codechecker_version))
 
         print(twodim.to_str(args.output_format, header, rows))
+    return
 
 
 def handle_list_results(args):

web/client/codechecker_client/helpers/results.py

@@ -196,3 +196,7 @@ def getAnalysisStatistics(self, run_id, run_history_id):
     @thrift_client_call
     def storeAnalysisStatistics(self, run_name, zip_file):
         pass
+
+    @thrift_client_call
+    def getAnalysisInfo(self, analysis_info_filter, limit, offset):
+        pass