Skip to content

fix: consider other common license files present in projects #275

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

Merged
medvednikov merged 2 commits into from
Mar 23, 2025
Merged

fix: consider other common license files present in projects #275

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f86246b
fix: consider other common license files present in projects
brmassa Mar 21, 2025
f553b52
fix: remove the debug println
brmassa Mar 23, 2025
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
6 changes: 5 additions & 1 deletion src/repo.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -832,7 +832,11 @@ fn find_readme_file(items []File) ?File {
}

fn find_license_file(items []File) ?File {
files := items.filter(it.name.to_lower() == 'license')
// List of common license file names
license_common_files := ['license', 'license.md', 'license.txt', 'licence', 'licence.md', 'licence.txt']
Copy link
Member

@medvednikov medvednikov Mar 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be a global const to avoid extra allocations on each request

Copy link
Contributor Author

@brmassa brmassa Mar 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Global? For big instances, with loads of users, a main project page is hit every time. But for small instances (which I believe it's the main use case), it does not occur that often.

Since this check is only done in the main project page and the list being short, I would argue that it would not make any perceived impact.

Copy link
Member

@medvednikov medvednikov Mar 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would. Because the same code powers gitly.org.

It's also a good practice in general to have such arrays as global consts, since V doesn't optimize such allocations yet.


files := items.filter(license_common_files.contains(it.name.to_lower()))

if files.len == 0 {
return none
}
Expand Down
4 changes: 2 additions & 2 deletions src/repo_routes.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,9 @@ pub fn (mut app App) tree(mut ctx Context, username string, repo_name string, br

license_file := find_license_file(items) or { File{} }
mut license_file_path := ''

println(license_file)
Copy link
Member

@medvednikov medvednikov Mar 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

print

if license_file.id != 0 {
license_file_path = '/${username}/${repo_name}/blob/${branch_name}/LICENSE'
license_file_path = '/${username}/${repo_name}/blob/${branch_name}/${license_file.name}'
}

watcher_count := app.get_count_repo_watchers(repo_id)
Expand Down
Loading