Merge pull request #106 from fosslight/temp

Modify result file name format

Author: bjk7119

README.md

@@ -10,16 +10,15 @@ SPDX-License-Identifier: GPL-3.0-only
 It uses [reuse-tool][ret] to check whether the [source code's copyright and license writing rules][rule] are complied with.
 
 [ret]: https://github.com/fsfe/reuse-tool
-[rule]: https://oss.lge.com/guide/process/osc_process/1-identification/copyright_license_rule.html
-
+[rule]: https://opensource.lge.com/guide/19
 
 ## 📖 User Guide
-Please see the [**User Guide**](https://fosslight.org/fosslight-guide-en/scanner/1_reuse.html) for more information on how to install and run it.    
+Please see the [**User Guide**](https://fosslight.org/fosslight-guide-en/scanner/1_prechecker.html) for more information on how to install and run it.    
 Here a short summary:    
 
 - `lint` --- Check whether the [source code's copyright and license writing rules][rule] are complied with.
 
-- `convert` --- Convert [oss-pkg-info.yaml](https://github.com/fosslight/fosslight_prechecker/blob/main/tests/convert/oss-pkg-info.yaml) to [FOSSLight-Report.xlsx](https://fosslight.org/fosslight-guide-en/learn/2_fosslight_report.html) and vice versa.
+- `convert` --- Convert [sbom-info.yaml](https://github.com/fosslight/fosslight_prechecker/blob/main/tests/convert/sbom-info.yaml) or [oss-pkg-info.yaml](https://github.com/fosslight/fosslight_prechecker/blob/main/tests/convert/oss-pkg-info.yaml) to [fosslight_report.xlsx](https://fosslight.org/fosslight-guide-en/learn/2_fosslight_report.html).
 
 - `add` --- Add copyright and license to missing file(s)
 

src/fosslight_oss_pkg/_convert.py

@@ -23,11 +23,11 @@ def convert_report(base_path, output_name, format, need_log_file=True):
     oss_yaml_files = []
     file_option_on = False
     output_report = ""
-    now = datetime.now().strftime('%Y%m%d_%H-%M-%S')
+    now = datetime.now().strftime('%y%m%d_%H%M')
 
     success, msg, output_path, output_name, output_extension = check_output_format(output_name, format, CUSTOMIZED_FORMAT_FOR_PRECHECKER)
 
-    logger, _result_log = init_log(os.path.join(output_path, f"fosslight_prechecker_log_{now}.txt"),
+    logger, _result_log = init_log(os.path.join(output_path, f"fosslight_log_{now}.txt"),
                                    need_log_file, logging.INFO, logging.DEBUG, _PKG_NAME, base_path)
     if success:
         if output_path == "":
@@ -40,7 +40,7 @@ def convert_report(base_path, output_name, format, need_log_file=True):
         if output_name != "":
             output_report = os.path.join(output_path, output_name)
         else:
-            output_report = os.path.join(os.path.abspath(output_path), f"FOSSLight-Report_{now}")
+            output_report = os.path.join(os.path.abspath(output_path), f"fosslight_report_{now}")
     else:
         logger.error(f"Format error - {msg}")
         sys.exit(1)

src/fosslight_prechecker/_add.py

@@ -345,8 +345,8 @@ def add_content(target_path="", input_license="", input_copyright="", output_pat
     else:
         output_path = os.path.abspath(output_path)
 
-    now = datetime.now().strftime('%Y%m%d_%H-%M-%S')
-    logger, _result_log = init_log(os.path.join(output_path, f"fosslight_prechecker_add_log_{now}.txt"),
+    now = datetime.now().strftime('%y%m%d_%H%M')
+    logger, _result_log = init_log(os.path.join(output_path, f"fosslight_log_{now}.txt"),
                                    need_log_file, logging.INFO, logging.DEBUG, PKG_NAME, path_to_find)
 
     if not os.path.isdir(path_to_find):

src/fosslight_prechecker/_precheck.py

@@ -198,7 +198,7 @@ def dump_error_msg(error_msg: str, exit=False):
 
 def init(path_to_find, output_path, file_list, need_log_file=True):
     global logger, _result_log
-    logger, _result_log = init_log(os.path.join(output_path, f"fosslight_prechecker_log_{_start_time}.txt"),
+    logger, _result_log = init_log(os.path.join(output_path, f"fosslight_log_{_start_time}.txt"),
                                    need_log_file, logging.INFO, logging.DEBUG, PKG_NAME, path_to_find)
     if file_list:
         _result_log["File list to check"] = file_list
@@ -242,7 +242,7 @@ def run_lint(target_path, disable, output_file_name, format='', need_log_file=Tr
     report = ProjectReport()
     result_item = ResultItem()
     success = False
-    _start_time = datetime.now().strftime('%Y%m%d_%H-%M-%S')
+    _start_time = datetime.now().strftime('%y%m%d_%H%M')
 
     try:
         locale.setlocale(locale.LC_ALL, 'en_US.UTF-8')

src/fosslight_prechecker/_result.py

@@ -199,11 +199,11 @@ def create_result_file(output_file_name, format='', _start_time=""):
             result_file = f"{output_file}{output_extension}"
         else:
             if output_extension == '.yaml' or output_extension == "":
-                result_file = f"FOSSLight_Prechecker_{_start_time}.yaml"
+                result_file = f"fosslight_lint_{_start_time}.yaml"
             elif output_extension == '.html':
-                result_file = f"FOSSLight_Prechecker_{_start_time}.html"
+                result_file = f"fosslight_lint_{_start_time}.html"
             elif output_extension == '.xml':
-                result_file = f"FOSSLight_Prechecker_{_start_time}.xml"
+                result_file = f"fosslight_lint_{_start_time}.xml"
             else:
                 logger.error("Not supported file extension")