fosslight-source 2.2.7__tar.gz → 2.2.9__tar.gz

{fosslight_source-2.2.7/src/fosslight_source.egg-info → fosslight_source-2.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_source
-Version: 2.2.7
+Version: 2.2.9
 Summary: FOSSLight Source Scanner
 Home-page: https://github.com/fosslight/fosslight_source_scanner
 Download-URL: https://github.com/fosslight/fosslight_source_scanner

{fosslight_source-2.2.7 → fosslight_source-2.2.9}/setup.py

@@ -14,7 +14,7 @@ with open('requirements.txt', 'r', 'utf-8') as f:
 if __name__ == "__main__":
     setup(
         name='fosslight_source',
-        version='2.2.7',
+        version='2.2.9',
         package_dir={"": "src"},
         packages=find_packages(where='src'),
         description='FOSSLight Source Scanner',

{fosslight_source-2.2.7 → fosslight_source-2.2.9}/src/fosslight_source/_parsing_scancode_file_item.py

@@ -207,6 +207,21 @@ def split_spdx_expression(spdx_string: str) -> list:
     return license
 
 
+def get_license_expression_spdx(license_expression: str) -> str:
+    if not license_expression or not license_expression.strip():
+        return ""
+    try:
+        from licensedcode.cache import build_spdx_license_expression
+        result = build_spdx_license_expression(license_expression.strip())
+        if result is None:
+            return ""
+        if regex.match(result):
+            return ""
+        return result
+    except Exception:
+        return ""
+
+
 def parsing_scancode_32_later(
     scancode_file_list: list, has_error: bool = False
 ) -> Tuple[bool, list, list, dict]:
@@ -231,7 +246,6 @@ def parsing_scancode_32_later(
                         result_item.comment = ",".join(error_msg)
                         scancode_file_item.append(result_item)
                         continue
-
                 copyright_value_list = []
                 for x in file.get("copyrights", []):
                     copyright_data = x.get("copyright", "")
@@ -242,7 +256,6 @@ def parsing_scancode_32_later(
                         except Exception:
                             pass
                         copyright_value_list.append(copyright_data)
-
                 license_detected = []
                 licenses = file.get("license_detections", [])
                 if not licenses:
@@ -266,6 +279,8 @@ def parsing_scancode_32_later(
                                                 found_lic = str(matched.group())
                                         except Exception:
                                             pass
+                                    license_expression_spdx = get_license_expression_spdx(found_lic)
+                                    found_lic = license_expression_spdx if license_expression_spdx else found_lic
                                     for word in replace_word:
                                         found_lic = found_lic.replace(word, "")
                                     if matched_txt:

{fosslight_source-2.2.7 → fosslight_source-2.2.9}/src/fosslight_source/_scan_item.py

@@ -23,7 +23,7 @@ _manifest_filename = [r'.*\.pom$', r'package\.json$', r'setup\.py$', r'setup\.cf
 MAX_LICENSE_LENGTH = 200
 MAX_LICENSE_TOTAL_LENGTH = 600
 SUBSTRING_LICENSE_COMMENT = "Maximum character limit (License)"
-KB_URL = "http://fosslight-kb.lge.com/query"
+KB_URL = "http://fosslight-kb.lge.com/"
 
 
 class SourceItem(FileItem):
@@ -96,11 +96,11 @@ class SourceItem(FileItem):
                 except Exception as e:
                     logger.debug(f"Failed to get WFP for {self.source_name_or_path}: {e}")
         except FileNotFoundError:
-            logger.warning(f"File not found: {self.source_name_or_path}")
+            logger.debug(f"File not found: {self.source_name_or_path}")
         except PermissionError:
-            logger.warning(f"Permission denied: {self.source_name_or_path}")
+            logger.debug(f"Permission denied: {self.source_name_or_path}")
         except Exception as e:
-            logger.warning(f"Failed to compute MD5 for {self.source_name_or_path}: {e}")
+            logger.debug(f"Failed to compute MD5 for {self.source_name_or_path}: {e}")
         return md5_hex, wfp
 
     def _get_origin_url_from_md5_hash(self, md5_hash: str, wfp: str = "") -> str:
@@ -108,7 +108,7 @@ class SourceItem(FileItem):
             payload = {"file_hash": md5_hash}
             if wfp and wfp.strip():
                 payload["wfp_base64"] = base64.b64encode(wfp.strip().encode("utf-8")).decode("ascii")
-            request = urllib.request.Request(KB_URL, data=json.dumps(payload).encode('utf-8'), method='POST')
+            request = urllib.request.Request(f"{KB_URL}query", data=json.dumps(payload).encode('utf-8'), method='POST')
             request.add_header('Accept', 'application/json')
             request.add_header('Content-Type', 'application/json')
 
@@ -122,11 +122,11 @@ class SourceItem(FileItem):
                         if output:
                             return output
         except urllib.error.URLError as e:
-            logger.warning(f"Failed to fetch origin_url from API for MD5 hash {md5_hash}: {e}")
+            logger.debug(f"Failed to fetch origin_url from API for MD5 hash {md5_hash}: {e}")
         except json.JSONDecodeError as e:
-            logger.warning(f"Failed to parse API response for MD5 hash {md5_hash}: {e}")
+            logger.debug(f"Failed to parse API response for MD5 hash {md5_hash}: {e}")
         except Exception as e:
-            logger.warning(f"Error getting origin_url for MD5 hash {md5_hash}: {e}")
+            logger.debug(f"Error getting origin_url for MD5 hash {md5_hash}: {e}")
         return ""
 
     def _extract_oss_info_from_url(self, url: str) -> tuple:

{fosslight_source-2.2.7 → fosslight_source-2.2.9}/src/fosslight_source/cli.py

@@ -263,15 +263,18 @@ def create_report_file(
 
 def check_kb_server_reachable() -> bool:
     try:
-        request = urllib.request.Request(KB_URL, method='HEAD')
-        with urllib.request.urlopen(request, timeout=5) as response:
+        request = urllib.request.Request(f"{KB_URL}health", method='GET')
+        with urllib.request.urlopen(request, timeout=10) as response:
             logger.debug(f"KB server is reachable. Response status: {response.status}")
             return response.status != 404
     except urllib.error.HTTPError as e:
+        logger.debug(f"KB server returned HTTP error: {e.code}")
         return e.code != 404
-    except urllib.error.URLError:
+    except urllib.error.URLError as e:
+        logger.debug(f"KB server is unreachable (timeout or connection error): {e}")
         return False
-    except Exception:
+    except Exception as e:
+        logger.debug(f"Unexpected error checking KB server: {e}")
         return False
 
 

{fosslight_source-2.2.7 → fosslight_source-2.2.9/src/fosslight_source.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_source
-Version: 2.2.7
+Version: 2.2.9
 Summary: FOSSLight Source Scanner
 Home-page: https://github.com/fosslight/fosslight_source_scanner
 Download-URL: https://github.com/fosslight/fosslight_source_scanner