fosslight-scanner 2.1.0__tar.gz → 2.1.2__tar.gz

{fosslight_scanner-2.1.0 → fosslight_scanner-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_scanner
-Version: 2.1.0
+Version: 2.1.2
 Summary: FOSSLight Scanner
 Home-page: https://github.com/fosslight/fosslight_scanner
 Author: LG Electronics

fosslight_scanner-2.1.2/requirements.txt

@@ -0,0 +1,11 @@
+future
+pandas
+openpyxl
+progress
+pyyaml
+beautifulsoup4
+fosslight_util>=2.1.6,<3.0.0
+fosslight_source>=2.1.4,<3.0.0
+fosslight_dependency>=4.1.3,<5.0.0
+fosslight_binary>=5.1.2,<6.0.0
+fosslight_prechecker>=4.0.0,<5.0.0

{fosslight_scanner-2.1.0 → fosslight_scanner-2.1.2}/setup.py

@@ -15,7 +15,7 @@ with open('requirements.txt', 'r', 'utf-8') as f:
 if __name__ == "__main__":
     setup(
         name='fosslight_scanner',
-        version='2.1.0',
+        version='2.1.2',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Scanner',

{fosslight_scanner-2.1.0 → fosslight_scanner-2.1.2}/src/fosslight_scanner/common.py

@@ -118,6 +118,9 @@ def create_scancodejson(all_scan_item_origin, ui_mode_report, src_path=""):
         all_scan_item = copy.deepcopy(all_scan_item_origin)
         if FOSSLIGHT_DEPENDENCY in all_scan_item.file_items:
             del all_scan_item.file_items[FOSSLIGHT_DEPENDENCY]
+        first_sheet = FOSSLIGHT_SOURCE
+        if all_scan_item.file_items:
+            first_sheet = next(iter(all_scan_item.file_items))
         if src_path:
             fileitems_without_oss = []
             for root, _, files in os.walk(src_path):
@@ -127,7 +130,6 @@ def create_scancodejson(all_scan_item_origin, ui_mode_report, src_path=""):
                     included = False
                     item_path = os.path.join(root, file)
                     item_path = item_path.replace(parent + os.path.sep, '', 1)
-
                     for file_items in all_scan_item.file_items.values():
                         for file_item in file_items:
                             if file_item.source_name_or_path:
@@ -138,7 +140,7 @@ def create_scancodejson(all_scan_item_origin, ui_mode_report, src_path=""):
                         fi_without_oss.source_name_or_path = item_path
                         fileitems_without_oss.append(fi_without_oss)
             if len(fileitems_without_oss) > 0:
-                all_scan_item.file_items[FOSSLIGHT_SOURCE].extend(fileitems_without_oss)
+                all_scan_item.file_items[first_sheet].extend(fileitems_without_oss)
         if root_dir:
             for file_items in all_scan_item.file_items.values():
                 for fi in file_items:

{fosslight_scanner-2.1.0 → fosslight_scanner-2.1.2}/src/fosslight_scanner/fosslight_scanner.py

@@ -148,12 +148,15 @@ def run_scanner(src_path, dep_arguments, output_path, keep_raw_data=False,
         for i, output_extension in enumerate(output_extensions):
             if output_files[i] is None or output_files[i] == "":
                 if formats:
-                    if formats[i].startswith('spdx'):
-                        if platform.system() != 'Windows':
-                            output_files[i] = f"fosslight_spdx_all_{_start_time}"
-                        else:
-                            logger.warning('spdx format is not supported on Windows. Please remove spdx from format.')
+                    if formats[i].startswith('spdx') or formats[i].startswith('cyclonedx'):
+                        if platform.system() == 'Windows':
+                            logger.warning(f'{formats[i]} is not supported on Windows. Please remove {formats[i]} from format.')
                             to_remove.append(i)
+                        else:
+                            if formats[i].startswith('spdx'):
+                                output_files[i] = f"fosslight_spdx_all_{_start_time}"
+                            elif formats[i].startswith('cyclonedx'):
+                                output_files[i] = f'fosslight_cyclonedx_all_{_start_time}'
                     else:
                         if output_extension == _json_ext:
                             output_files[i] = f"fosslight_opossum_all_{_start_time}"
@@ -386,7 +389,7 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
             before_comp_f = path_arg[0]
             after_comp_f = path_arg[1]
         else:
-            logger.error("Enter two FOSSLight report file with 'p' option.")
+            logger.error("(compare mode) Enter two FOSSLight report file with 'p' option.")
             return False
     else:
         CUSTOMIZED_FORMAT = {}
@@ -405,7 +408,7 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
                             extract_folder = src_path
                         break
             else:
-                logger.warning(f"Cannot analyze with multiple path: {path_arg}")
+                logger.warning(f"(-p option) Cannot analyze with multiple path: {path_arg}")
 
     success, msg, output_path, output_files, output_extensions, formats = check_output_formats_v2(output_file_or_dir, file_format,
                                                                                        CUSTOMIZED_FORMAT)
@@ -420,13 +423,13 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
     try:
         if "compare" in mode_list:
             if before_comp_f == '' or after_comp_f == '':
-                logger.error("before and after files are necessary.")
+                logger.error("(compare mode) before and after files are necessary.")
                 return False
             if not os.path.exists(os.path.join(_executed_path, before_comp_f)):
-                logger.error("Cannot find before FOSSLight report file (1st param with -y option).")
+                logger.error("(compare mode) Cannot find before FOSSLight report file (1st param with -y option).")
                 return False
             if not os.path.exists(os.path.join(_executed_path, after_comp_f)):
-                logger.error("Cannot find after FOSSLight report file (2nd param with -y option).")
+                logger.error("(compare mode) Cannot find after FOSSLight report file (2nd param with -y option).")
                 return False
             ret, final_excel_dir, result_log = init(output_path)
 
@@ -482,7 +485,7 @@ def run_main(mode_list, path_arg, dep_arguments, output_file_or_dir, file_format
                 if extract_folder:
                     shutil.rmtree(extract_folder)
             else:
-                logger.error("No mode has been selected for analysis.")
+                logger.error("(mode) No mode has been selected for analysis.")
         try:
             if not keep_raw_data:
                 logger.debug(f"Remove temporary files: {_output_dir}")

{fosslight_scanner-2.1.0 → fosslight_scanner-2.1.2}/src/fosslight_scanner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-scanner
-Version: 2.1.0
+Version: 2.1.2
 Summary: FOSSLight Scanner
 Home-page: https://github.com/fosslight/fosslight_scanner
 Author: LG Electronics

fosslight_scanner-2.1.2/src/fosslight_scanner.egg-info/requires.txt

@@ -0,0 +1,11 @@
+future
+pandas
+openpyxl
+progress
+pyyaml
+beautifulsoup4
+fosslight_util<3.0.0,>=2.1.6
+fosslight_source<3.0.0,>=2.1.4
+fosslight_dependency<5.0.0,>=4.1.3
+fosslight_binary<6.0.0,>=5.1.2
+fosslight_prechecker<5.0.0,>=4.0.0

fosslight_scanner-2.1.0/requirements.txt

@@ -1,11 +0,0 @@
-future
-pandas
-openpyxl
-progress
-pyyaml
-beautifulsoup4
-fosslight_util>=2.1.0,<3.0.0
-fosslight_source>=2.1.0,<3.0.0
-fosslight_dependency>=4.1.0,<5.0.0
-fosslight_binary>=5.1.0,<6.0.0
-fosslight_prechecker>=4.0.0,<5.0.0

fosslight_scanner-2.1.0/src/fosslight_scanner.egg-info/requires.txt

@@ -1,11 +0,0 @@
-future
-pandas
-openpyxl
-progress
-pyyaml
-beautifulsoup4
-fosslight_util<3.0.0,>=2.1.0
-fosslight_source<3.0.0,>=2.1.0
-fosslight_dependency<5.0.0,>=4.1.0
-fosslight_binary<6.0.0,>=5.1.0
-fosslight_prechecker<5.0.0,>=4.0.0