diff options
| author | Shulhan <ms@kilabit.info> | 2026-01-12 23:01:35 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2026-01-12 23:01:35 +0700 |
| commit | e16e2a4ec74443aa8f4c21a73ee837cb72ed46fb (patch) | |
| tree | 8458e4f7bc3803310f1e4071a28a70bb8f0fd939 /testdata/Apply_test.txt | |
| parent | 9817757f8dca159aa261315a91fceff1d9a13566 (diff) | |
| download | spdxconv-e16e2a4ec74443aa8f4c21a73ee837cb72ed46fb.tar.xz | |
all: fix default regex match license and copyright to ignore comment
Instead of assuming that the comment prefix and space always exists
"^(//)\s+..."
change it to be optional, so it will works on the multi-line comment.
For example, comment and old headers in html,
<--
Copyright ...
-->
there is no comment prefix and space.
Diffstat (limited to 'testdata/Apply_test.txt')
| -rw-r--r-- | testdata/Apply_test.txt | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/testdata/Apply_test.txt b/testdata/Apply_test.txt index 611f654..123dc28 100644 --- a/testdata/Apply_test.txt +++ b/testdata/Apply_test.txt @@ -17,7 +17,7 @@ pattern = "^.*\\.(adoc|asciidoc|c|cc|cpp|cs|dart|go|h|hh|hpp|java|js|jsx|jsonc|k prefix = "//" [match-file-comment] -pattern = "^.*\\.(bash|csh|dockerfile|env|gitignore|hcl|ipynb|make|pl|pm|py|ps1|rb|sh|tf|yaml|yml|zsh)$" +pattern = "^.*\\.(aff|bash|csh|dockerfile|env|gitignore|hcl|ipynb|make|pl|pm|py|ps1|rb|sh|tf|yaml|yml|zsh)$" prefix = "#" [match-file-comment] @@ -48,12 +48,12 @@ prefix = "%" pattern = "^.*\\.(apk|app|bz2|csv|doc|docx|exe|gif|gz|jpeg|jpg|json|pdf|png|ppt|pptx|svg|svgz|tar|tgz|xls|xlsx|zip)$" [match-license] -pattern = "^(//+|#+)\\s+(.*)governed by a BSD-style(.*)$" +pattern = "^(//+|#+|/\\*+|<!--+)?\\s*(.*)governed by a BSD-style(.*)$" license_identifier = BSD-3-Clause -delete_line_pattern = "^(//+|#+)\\s+license that(.*)$" +delete_line_pattern = "^(//+|#+|/\\*+|<!--+)?\\s*license that can(.*)$" [match-copyright] -pattern = "^(//+|#+)\\s+Copyright\\s+(?<year>\\d{4}),?\\s+(?<author>.*)\\s+<*(?<contact>.*)>.*$" +pattern = "^(//+|#+|/\\*+|<!--+)?\\s*Copyright\\s+(?<year>\\d{4}),?\\s+(?<author>.*)\\s+<(?<contact>.*)>.*$" >>> without_spdx_license_id.go 1 @@ -162,5 +162,27 @@ pattern = "^(//+|#+)\\s+Copyright\\s+(?<year>\\d{4}),?\\s+(?<author>.*)\\s+<*(?< 2 3 +>>> with.html +<!-- +Copyright 2022, Shulhan <ms@kilabit.info>. All rights reserved. +Use of this source code is governed by a BSD-style +license that can be found in the LICENSE file. +--> + +1 +2 +3 + +<<< with.html +<!-- SPDX-License-Identifier: BSD-3-Clause --> +<!-- SPDX-FileCopyrightText: 2022 Shulhan <ms@kilabit.info> --> +<!-- + +--> + +1 +2 +3 + <<< END // REUSE-IgnoreEnd |