Merge pull request #15 from fosslight/fix

Update the information on the cover sheet

Author: soimkim

src/fosslight_android/_write_excel.py

@@ -13,7 +13,7 @@
 
 
 def write_result_to_excel(out_file_name, row_list, cover=''):
-    header_row = ['ID', 'Binary Name', 'Source Code Path', 'NOTICE.html', 'OSS Name', 'OSS Version', 'License',
+    header_row = ['ID', 'Binary Name', 'Source Code Path', 'Notice', 'OSS Name', 'OSS Version', 'License',
                   'Download Location', 'Homepage',
                   'Copyright Text',
                   'License Text', 'Exclude', 'Comment', 'Need Check', 'TLSH', 'SHA1']

src/fosslight_android/android_binary_analysis.py

@@ -327,21 +327,24 @@ def get_result_of_notice_html(found_on_html, notice_file_found):
 
 def find_notice_value():
     global notice_file_list, final_bin_info
+    str_notice_files = ""
 
     try:
         notice_file_list, notice_files = read_notice_file(os.path.abspath(build_out_notice_file_path), NOTICE_HTML_FILE_NAME)
         if not notice_file_list:
             logger.info(f"Notice file is empty:{notice_files}")
             return
         if notice_files:
-            logger.info(f"Notice files:{notice_files}")
+            str_notice_files = ",".join(notice_files)
+            logger.info(f"Notice files:{str_notice_files}")
         else:
             logger.debug("Can't find a notiece file")
         return_list = do_multi_process(find_notice_html, final_bin_info)
         final_bin_info = return_list[:]
 
     except IOError as error:  # 'CANNOT_FIND_NOTICE_HTML'
         logger.debug(f"find_notice_value:{error}")
+    return str_notice_files
 
 
 def find_notice_html(bin_info, return_list):
@@ -769,6 +772,7 @@ def main():
         num_cores = 1
 
     python_script_dir = os.getcwd()
+    android_src_path = python_script_dir
     now = datetime.now().strftime('%y%m%d_%H%M')
     log_txt_file = os.path.join(python_script_dir, f"fosslight_log_android_{now}.txt")
     result_excel_file = os.path.join(python_script_dir, f"fosslight_report_android_{now}.xlsx")
@@ -798,6 +802,7 @@ def main():
         print_version(PKG_NAME)
     if args.source:  # android source path
         os.chdir(args.source)
+        android_src_path = args.source
     if args.binary:  # Base model's binary.txt to exclude
         base_binary_txt = args.binary
     if args.notice:
@@ -842,7 +847,7 @@ def main():
 
     map_binary_module_name_and_path(find_binaries_from_out_dir())
 
-    find_notice_value()
+    notice_files = find_notice_value()
     find_bin_license_info()
 
     set_mk_file_path()  # Mk file path and local path, location of NOTICE file, can be different
@@ -858,8 +863,9 @@ def main():
 
     cover = CoverItem(tool_name=PKG_NAME,
                       start_time=now,
-                      input_path=python_script_dir)
+                      input_path=android_src_path)
     cover.comment = f"Total number of binaries: {len(final_bin_info)}"
+    cover.comment += f"\nNotice: {notice_files}"
     write_result(result_excel_file, final_bin_info, cover)
     result_log["Output FOSSLight Report"] = result_excel_file