Skip to content
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.

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

Fixes for end of license matches #221

Merged
merged 4 commits into from
Dec 13, 2023
Merged

Fixes for end of license matches #221

merged 4 commits into from
Dec 13, 2023

Conversation

goneall
Copy link
Member

@goneall goneall commented Dec 6, 2023

Fixes #214
Fixes #213

This is currently a draft - I would like to investigate issue #217 before completing this PR.

That being said, review comments are welcome.

Fixes #214
Fixes #213

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>
Signed-off-by: Gary O'Neall <gary@sourceauditor.com>
@goneall
Copy link
Member Author

goneall commented Dec 8, 2023

Fixes #217

Redesigned the matching so that optional text is accurately matched

@goneall goneall marked this pull request as ready for review December 8, 2023 09:36
Signed-off-by: Gary O'Neall <gary@sourceauditor.com>
@goneall goneall requested a review from pmonks December 9, 2023 22:35
@goneall
Copy link
Member Author

goneall commented Dec 9, 2023

@pmonks - if you could take a look at this PR - it fixes the current known license matching issues.

It is a bit of a redesign. Instead of doing a general .* type match for the optional text, it does a token match of the license matches.

The PR has more duplicated code than I would like, but I could find a clean way to refactor the code out.

Thanks.

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>
@goneall
Copy link
Member Author

goneall commented Dec 13, 2023

I think I'll go ahead and merge this PR as is since it seems to fix the current set of matching issues.

I also need to generate a new release of the library for some downstream dependencies.

I created issue #222 to track some ideas on refactoring the much to complex code in LicenseCompareHelper

@goneall goneall merged commit fc8bb3b into master Dec 13, 2023
1 check passed
@goneall goneall deleted the findfixes branch December 13, 2023 00:37
@pmonks
Copy link
Collaborator

pmonks commented Dec 13, 2023

Sorry I wasn't able to get to this @goneall - I was at a tournament all day Sunday, then recovering from it yesterday. 😬

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants