Fix a bug related to run report

Author: soimkim

src/fosslight_oss_pkg/_parsing_excel.py

@@ -23,14 +23,15 @@ def convert_excel_to_yaml(oss_report_to_read, output_file):
 
     if os.path.isfile(oss_report_to_read):
         try:
+            _logger.warning("Read data from :" + oss_report_to_read)
             items = read_oss_report(oss_report_to_read)
             for item in items:
                 _row_to_print.append(item.get_print_json())
             if len(_row_to_print) > 0:
                 output_file = output_file if output_file.endswith(_file_extension) else output_file + _file_extension
                 _output_json[_json_root_key] = _row_to_print
                 write_yaml_file(output_file, _output_json)
-                _logger.warn("Output: "+output_file)
+                _logger.warning("Output: " + output_file)
         except Exception as error:
             _logger.error("Convert yaml:"+str(error))
     else:

src/fosslight_oss_pkg/fosslight_oss_pkg.py

@@ -26,20 +26,19 @@ def find_report_file(path_to_find):
             file_with_path = os.path.join(path_to_find, file)
             if os.path.isfile(file_with_path):
                 return file
-        for p, d, f in os.walk(path_to_find):
-            for file in f:
+        for root, dirs, files in os.walk(path_to_find):
+            for file in files:
                 file_name = file.lower()
                 if (file_name.startswith("oss-report") or file_name.startswith("fosslight-report")) \
                    and file_name.endswith(".xlsx"):
-                    return os.path.join(d, file)
-    except Exception:
-        pass
+                    return os.path.join(root, file)
+    except Exception as error:
+        logger.debug("Find report:"+str(error))
     return ""
 
 
 def convert_report(base_path, files, output_name):
     oss_pkg_files = ["oss-pkg-info.yml", "oss-pkg-info.yaml"]
-    base_path = ""
     file_option_on = False
     convert_yml_mode = False
     convert_excel_mode = False
@@ -79,9 +78,9 @@ def convert_report(base_path, files, output_name):
         if is_window:
             convert_yml_mode = True
             base_path = os.getcwd()
-            convert_excel_mode = True
-            if report_to_read == "":
-                report_to_read = find_report_file(base_path)
+            report_to_read = find_report_file(base_path)
+            if report_to_read != "":
+                convert_excel_mode = True
         else:
             print_help_msg()