Replace excel_writer with fosslight_util

Author: soimkim

setup.py

@@ -14,7 +14,7 @@
 if __name__ == "__main__":
     setup(
         name='fosslight_source',
-        version='1.4.2',
+        version='1.4.3',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Source',

src/fosslight_source/_write_oss_report_src.py

@@ -14,15 +14,15 @@
 from fosslight_util.set_log import init_log
 from fosslight_util.set_log import init_log_item
 import yaml
-from ._write_oss_report_src import write_result_to_csv, write_result_to_excel
 from ._parsing_scancode_file_item import parsing_file_item
+from fosslight_util.write_excel import write_excel_and_csv
 
 logger = logging.getLogger(constant.LOGGER_NAME)
 _PKG_NAME = "fosslight_source"
 _ERROR_PREFIX = "* Error : "
 
 
-def convert_json_to_excel(scancode_json, excel_name, csv_name):
+def convert_json_to_excel(scancode_json, excel_name):
     file_list = []
     _result_log = init_log_item(_PKG_NAME)
     msg = ""
@@ -34,7 +34,7 @@ def convert_json_to_excel(scancode_json, excel_name, csv_name):
             file_list = get_detected_licenses_from_scancode(
                 scancode_json)
             if len(file_list) > 0:
-                sheet_list["SRC"] = file_list
+                sheet_list["SRC"] = [scan_item.get_row_to_print() for scan_item in file_list]
         elif os.path.isdir(scancode_json):
             for root, dirs, files in os.walk(scancode_json):
                 for file in files:
@@ -45,18 +45,14 @@ def convert_json_to_excel(scancode_json, excel_name, csv_name):
                                 result_file)
                             if len(file_list) > 0:
                                 file_name = os.path.basename(file)
-                                sheet_list["SRC_" + file_name] = file_list
+                                sheet_list["SRC_" + file_name] = [scan_item.get_row_to_print() for scan_item in file_list]
                         except Exception as ex:
                             pass
 
-        if len(sheet_list) > 0:
-            write_result_to_excel(excel_name, sheet_list)
-            _result_log["OSS Report"] = excel_name
-
-            if platform.system() != "Windows":
-                write_result_to_csv(csv_name, sheet_list)
-        else:
-            msg = "There is no item to print in OSS-Report."
+        success_to_write, writing_msg = write_excel_and_csv(excel_name, sheet_list)
+        logger.warn("* Writing excel :"+str(success_to_write)+ " "+writing_msg)
+        if success_to_write:
+            _result_log["OSS Report"] = excel_name+".xlsx"
 
     except Exception as ex:
         success = False
@@ -116,16 +112,13 @@ def main():
     if output_file_name == "":
         output_dir = os.getcwd()
         oss_report_name = "OSS-Report_" + start_time
-        csv_file_name = "result_" + start_time
     else:
         oss_report_name = output_file_name
-        csv_file_name = output_file_name
         output_dir = os.path.dirname(os.path.abspath(output_file_name))
 
     logger = init_log(os.path.join(output_dir, "fosslight_src_log_"+start_time+".txt"))
 
-    convert_json_to_excel(path_to_find_bin,
-                          oss_report_name + ".xlsx", csv_file_name + ".csv")
+    convert_json_to_excel(path_to_find_bin, oss_report_name)
 
 
 if __name__ == '__main__':

src/fosslight_source/convert_scancode.py

@@ -17,14 +17,15 @@
 from fosslight_util.set_log import init_log
 from fosslight_util.set_log import init_log_item
 from fosslight_util.timer_thread import TimerThread
-from ._write_oss_report_src import write_result_to_csv, write_result_to_excel
 from ._parsing_scancode_file_item import parsing_file_item
+from fosslight_util.write_excel import write_excel_and_csv
 
 logger = logging.getLogger(constant.LOGGER_NAME)
 warnings.filterwarnings("ignore", category=FutureWarning)
 _PKG_NAME = "fosslight_source"
 _ERROR_PREFIX = "* Error : "
 
+
 def print_help_msg():
     print("* Required : -p path_to_scan")
     print("* Optional : -j ")
@@ -72,12 +73,10 @@ def run_scan(path_to_scan, output_file_name="",
 
     if output_file_name == "":
         output_file = "OSS-Report_" + start_time
-        output_csv_file = "result_" + start_time
         output_json_file = "scancode_" + start_time
         output_dir = os.getcwd()
     else:
         output_file = output_file_name
-        output_csv_file = output_file_name
         output_json_file = output_file_name
         output_dir = os.path.dirname(os.path.abspath(output_file_name))
 
@@ -92,7 +91,6 @@ def run_scan(path_to_scan, output_file_name="",
 
     num_cores = multiprocessing.cpu_count() - 1 if num_cores < 0 else num_cores
 
-    sheet_list = {}
     if os.path.isdir(path_to_scan):
         try:
             output_json_file = output_json_file+".json" if _write_json_file\
@@ -104,32 +102,28 @@ def run_scan(path_to_scan, output_file_name="",
                                        processes=num_cores,
                                        output_json_pp=output_json_file,
                                        only_findings=True)
-
-            if rc:
+            if not rc:
+                msg += _ERROR_PREFIX+"Source code analysis failed.\n"
+                success = False
+            if results:
+                sheet_list = {}
                 for key, value in results.items():
                     if key == "files":
                         rc, result_list, parsing_msg = parsing_file_item(value)
                         _result_log["Parsing Log"] = parsing_msg
                         if rc:
-                            if len(result_list) > 0:
-                                sheet_list["SRC"] = result_list
-                                write_result_to_excel(
-                                    output_file + ".xlsx", sheet_list)
-                                _result_log["OSS Report"] = output_file
-                            else:
-                                msg = "* There is no item"\
-                                    " to print in OSS-Report."
-                if not _windows:
-                    write_result_to_csv(output_csv_file + ".csv", sheet_list)
-            else:
-                msg = _ERROR_PREFIX+"Source code analysis failed."
-                success = False
+                            sheet_list["SRC"] = [scan_item.get_row_to_print() for scan_item in result_list]
+                            success_to_write, writing_msg = write_excel_and_csv(
+                                output_file, sheet_list)
+                            logger.warn("* Writing excel :"+str(success_to_write)+ " "+writing_msg)
+                            if success_to_write:
+                                _result_log["OSS Report"] = output_file +".xlsx"
         except Exception as ex:
             success = False
-            msg = _ERROR_PREFIX + str(ex)
+            msg = _ERROR_PREFIX + str(ex)+"\n"
     else:
         success = False
-        msg = _ERROR_PREFIX+"Check the path to scan. :" + path_to_scan
+        msg = _ERROR_PREFIX+"Check the path to scan. :" + path_to_scan+"\n"
 
     scan_result_msg = str(success)+" "+msg
     _result_log["Scan Result"] = scan_result_msg.strip()