change download_location as list

Author: JustinWonjaePark

src/fosslight_source/_parsing_scancode_file_item.py

@@ -13,7 +13,6 @@
 from ._scan_item import is_exclude_dir
 from ._scan_item import is_exclude_file
 from ._scan_item import replace_word
-import copy
 
 logger = logging.getLogger(constant.LOGGER_NAME)
 _exclude_directory = ["test", "tests", "doc", "docs"]
@@ -84,6 +83,7 @@ def parsing_file_item(scancode_file_list, has_error, path_to_scan, need_matched_
                             with mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ) as mmap_obj:
                                 for word in find_word.findall(mmap_obj):
                                     url_list.append(word.decode('utf-8'))
+                    result_item.download_location = url_list
 
                     if has_error and "scan_errors" in file:
                         error_msg = file.get("scan_errors", [])
@@ -178,13 +178,7 @@ def parsing_file_item(scancode_file_list, has_error, path_to_scan, need_matched_
 
                         if is_exclude_file(file_path, prev_dir, prev_dir_value):
                             result_item.exclude = True
-                        if url_list:
-                            for url in url_list:
-                                temp_result_item = copy.deepcopy(result_item)
-                                temp_result_item.download_location = url
-                                scancode_file_item.append(temp_result_item)
-                        else:
-                            scancode_file_item.append(result_item)
+                        scancode_file_item.append(result_item)
             except Exception as ex:
                 msg.append(f"Error Parsing item: {ex}")
                 rc = False

src/fosslight_source/_parsing_scanoss_file.py

@@ -48,7 +48,7 @@ def parsing_scanResult(scanoss_report):
         if 'version' in findings[0]:
             result_item.oss_version = findings[0]['version']
         if 'url' in findings[0]:
-            result_item.download_location = findings[0]['url']
+            result_item.download_location = list([findings[0]['url']])
 
         license_detected = []
         license_w_source = {"component_declared": [], "file_spdx_tag": [],

src/fosslight_source/_scan_item.py

@@ -27,7 +27,7 @@ class ScanItem:
     is_license_text = False
     oss_name = ""
     oss_version = ""
-    download_location = ""
+    download_location = []
     matched_lines = ""  # Only for SCANOSS results
     fileURL = ""  # Only for SCANOSS results
     license_reference = ""
@@ -70,18 +70,38 @@ def get_row_to_print(self):
         print_rows = [self.file, self.oss_name, self.oss_version, ','.join(self.licenses),
                       self.download_location, "", ','.join(self.copyright),
                       "Exclude" if self.exclude else "", self.comment]
+        print_rows = []
+        if not self.download_location:
+            print_rows.append([self.file, self.oss_name, self.oss_version, ','.join(self.licenses),
+                               "", "", ','.join(self.copyright), "Exclude" if self.exclude else "", self.comment])
+        else:
+            for url in self.download_location:
+                print_rows.append([self.file, self.oss_name, self.oss_version, ','.join(self.licenses),
+                                   url, "", ','.join(self.copyright), "Exclude" if self.exclude else "", self.comment])
         return print_rows
 
     def get_row_to_print_for_scanoss(self):
-        print_rows = [self.file, self.oss_name, self.oss_version, ','.join(self.licenses), self.download_location, "",
-                      ','.join(self.copyright),
-                      "Exclude" if self.exclude else "", self.comment]
+        print_rows = []
+        if not self.download_location:
+            print_rows.append([self.file, self.oss_name, self.oss_version, ','.join(self.licenses), "", "",
+                               ','.join(self.copyright), "Exclude" if self.exclude else "", self.comment])
+        else:
+            for url in self.download_location:
+                print_rows.append([self.file, self.oss_name, self.oss_version, ','.join(self.licenses), url, "",
+                                   ','.join(self.copyright), "Exclude" if self.exclude else "", self.comment])
         return print_rows
 
     def get_row_to_print_for_all_scanner(self):
-        print_rows = [self.file, self.oss_name, self.oss_version, ','.join(self.licenses), self.download_location, "",
-                      ','.join(self.copyright),
-                      "Exclude" if self.exclude else "", self.comment, self.license_reference]
+        print_rows = []
+        if not self.download_location:
+            print_rows.append([self.file, self.oss_name, self.oss_version, ','.join(self.licenses), "", "",
+                               ','.join(self.copyright), "Exclude" if self.exclude else "", self.comment,
+                               self.license_reference])
+        else:
+            for url in self.download_location:
+                print_rows.append([self.file, self.oss_name, self.oss_version, ','.join(self.licenses), url, "",
+                                   ','.join(self.copyright), "Exclude" if self.exclude else "", self.comment,
+                                   self.license_reference])
         return print_rows
 
     def merge_scan_item(self, other):
@@ -106,7 +126,7 @@ def merge_scan_item(self, other):
         if not self.oss_version:
             self.oss_version = other.oss_version
         if not self.download_location:
-            self.download_location = other.download_location
+            self.download_location = list(other.download_location)
         if not self.matched_lines:
             self.matched_lines = other.matched_lines
         if not self.fileURL:

src/fosslight_source/cli.py

@@ -172,14 +172,23 @@ def create_report_file(_start_time, scanned_result, license_list, scanoss_result
         scanned_result = sorted(scanned_result, key=lambda row: (''.join(row.licenses)))
 
         if selected_scanner == 'scancode' or output_extension == _json_ext:
-            sheet_list[SCANOSS_SHEET_NAME] = [scan_item.get_row_to_print() for scan_item in scanned_result]
+            sheet_list[SCANOSS_SHEET_NAME] = []
+            for scan_item in scanned_result:
+                for row in scan_item.get_row_to_print():
+                    sheet_list[SCANOSS_SHEET_NAME].append(row)
 
         elif selected_scanner == 'scanoss':
-            sheet_list[SCANOSS_SHEET_NAME] = [scan_item.get_row_to_print_for_scanoss() for scan_item in scanned_result]
+            sheet_list[SCANOSS_SHEET_NAME] = []
+            for scan_item in scanned_result:
+                for row in scan_item.get_row_to_print_for_scanoss():
+                    sheet_list[SCANOSS_SHEET_NAME].append(row)
             extended_header = SCANOSS_HEADER
 
         else:
-            sheet_list[SCANOSS_SHEET_NAME] = [scan_item.get_row_to_print_for_all_scanner() for scan_item in scanned_result]
+            sheet_list[SCANOSS_SHEET_NAME] = []
+            for scan_item in scanned_result:
+                for row in scan_item.get_row_to_print_for_all_scanner():
+                    sheet_list[SCANOSS_SHEET_NAME].append(row)
             extended_header = MERGED_HEADER
 
         if need_license: