Addon Manager: Fixes for license handling

src/Mod/AddonManager/addonmanager_macro_parser.py

@@ -36,8 +36,10 @@ except ImportError:
 
 try:
     import FreeCAD
+    from addonmanager_licenses import get_license_manager
 except ImportError:
     FreeCAD = None
+    get_license_manager = None
 
 
 class DummyThread:
@@ -63,6 +65,7 @@ class MacroParser:
             "other_files": [""],
             "author": "",
             "date": "",
+            "license": "",
             "icon": "",
             "xpm": "",
         }
@@ -83,6 +86,8 @@ class MacroParser:
             "__files__": "other_files",
             "__author__": "author",
             "__date__": "date",
+            "__license__": "license",
+            "__licence__": "license",  # accept either spelling
             "__icon__": "icon",
             "__xpm__": "xpm",
         }
@@ -185,6 +190,8 @@ class MacroParser:
             self.parse_results[value] = match_group
             if value == "comment":
                 self._cleanup_comment()
+            elif value == "license":
+                self._cleanup_license()
         elif isinstance(self.parse_results[value], list):
             self.parse_results[value] = [of.strip() for of in match_group.split(",")]
         else:
@@ -197,6 +204,11 @@ class MacroParser:
         if len(self.parse_results["comment"]) > 512:
             self.parse_results["comment"] = self.parse_results["comment"][:511] + "…"
 
+    def _cleanup_license(self):
+        if get_license_manager is not None:
+            lm = get_license_manager()
+            self.parse_results["license"] = lm.normalize(self.parse_results["license"])
+
     def _apply_special_handling(self, key: str, line: str):
         # Macro authors are supposed to be providing strings here, but in some
         # cases they are not doing so. If this is the "__version__" tag, try