Make it work with multiple directories

Author: Szelethus

web/client/codechecker_client/cmd/store.py

@@ -426,31 +426,31 @@ def assemble_zip(inputs,
     contanining analysis related information into a zip file which
     will be sent to the server.
     """
-    files_to_compress = set()
+    files_to_compress: Dict[str, set] = defaultdict(set)
     analyzer_result_file_paths = []
     stats = StorageZipStatistics()
 
-    # resultfile_to_metadata = dict()
-
     for dir_path, file_paths in report_file.analyzer_result_files(inputs):
         analyzer_result_file_paths.extend(file_paths)
 
         metadata_file_path = os.path.join(dir_path, 'metadata.json')
         if os.path.exists(metadata_file_path):
-            files_to_compress.add(metadata_file_path)
-            # for src_dir_path, mip in MetadataInfoParser(metadata_file_path):
+            files_to_compress[os.path.dirname(metadata_file_path)] \
+                .add(metadata_file_path)
 
         skip_file_path = os.path.join(dir_path, 'skip_file')
         if os.path.exists(skip_file_path):
             with open(skip_file_path, 'r') as f:
                 LOG.info("Found skip file %s with the following content:\n%s",
                          skip_file_path, f.read())
 
-            files_to_compress.add(skip_file_path)
+            files_to_compress[os.path.dirname(skip_file_path)] \
+                .add(skip_file_path)
 
         review_status_file_path = os.path.join(dir_path, 'review_status.yaml')
         if os.path.exists(review_status_file_path):
-            files_to_compress.add(review_status_file_path)
+            files_to_compress[os.path.dirname(review_status_file_path)]\
+                .add(review_status_file_path)
 
     LOG.debug(f"Processing {len(analyzer_result_file_paths)} report files ...")
 
@@ -463,7 +463,7 @@ def assemble_zip(inputs,
     changed_files = set()
     file_paths = set()
     file_report_positions: FileReportPositions = defaultdict(set)
-    unique_reports = dict()
+    unique_reports: Dict[str, Dict[str, List[Report]]] = defaultdict(dict)
 
     unique_report_hashes = set()
     for file_path, reports in analyzer_result_file_reports.items():
@@ -477,7 +477,8 @@ def assemble_zip(inputs,
             report_path_hash = get_report_path_hash(report)
             if report_path_hash not in unique_report_hashes:
                 unique_report_hashes.add(report_path_hash)
-                unique_reports.setdefault(report.analyzer_name, []) \
+                unique_reports[os.path.dirname(file_path)]\
+                    .setdefault(report.analyzer_name, []) \
                     .append(report)
                 stats.add_report(report)
 
@@ -486,15 +487,17 @@ def assemble_zip(inputs,
 
     # TODO: Doesn't support storing multiple report dirs.
     if unique_reports:
-        for analyzer_name, reports in unique_reports.items():
-            if not analyzer_name:
-                analyzer_name = 'unknown'
-            _, tmpfile = tempfile.mkstemp(f'-{analyzer_name}.plist')
-
-            report_file.create(tmpfile, reports, checker_labels,
-                               AnalyzerInfo(analyzer_name))
-            LOG.debug(f"Stored '{analyzer_name}' unique reports in {tmpfile}.")
-            files_to_compress.add(tmpfile)
+        for dirname, analyzer_reports in unique_reports.items():
+            for analyzer_name, reports in analyzer_reports.items():
+                if not analyzer_name:
+                    analyzer_name = 'unknown'
+                _, tmpfile = tempfile.mkstemp(f'-{analyzer_name}.plist')
+
+                report_file.create(tmpfile, reports, checker_labels,
+                                   AnalyzerInfo(analyzer_name))
+                LOG.debug(f"Stored '{analyzer_name}' unique reports "
+                          f"in {tmpfile}.")
+                files_to_compress[dirname].add(tmpfile)
 
     if changed_files:
         reports_helper.dump_changed_files(changed_files)
@@ -552,15 +555,13 @@ def assemble_zip(inputs,
     with zipfile.ZipFile(zip_file, 'a', allowZip64=True) as zipf:
         # Add the files to the zip which will be sent to the server.
 
-        assert len(inputs) > 0
-        if len(files_to_compress) > 0:
-            # Create a unique report directory name.
-            report_dir_name = hashlib.md5(os.path.dirname(
-                list(files_to_compress)[0]).encode('utf-8')).hexdigest()
-
-            for file_path in files_to_compress:
+        for dirname, files in files_to_compress.items():
+            for file_path in files:
                 _, file_name = os.path.split(file_path)
 
+                # Create a unique report directory name.
+                report_dir_name = \
+                    hashlib.md5(dirname.encode('utf-8')).hexdigest()
                 zip_target = \
                     os.path.join('reports', report_dir_name, file_name)
                 zipf.write(file_path, zip_target)