fosslight-util 2.2.0__tar.gz → 2.2.2__tar.gz

{fosslight_util-2.2.0/src/fosslight_util.egg-info → fosslight_util-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_util
-Version: 2.2.0
+Version: 2.2.2
 Summary: FOSSLight Util
 Author: LG Electronics
 License-Expression: Apache-2.0

{fosslight_util-2.2.0 → fosslight_util-2.2.2}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fosslight_util"
-version = "2.2.0"
+version = "2.2.2"
 description = "FOSSLight Util"
 readme = "README.md"
 license = "Apache-2.0"

{fosslight_util-2.2.0 → fosslight_util-2.2.2}/src/fosslight_util/cover.py

@@ -4,13 +4,22 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import os
+import re
 import sys
+import yaml
 from fosslight_util.help import print_package_version
+from fosslight_util.time import format_display_time, format_running_time
+
+
+def dump_result_log(result_log):
+    log_text = yaml.safe_dump(result_log, allow_unicode=True, sort_keys=True)
+    log_text = re.sub(r"Running time: ['\"](.+?)['\"]\n", r"Running time: \1\n", log_text)
+    return log_text.strip()
 
 
 class CoverItem:
     tool_name_key = "Tool information"
-    start_time_key = "Start time"
+    start_time_key = "Running time"
     python_ver_key = "Python version"
     analyzed_path_key = "Analyzed path"
     excluded_path_key = "Excluded path"
@@ -23,7 +32,8 @@ class CoverItem:
         "fosslight_binary"
     ]
 
-    def __init__(self, tool_name="", start_time="", input_path="", comment="", exclude_path=[], simple_mode=True):
+    def __init__(self, tool_name="", start_time="", input_path="", comment="", exclude_path=[], simple_mode=True,
+                 finish_time=""):
         if simple_mode:
             self.tool_name = f'{tool_name} v{print_package_version(tool_name, "", False)}'
         else:
@@ -34,11 +44,9 @@ class CoverItem:
             ])
             self.tool_name = f'{first_pkg} ({remaining_pkgs})'
 
-        if start_time:
-            date, time = start_time.split('_')
-            self.start_time = f'{date}, {time[0:2]}:{time[2:4]}'
-        else:
-            self.start_time = ""
+        self.start_time = start_time
+        self.finish_time = finish_time
+        self.running_time = self._format_running_time()
         self.input_path = os.path.abspath(input_path)
         self.exclude_path = ", ".join(exclude_path)
         self.comment = comment
@@ -57,6 +65,19 @@ class CoverItem:
     def __lt__(self, other):
         return self.get_sort_order() < other.get_sort_order()
 
+    def set_finish_time(self, finish_time):
+        self.finish_time = finish_time
+        self.running_time = self._format_running_time()
+
+    def _format_running_time(self):
+        if not self.start_time:
+            return ""
+
+        if not self.finish_time:
+            return format_display_time(self.start_time)
+
+        return format_running_time(self.start_time, self.finish_time)
+
     def create_merged_comment(self, cover_items):
         if not cover_items:
             return ""
@@ -69,7 +90,7 @@ class CoverItem:
     def get_print_json(self):
         json_item = {}
         json_item[self.tool_name_key] = self.tool_name
-        json_item[self.start_time_key] = self.start_time
+        json_item[self.start_time_key] = self.running_time
         json_item[self.python_ver_key] = self.python_version
         json_item[self.analyzed_path_key] = self.input_path
         json_item[self.excluded_path_key] = self.exclude_path

{fosslight_util-2.2.0 → fosslight_util-2.2.2}/src/fosslight_util/download.py

