Skip to content

📝 CodeRabbit Chat: Implement requested code changes #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
coderabbitai wants to merge 3 commits into from
Closed

📝 CodeRabbit Chat: Implement requested code changes #272

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1734a69
fix(report): exclude OSS info correction files
JustinWonjaePark May 17, 2026
7b1fe51
Update src/fosslight_source/cli.py
JustinWonjaePark May 19, 2026
648dd78
📝 CodeRabbit Chat: Implement requested code changes
coderabbitai[bot] May 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion src/fosslight_source/cli.py
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@
KB_REFERENCE_HEADER = ['ID', 'Source Path', 'KB Origin URL', 'Evidence']
ALL_MODE = 'all'
SCANNER_TYPE = ['kb', 'scancode', 'scanoss', ALL_MODE]
OSS_INFO_CORRECTION_FILENAMES = {
'sbom-info.yaml',
'sbom-info.yml',
'oss-pkg-info.yaml',
'oss-pkg-info.yml',
}
OSS_INFO_CORRECTION_COMMENT = "OSS info correction file"


logger = logging.getLogger(constant.LOGGER_NAME)
Expand Down Expand Up @@ -312,8 +319,22 @@ def get_kb_reference_to_print(merged_result: list) -> list:
return data


def mark_oss_info_correction_files_as_excluded(scan_results: list) -> None:
for item in scan_results:
if not item.source_name_or_path:
continue
file_name = os.path.basename(item.source_name_or_path).lower()
if file_name in OSS_INFO_CORRECTION_FILENAMES:
item.exclude = True
item.comment = (
f"{item.comment}/ {OSS_INFO_CORRECTION_COMMENT}"
if item.comment
else OSS_INFO_CORRECTION_COMMENT
)


def merge_results(
scancode_result: list = [], scanoss_result: list = [], spdx_downloads: dict = {},

path_to_scan: str = "", run_kb: bool = False, manifest_licenses: dict = {},
excluded_files: set = None, hide_progress: bool = False
) -> list:
Expand Down Expand Up @@ -483,6 +504,7 @@ def run_scanners(
spdx_downloads, manifest_licenses = metadata_collector(path_to_scan, excluded_files)
merged_result = merge_results(scancode_result, scanoss_result, spdx_downloads,
path_to_scan, run_kb, manifest_licenses, excluded_files, hide_progress)
mark_oss_info_correction_files_as_excluded(merged_result)
scan_item = create_report_file(start_time, merged_result, license_list, scanoss_result, selected_scanner,
print_matched_text, output_path, output_files, output_extensions, correct_mode,
correct_filepath, path_to_scan, excluded_path_without_dot, formats,
Expand Down
Loading