Skip to content

Conversation

GMishx
Copy link
Member

@GMishx GMishx commented Aug 6, 2021

Description

  1. Update the delimiter list used by monk. Added following:
  • dnl
  • ,
  • *
  • '''
  • """
  1. Allow users to provide their own list of delimiters.

Note: It is limited to single character and space ( ) is always a delimiter.

snap1

Changes

  1. Added new delimiters.
  2. New field bulk_delimiters added in license_ref_bulk to hold delimiters.
  • If null, treated as default values.

How to test

  1. In an upload, perform a bulk scan which contains delimiters like dnl or ''' and use clean text as license ref (without the delimiters). The file should still match.
  • dnl can be found in Autoconf m4 files, ''' are common in python and comments starting with * can be found in C/C++ source.
  1. Provide new set of delimiters while scheduling a scan, remove those characters from ref text and check the results.
  2. Reuse a package with custom delimiters and select the Bulk phrases from reused packages.
  • The custom delimiters should be reused in the new package as well.

GMishx added 2 commits August 6, 2021 11:51
New delimiters to monk and monkbulk
- dnl
- ,
- *
- '''
- """

Signed-off-by: Gaurav Mishra <[email protected]>
Allow users to provide custom set of delimiters from the UI while
scheduling a monkbulk scan.

Signed-off-by: Gaurav Mishra <[email protected]>
Make "Clean text" button read custom delimiters.

Note: The default delimiter does not contain '\r', '\n', ' ' and ',' to avoid confusion.
Signed-off-by: Gaurav Mishra <[email protected]>
Copy link
Contributor

@ag4ums ag4ums left a comment

Choose a reason for hiding this comment

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

code looks good

@ag4ums ag4ums merged commit 4d855cf into fossology:master Oct 20, 2021
@GMishx GMishx deleted the feat/monkbulk/clean-text branch October 27, 2021 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants