Update purl2url and url2purl to support aomedia.googlesource.com

Signed-off-by: ziad hany <ziadhany2016@gmail.com>

Author: ziadhany

src/packageurl/contrib/purl2url.py

@@ -27,6 +27,7 @@
 from packageurl import PackageURL
 from packageurl.contrib.route import NoRouteAvailable
 from packageurl.contrib.route import Router
+import re
 
 DEFAULT_MAVEN_REPOSITORY = "https://repo.maven.apache.org/maven2"
 
@@ -181,10 +182,13 @@ def build_generic_repo_url(purl):
     name = purl_data.name
     namespace = purl_data.namespace
     version = purl_data.version
+
     if namespace.startswith("git.kernel.org"):
         return f"https://{namespace}/{name}/commit/?id={version}"
-    if namespace.startswith("android.googlesource.com"):
+
+    if re.match(r"^(android|aomedia)\.googlesource\.com(/.*)?$", namespace):
         return f"https://{namespace}/{name}/+/{version}"
+
     if namespace.startswith("sourceforge.net"):
         return f"https://{namespace}/{name}/ci/{version}"
 

src/packageurl/contrib/url2purl.py

@@ -697,28 +697,29 @@ def build_kernel_purl(url):
         )
 
 
-@purl_router.route("https?://android\.googlesource\\.com/.*")
-def build_android_purl(url):
+@purl_router.route(r"https?://(android|aomedia)\.googlesource\.com/.*")
+def build_googlesource_purl(url):
     """
     Return a PackageURL object from Android `url`.
     For example:
     https://android.googlesource.com/platform/packages/apps/Settings/+/2968ccc911956fa5813a9a6a5e5c8970e383a60f
+    https://aomedia.googlesource.com/libavifinfo/+/43716e9c34d3389b4882fbd1a81c04543ed04fe3
     """
 
     commit_pattern = (
-        r"^https?://android\.googlesource\.com/"
-        r"(?P<name>.+)"
+        r"^https?://(?P<namespace>(android|aomedia)\.googlesource\.com(?:/.*)?)"
+        r"/(?P<name>[^/]+)"
         r"/\+/"
         r"(?P<version>[0-9a-fA-F]{7,64})"
     )
 
-    commit_matche = re.search(commit_pattern, url)
-    if commit_matche:
+    match = re.search(commit_pattern, url)
+    if match:
         return PackageURL(
             type="generic",
-            namespace="android.googlesource.com",
-            name=commit_matche.group("name"),
-            version=commit_matche.group("version"),
+            namespace=match.group("namespace"),
+            name=match.group("name"),
+            version=match.group("version"),
             qualifiers={},
             subpath="",
         )

tests/contrib/test_purl2url.py

@@ -73,6 +73,7 @@ def test_purl2url_get_repo_url():
         "pkg:generic/git.kernel.org/pub/scm/libs/liba2i/liba2i.git@4fc8196d7811c26abefaf3a3ae6b5c67c4c9cbc9": "https://git.kernel.org/pub/scm/libs/liba2i/liba2i.git/commit/?id=4fc8196d7811c26abefaf3a3ae6b5c67c4c9cbc9",
         "pkg:generic/git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/configfs.git@bc3372351d0c8b2726b7d4229b878342e3e6b0e8": "https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/configfs.git/commit/?id=bc3372351d0c8b2726b7d4229b878342e3e6b0e8",
         "pkg:generic/android.googlesource.com/accessories/manifest@9ad7ef740dc39834a88bf95c69f35f18b8f45543": "https://android.googlesource.com/accessories/manifest/+/9ad7ef740dc39834a88bf95c69f35f18b8f45543",
+        "pkg:generic/aomedia.googlesource.com/libavifinfo@43716e9c34d3389b4882fbd1a81c04543ed04fe3": "https://aomedia.googlesource.com/libavifinfo/+/43716e9c34d3389b4882fbd1a81c04543ed04fe3",
         "pkg:generic/sourceforge.net/p/infrarecorder/code@8fab704119ff23691f075f6a281521b6c7d7e55f": "https://sourceforge.net/p/infrarecorder/code/ci/8fab704119ff23691f075f6a281521b6c7d7e55f",
     }