Update lic_ref template file, some code enhancement and add @ in the

supported character list

Signed-off-by: Chin Yeung Li <[email protected]>

Author: chinyeungli

CHANGELOG.rst

@@ -1,7 +1,7 @@
-2021-xx-xx
+2022-xx-xx
     Release 7.0.0
 
-    * Add '@' as a support character for filename #451
+    * Add '@' as a supported character for filename #451
     * Add support to collect redistributable sources #22
     * Handle trailing spaces in field names during `transform` #456
     * Remove restriction of python27 only on windows #453
@@ -18,6 +18,8 @@
     * Add option to save error log in `check` command
     * New `gen_license` option
     * Bump PyYAML to 6.0
+    * Add '%" as a supported character
+    * Update default template
 
 2021-04-02
     Release 6.0.0

src/attributecode/attrib.py

@@ -88,7 +88,7 @@ def generate(abouts, is_about_input, license_dict, scancode, min_license_score,
                         url = ''
                     text = list(about.license_file.value.values())[index]
                     license_object = License(key, name, filename, url, text)
-                    licenses_list.append(license_object) 
+                    licenses_list.append(license_object)
                 index = index + 1
     else:
         for key in license_dict:
@@ -163,9 +163,10 @@ def generate(abouts, is_about_input, license_dict, scancode, min_license_score,
                     lic_name_expression_list.append(segment)
             # Join the license name expression into a single string
             lic_name_expression = ' '.join(lic_name_expression_list)
-        
+
             # Add the license name expression string into the about object as a list
-            about.license_name_expression = lic_name_expression
+            about.license_name_expression.value = lic_name_expression
+            about.license_name_expression.present = True
 
     # Sort the about objects by name
     abouts = sorted(abouts, key=lambda x: x.name.value.lower())

src/attributecode/model.py

@@ -774,6 +774,7 @@ def set_standard_fields(self):
             ('notes', StringField()),
 
             ('license_expression', StringField()),
+            ('license_name_expression', StringField()),
             ('license_key', ListField()),
             ('license_name', ListField()),
             ('license_file', FileTextField()),

src/attributecode/util.py

@@ -55,7 +55,7 @@ def to_posix(path):
 UNC_PREFIX_POSIX = to_posix(UNC_PREFIX)
 UNC_PREFIXES = (UNC_PREFIX_POSIX, UNC_PREFIX,)
 
-valid_file_chars = string.digits + string.ascii_letters + '_-.+()~[]{}|@' + ' '
+valid_file_chars = string.digits + string.ascii_letters + '_-.+()~[]{}|@%' + ' '
 
 
 def invalid_chars(path):

templates/license_ref.template

@@ -42,7 +42,7 @@ This document lists the open source and third-party components of a {{ vartext['
                         <p>License Gallery URL: <a href="{{ license.url }}">{{license.url}}</a> </p>
                     {% endif %}
                 {% endif %}
-                {% if license.key in about_object.license_key.value %}        
+                {% if license.key in about_object.license_key.value %}
                     <li>{{ about_object.name.value }}{% if about_object.version.value %}  - Version  {{ about_object.version.value }}{% endif %}</li>       
                     {% if about_object.copyright.value %}
                         <pre>Copyright: {{about_object.copyright.value}}</pre>