Add code so that the jinja2 template can get the license short name

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

Author: chinyeungli

src/attributecode/attrib.py

@@ -50,6 +50,8 @@ def generate(abouts, template_string=None):
         license_key_and_context = {}
         sorted_license_key_and_context = {}
         license_text_name_and_key = {}
+        license_key_to_license_name = {}
+        # FIXME: This need to be simplified
         for about in abouts:
             # about.license_file.value is a OrderDict with license_text_name as
             # the key and the license text as the value
@@ -67,8 +69,37 @@ def generate(abouts, template_string=None):
                         sorted_license_key_and_context = collections.OrderedDict(sorted(license_key_and_context.items()))
                         license_text_name_and_key[license_text_name] = license_key
 
+            # Convert/map the key in license expression to license name
+            if about.license_expression.value and about.license_name.value:
+                # Split the license expression into list with license key and condition keyword
+                lic_expression_list = about.license_expression.value.split()
+                
+
+                lic_name_list = about.license_name.value
+                lic_name_expression_list = []
+
+                # The order of the license_name and key should be the same
+                # The length for both list should be the same excluding the condition keyword
+                # such as 'and' and 'or'
+                assert len(lic_name_list) <= len(lic_expression_list)
+
+                # Map the licence key to license name
+                index_for_license_name_list = 0
+                for key in lic_expression_list:
+                    if key.lower() == 'and' or key.lower() == 'or':
+                        lic_name_expression_list.append(key)
+                    else:
+                        lic_name_expression_list.append(lic_name_list[index_for_license_name_list])
+                        license_key_to_license_name[key] = lic_name_list[index_for_license_name_list]
+                        index_for_license_name_list = index_for_license_name_list + 1
+                # 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
+                about.license_name_expression = lic_name_expression 
+
         rendered = template.render(abouts=abouts, common_licenses=COMMON_LICENSES, license_key_and_context=sorted_license_key_and_context,
-                                   license_text_name_and_key=license_text_name_and_key)
+                                   license_text_name_and_key=license_text_name_and_key, license_key_to_license_name=license_key_to_license_name)
     except Exception, e:
         line = getattr(e, 'lineno', None)
         ln_msg = ' at line: %r' % line if line else ''

src/attributecode/gen.py

@@ -239,10 +239,14 @@ def generate(location, base_dir, mapping, license_notice_text_location, fetch_li
                             gen_license_name = lic_key + u'.LICENSE'
                             about.license_file.value[gen_license_name] = lic_context
                             about.license_file.present = True
+                            if not about.license_name.present:
+                                about.license_name.value.append(lic_name)
                             if not about.license_url.present:
                                 about.license_url.value.append(lic_url)
                         if about.license_url.value:
                             about.license_url.present = True
+                        if about.license_name.value:
+                            about.license_name.present = True
 
             # Write the ABOUT file and check does the referenced file exist
             # This function is not purposed to throw error. However, since I've commented

src/attributecode/model.py

@@ -631,7 +631,7 @@ def create_fields(self):
 
             ('license', ListField()),
             ('license_expression', StringField()),
-            ('license_name', StringField()),
+            ('license_name', ListField()),
             ('license_file', FileTextField()),
             ('license_url', UrlField()),
             ('copyright', StringField()),