Throw an error when fetching binary list

Author: soimkim

src/fosslight_binary/_binary.py

@@ -115,11 +115,11 @@ def get_oss_report(self):
                 exclude = _EXCLUDE_TRUE_VALUE if (self.exclude or oss.exclude) else ""
                 nvd_url = self.get_vulnerability_items()
                 yield from [self.binary_strip_root, oss.name, oss.version,
-                       oss.license, oss.dl_url, '', '', exclude, oss.comment, nvd_url]
+                            oss.license, oss.dl_url, '', '', exclude, oss.comment, nvd_url]
         else:
             exclude = _EXCLUDE_TRUE_VALUE if self.exclude else ""
             yield from [self.binary_strip_root, '',
-                   '', '', '', '', '', exclude, '']
+                        '', '', '', '', '', exclude, '']
 
     def set_checksum_tlsh(self):
         self.checksum, self.tlsh, error, msg = get_checksum_and_tlsh(

src/fosslight_binary/binary_analysis.py

@@ -142,16 +142,19 @@ def find_binaries(path_to_find_bin, output_dir, format, dburl=""):
     content_list = []
     result_file = ""
 
+    if not os.path.isdir(path_to_find_bin):
+        error_occured(error_msg=f"Can't find the directory : {path_to_find_bin}",
+                      result_log=_result_log,
+                      exit=True)
     try:
-        if not os.path.isdir(path_to_find_bin):
-            error_occured(error_msg=f"Can't find the directory : {path_to_find_bin}",
-                          result_log=_result_log,
-                          exit=True)
-
         total_file_cnt, file_list, found_jar = get_file_list(path_to_find_bin)
         return_list = list(return_bin_only(file_list))
-        total_bin_cnt = len(return_list)
-
+    except Exception as ex:
+        error_occured(error_msg=f"Failed to check whether it is binary or not : {ex}",
+                      result_log=_result_log,
+                      exit=True)
+    total_bin_cnt = len(return_list)
+    try:
         # Run OWASP Dependency-check
         if found_jar:
             logger.info("Run OWASP Dependency-check to analyze .jar file")