OutputHTML: Revert back to legacy license collection pre 49e7d89

The new template expects a sorted list of license objects,
therefore the `licenses` dictionary gets converted.
None entries get discarded.
Finally the empty `license_references` get overridden with
the finished list of collected licenses.

Fixes #4101.

Signed-off-by: Jens Keim <[email protected]>

Author: pepper-jk

src/formattedcode/output_html.py

@@ -188,9 +188,13 @@ def generate_output(results, license_references, version, template):
     """
     # FIXME: This code is highly coupled with actual scans and may not
     # support adding new scans at all
+
+    from licensedcode.cache import get_licenses_db
+
     converted = {}
     converted_infos = {}
     converted_packages = {}
+    licenses = {}
 
     LICENSES = 'license_detections'
     COPYRIGHTS = 'copyrights'
@@ -223,6 +227,11 @@ def generate_output(results, license_references, version, template):
                     'value': license_expression,
                 })
 
+                if license_expression not in licenses:
+                    license_object = get_licenses_db().get(license_expression)
+                    if license_object != None:
+                        licenses[license_expression] = license_object
+
         if results:
             converted[path] = sorted(results, key=itemgetter('start'))
 
@@ -239,6 +248,9 @@ def generate_output(results, license_references, version, template):
         if PACKAGES in scanned_file:
             converted_packages[path] = scanned_file[PACKAGES]
 
+    licenses = dict(sorted(licenses.items()))
+    license_references = list(licenses.values())
+
     files = {
         'license_copyright': converted,
         'infos': converted_infos,