@@ -319,7 +319,7 @@ _BASE_SEMVER_FOR_CHECKOUT = re.compile(
     re.IGNORECASE,
 )
 _SEMVER_IN_REF = re.compile(
-    r'(?:^v\.? ?|[-_])'
+    r'(?:^v\.? ?|[-_]v\.? ?|[-_])'
     r'(\d+)\.(\d+)\.(\d+)'
     r'(?:(?:-[0-9A-Za-z.-]+)|(?:\.[A-Za-z][0-9A-Za-z.-]*))?'
     r'(?:\+[0-9A-Za-z.-]+)?'
@@ -467,6 +467,48 @@ def _strip_leading_v_prefix(s: str) -> str:
     return re.sub(r'^(?:v\.? ?)?', '', s.strip(), flags=re.IGNORECASE)
 
 
+def _repo_name_from_git_url(git_url: str) -> str:
+    """Extract repository name from common git HTTPS/SSH URLs."""
+    if not git_url:
+        return ""
+    url = git_url.strip().rstrip('/')
+    if url.endswith('.git'):
+        url = url[:-4]
+    m = re.match(r'git@[^:]+:[^/]+/([^/@?#]+)$', url)
+    if m:
+        return m.group(1)
+    path = urllib.parse.urlparse(url).path.strip('/')
+    if path:
+        segments = path.split('/')
+        if len(segments) >= 2:
+            return segments[-1]
+    return ""
+
+
+def _repo_prefixed_version_refs(repo_name: str, base: str) -> List[str]:
+    """Build {repo}-v{version} style tag candidates from checkout hint."""
+    if not repo_name or not base:
+        return []
+    base = base.strip()
+    core = _strip_leading_v_prefix(base)
+    if not core:
+        return []
+    repo = repo_name.strip()
+    candidates = [
+        f"{repo}-v{core}",
+        f"{repo}-v.{core}",
+        f"{repo}_{core}",
+        f"{repo}-{core}",
+    ]
+    seen = set()
+    result = []
+    for candidate in candidates:
+        if candidate not in seen:
+            seen.add(candidate)
+            result.append(candidate)
+    return result
+
+
 def _match_exact_or_v_prefix_ref(base: str, ref_set: set) -> Optional[str]:
     """Exact ref match, or ref equal to base after optional leading v/v./v."""
     if base in ref_set:
@@ -558,11 +600,16 @@ def decide_checkout(checkout_to="", tag="", branch="", git_url=""):
     tag_set = set(ref_dict.get("tags", []))
     branch_set = set(ref_dict.get("branches", []))
     ref_set = tag_set | branch_set
+    repo_name = _repo_name_from_git_url(git_url)
 
     for raw in (tag, branch, checkout_to):
         b = (raw or "").strip()
         if not b:
             continue
+        for candidate in _repo_prefixed_version_refs(repo_name, b):
+            ref, clar = _try_resolve_checkout_base(candidate, ref_set)
+            if ref is not None:
+                return ref, clar
         ref, clar = _try_resolve_checkout_base(b, ref_set)
         if ref is not None:
             return ref, clar

{fosslight_util-2.2.0 → fosslight_util-2.2.2}/src/fosslight_util/oss_item.py

@@ -8,6 +8,7 @@ import os
 import hashlib
 from fosslight_util.constant import LOGGER_NAME, FOSSLIGHT_SCANNER, COMMENT_DELIMITER
 from fosslight_util.cover import CoverItem
+from fosslight_util.time import current_timestamp_utc
 from typing import List, Dict
 
 _logger = logging.getLogger(LOGGER_NAME)
@@ -211,6 +212,11 @@ class ScannerItem:
             else:
                 self.cover.comment = value
 
+    def set_cover_finish_time(self, finish_time=""):
+        if not finish_time:
+            finish_time = current_timestamp_utc()
+        self.cover.set_finish_time(finish_time)
+
     def get_cover_comment(self):
         return [item.strip() for item in self.cover.comment.split(COMMENT_DELIMITER)]
 

fosslight_util-2.2.2/src/fosslight_util/time.py

@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# Copyright (c) 2024 LG Electronics Inc.
+# SPDX-License-Identifier: Apache-2.0
+
+from datetime import datetime, timezone, timedelta
+
+_TIMESTAMP_FMT = '%Y%m%d_%H%M%S'
+_DISPLAY_TZ = timezone(timedelta(hours=9))  # KST (UTC+9)
+
+
+def current_timestamp_utc() -> str:
+    """Return current time as UTC wall-clock string for internal storage."""
+    return datetime.now(timezone.utc).strftime(_TIMESTAMP_FMT)
+
+
+def timestamp_for_filename(utc_timestamp: str) -> str:
+    """Convert UTC storage timestamp to KST for file and directory names."""
+    if not utc_timestamp:
+        return current_timestamp_for_filename()
+    return _parse_utc_timestamp(utc_timestamp).astimezone(_DISPLAY_TZ).strftime(_TIMESTAMP_FMT)
+
+
+def current_timestamp_for_filename() -> str:
+    """Return current time as KST wall-clock string for file and directory names."""
+    return timestamp_for_filename(current_timestamp_utc())
+
+
+def _parse_utc_timestamp(value: str) -> datetime:
+    return datetime.strptime(value, _TIMESTAMP_FMT).replace(tzinfo=timezone.utc)
+
+
+def format_display_time(value: str) -> str:
+    return _parse_utc_timestamp(value).astimezone(_DISPLAY_TZ).strftime('%Y%m%d_%H:%M:%S')
+
+
+def _format_duration_compact(total_seconds: int) -> str:
+    total_seconds = max(0, total_seconds)
+    hours, remaining_seconds = divmod(total_seconds, 3600)
+    minutes, seconds = divmod(remaining_seconds, 60)
+
+    duration_items = []
+    if hours > 0:
+        duration_items.append(f'{hours}h')
+    if minutes > 0:
+        duration_items.append(f'{minutes}m')
+    duration_items.append(f'{seconds}s')
+    return f'({" ".join(duration_items)})'
+
+
+def format_running_time(start_time: str, finish_time: str) -> str:
+    start_utc = _parse_utc_timestamp(start_time)
+    finish_utc = _parse_utc_timestamp(finish_time)
+    total_seconds = int((finish_utc - start_utc).total_seconds())
+
+    start_display = start_utc.astimezone(_DISPLAY_TZ).strftime('%Y%m%d_%H:%M:%S')
+    finish_display = finish_utc.astimezone(_DISPLAY_TZ).strftime('%Y%m%d_%H:%M:%S')
+    duration = _format_duration_compact(total_seconds)
+
+    return f'{start_display} ~ {finish_display} {duration}'

{fosslight_util-2.2.0 → fosslight_util-2.2.2/src/fosslight_util.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fosslight_util
-Version: 2.2.0
+Version: 2.2.2
 Summary: FOSSLight Util
 Author: LG Electronics
 License-Expression: Apache-2.0

{fosslight_util-2.2.0 → fosslight_util-2.2.2}/src/fosslight_util.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ src/fosslight_util/parsing_yaml.py
 src/fosslight_util/read_excel.py
 src/fosslight_util/set_log.py
 src/fosslight_util/spdx_licenses.py
+src/fosslight_util/time.py
 src/fosslight_util/timer_thread.py
 src/fosslight_util/write_cyclonedx.py
 src/fosslight_util/write_excel.py
@@ -36,6 +37,7 @@ src/fosslight_util/resources/frequentLicenselist.json
 src/fosslight_util/resources/frequent_license_nick_list.json
 src/fosslight_util/resources/licenses.json
 tests/test_cyclonedx.py
+tests/test_decide_checkout.py
 tests/test_download.py
 tests/test_download_version_hint.py
 tests/test_opossum.py

fosslight_util-2.2.2/tests/test_decide_checkout.py

@@ -0,0 +1,69 @@
+# Copyright (c) 2026 LG Electronics Inc.
+# SPDX-License-Identifier: Apache-2.0
+"""Tests for git checkout ref resolution (decide_checkout)."""
+
+import pytest
+
+from fosslight_util.download import (
+    _repo_name_from_git_url,
+    _repo_prefixed_version_refs,
+    _try_resolve_checkout_base,
+    clarified_version_from_oss_version,
+    decide_checkout,
+)
+
+
+@pytest.mark.parametrize(
+    "git_url,expected",
+    [
+        ("https://github.com/rrousselGit/freezed", "freezed"),
+        ("https://github.com/rrousselGit/freezed.git", "freezed"),
+        ("git@github.com:rrousselGit/freezed.git", "freezed"),
+    ],
+)
+def test_repo_name_from_git_url(git_url, expected):
+    assert _repo_name_from_git_url(git_url) == expected
+
+
+def test_repo_prefixed_version_refs():
+    assert _repo_prefixed_version_refs("freezed", "2.4.4") == [
+        "freezed-v2.4.4",
+        "freezed-v.2.4.4",
+        "freezed_2.4.4",
+        "freezed-2.4.4",
+    ]
+    assert _repo_prefixed_version_refs("freezed", "v2.4.4")[0] == "freezed-v2.4.4"
+
+
+def test_try_resolve_checkout_base_matches_repo_prefixed_tag():
+    ref_set = {"freezed-v2.4.4", "freezed_annotation-v2.4.4", "master"}
+    ref, clar = _try_resolve_checkout_base("freezed-v2.4.4", ref_set)
+    assert ref == "freezed-v2.4.4"
+    assert clar == "2.4.4"
+
+
+def test_try_resolve_checkout_base_semver_matches_repo_prefixed_tag():
+    ref_set = {"freezed-v2.4.4", "freezed_annotation-v2.4.4", "master"}
+    ref, clar = _try_resolve_checkout_base("2.4.4", ref_set)
+    assert ref == "freezed-v2.4.4"
+    assert clar == "2.4.4"
+
+
+def test_clarified_version_from_repo_prefixed_tag():
+    assert clarified_version_from_oss_version("freezed-v2.4.4") == "2.4.4"
+
+
+def test_decide_checkout_resolves_repo_prefixed_tag(monkeypatch):
+    tags = ["freezed-v2.4.4", "freezed_annotation-v2.4.4"]
+    monkeypatch.setattr(
+        "fosslight_util.download.get_remote_refs",
+        lambda _url: {"tags": tags, "branches": ["master"]},
+    )
+
+    ref, clar = decide_checkout(
+        checkout_to="2.4.4",
+        git_url="https://github.com/rrousselGit/freezed",
+    )
+
+    assert ref == "freezed-v2.4.4"
+    assert clar == "2.4.4"