Merge pull request #39 from fosslight/develop

Print message when comparison rows are over 100.

Author: dd-jy

requirements.txt

@@ -6,7 +6,7 @@ openpyxl
 progress
 pyyaml
 beautifulsoup4
-fosslight_util>=1.3.13
+fosslight_util>=1.4.1
 fosslight_dependency>=3.7.4
 fosslight_binary>=4.0.7
 fosslight_reuse>=2.2.1

src/fosslight_scanner/_run_compare.py

@@ -36,21 +36,23 @@ def write_result_json_yaml(output_file, compared_result, file_ext):
 
 def parse_result_for_table(oi, status):
     compared_row = []
-    if status == ADD:
-        oss_after = f"{oi['name']} ({oi['version']})"
-        license_after = f"{', '.join(oi['license'])}"
-        compared_row = [status, '', '', oss_after, license_after]
-    elif status == DELETE:
-        oss_before = f"{oi['name']} ({oi['version']})"
-        license_before = f"{', '.join(oi['license'])}"
-        compared_row = [status, oss_before, license_before, '', '']
+    if status == ADD or status == DELETE:
+        oi_ver = '' if oi['version'] == '' else f"({oi['version']})"
+        oss_info = f"{oi['name']}{oi_ver}"
+        license_info = f"{', '.join(oi['license'])}"
+        if status == ADD:
+            compared_row = [status, '', '', oss_info, license_info]
+        elif status == DELETE:
+            compared_row = [status, oss_info, license_info, '', '']
     elif status == CHANGE:
         oss_before, oss_after, license_before, license_after = [], [], [], []
         for prev_i in oi['prev']:
-            oss_before.append(f"{oi['name']} ({prev_i['version']})")
+            prev_i_ver = '' if prev_i['version'] == '' else f"({prev_i['version']})"
+            oss_before.append(f"{oi['name']}{prev_i_ver}")
             license_before.append(f"{', '.join(prev_i['license'])}")
         for now_i in oi['now']:
-            oss_after.append(f"{oi['name']} ({now_i['version']})")
+            now_i_ver = '' if now_i['version'] == '' else f"({now_i['version']})"
+            oss_after.append(f"{oi['name']}{now_i_ver}")
             license_after.append(f"{', '.join(now_i['license'])}")
         compared_row = [status, ' / '.join(oss_before), ' / '.join(license_before),
                                 ' / '.join(oss_after), ' / '.join(license_after)]
@@ -93,6 +95,7 @@ def write_result_html(output_file, compared_result, before_yaml, after_yaml):
 
             status = [ADD, DELETE, CHANGE]
             row = 2
+            MIN_ROW_NUM = 100
             for st in status:
                 for oi in compared_result[st]:
                     compared_row = parse_result_for_table(oi, st)
@@ -104,6 +107,16 @@ def write_result_html(output_file, compared_result, before_yaml, after_yaml):
                         tr.insert(i, td)
                     table_html.insert(row, tr)
                     row += 1
+                    if row >= MIN_ROW_NUM + 2:
+                        p = f.new_tag('p')
+                        p.string = "(!) There are so many different oss.\
+                                    See the attached excel file for the full comparison result."
+                        p.attrs = {"style": "font-weight:bold; color:red; font-size:15px"}
+                        table_html.insert_before(p)
+                        break
+                else:
+                    continue
+                break
 
             if row == 2:
                 tr = f.new_tag('tr')
@@ -163,26 +176,35 @@ def write_compared_result(output_file, compared_result, file_ext, before_yaml=''
     if file_ext == "" or file_ext == ".xlsx":
         success = write_result_xlsx(output_file, compared_result)
     elif file_ext == ".html":
+        output_xlsx_file = os.path.splitext(output_file)[0] + ".xlsx"
+        success_xlsx = write_result_xlsx(output_xlsx_file, compared_result)
         success = write_result_html(output_file, compared_result, before_yaml, after_yaml)
+        if not success_xlsx:
+            logger.error("Fail to write comparison excel file.")
+        else:
+            logger.info(f"In html format, {output_xlsx_file} is generated by default.")
+            output_file = f"{output_xlsx_file}, {output_file}"
     elif file_ext == ".json":
         success = write_result_json_yaml(output_file, compared_result, file_ext)
     elif file_ext == ".yaml":
         success = write_result_json_yaml(output_file, compared_result, file_ext)
     else:
         logger.info("Not supported file extension")
 
-    return success
+    return success, output_file
 
 
 def run_compare(before_yaml, after_yaml, output_file, file_ext):
     ret = False
     logger.info("Start compare mode")
+    logger.info(f"before file: {before_yaml}")
+    logger.info(f"after file: {after_yaml}")
 
     compared_result = compare_yaml(before_yaml, after_yaml)
     if compared_result != '':
-        ret = write_compared_result(output_file, compared_result, file_ext, before_yaml, after_yaml)
+        ret, result_file = write_compared_result(output_file, compared_result, file_ext, before_yaml, after_yaml)
         if ret:
-            logger.info(f"Success to write compared result: {output_file}")
+            logger.info(f"Success to write compared result: {result_file}")
         else:
             logger.error("Fail to write compared result file.")
 

src/fosslight_scanner/fosslight_scanner.py

@@ -76,6 +76,10 @@ def run_dependency(path_to_analyze, output_file_with_path, params=""):
     except Exception as ex:
         logger.warning(f"Set dependency Param: {ex}")
 
+    timer = TimerThread()
+    timer.setDaemon(True)
+    timer.start()
+
     try:
         success, result = call_analysis_api(path_to_analyze, "Dependency Analysis",
                                             1, run_dependency_scanner,