Add support also for "/blob/"

For retrocompatibility
nephila · Sep 2, 2023 · 9b38442 · 9b38442
1 parent 7e90210
commit 9b38442
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 3 deletions.
diff --git a/giturlparse/platforms/gitlab.py b/giturlparse/platforms/gitlab.py
@@ -7,19 +7,19 @@ class GitLabPlatform(BasePlatform):
             r"(?P<protocols>(git\+)?(?P<protocol>https))://(?P<domain>[^:/]+)(?P<port>:[0-9]+)?"
             r"(?P<pathname>/(?P<owner>[^/]+?)/"
             r"(?P<groups_path>.*?)?(?(groups_path)/)?(?P<repo>[^/]+?)(?:(\.git)?(/)?)"
-            r"(?P<path_raw>(/-/blob/|/-/tree/).+)?)$"
+            r"(?P<path_raw>(/blob/|/-/blob/|/-/tree/).+)?)$"
         ),
         "ssh": (
             r"(?P<protocols>(git\+)?(?P<protocol>ssh))?(://)?(?P<_user>.+?)@(?P<domain>[^:/]+)(:)?(?P<port>[0-9]+)?(?(port))?"
             r"(?P<pathname>/?(?P<owner>[^/]+)/"
             r"(?P<groups_path>.*?)?(?(groups_path)/)?(?P<repo>[^/]+?)(?:(\.git)?(/)?)"
-            r"(?P<path_raw>(/-/blob/|/-/tree/).+)?)$"
+            r"(?P<path_raw>(/blob/|/-/blob/|/-/tree/).+)?)$"
         ),
         "git": (
             r"(?P<protocols>(?P<protocol>git))://(?P<domain>[^:/]+):?(?P<port>[0-9]+)?(?(port))?"
             r"(?P<pathname>/(?P<owner>[^/]+?)/"
             r"(?P<groups_path>.*?)?(?(groups_path)/)?(?P<repo>[^/]+?)(?:(\.git)?(/)?)"
-            r"(?P<path_raw>(/-/blob/|/-/tree/).+)?)$"
+            r"(?P<path_raw>(/blob/|/-/blob/|/-/tree/).+)?)$"
         ),
     }
     FORMATS = {
@@ -36,6 +36,8 @@ class GitLabPlatform(BasePlatform):
     @staticmethod
     def clean_data(data):
         data = BasePlatform.clean_data(data)
+        if data["path_raw"].startswith("/blob/"):
+            data["path"] = data["path_raw"].replace("/blob/", "")
         if data["path_raw"].startswith("/-/blob/"):
             data["path"] = data["path_raw"].replace("/-/blob/", "")
         if data["path_raw"].startswith("/-/tree/"):

diff --git a/giturlparse/tests/test_parse.py b/giturlparse/tests/test_parse.py
@@ -431,6 +431,75 @@
             },
         ),
     ),
+    (
+        "HTTPS",
+        (
+            "https://gitlab.com/nephila/giturlparse/blob/master/giturlparse/github.py",
+            {
+                "host": "gitlab.com",
+                "resource": "gitlab.com",
+                "user": "git",
+                "port": "",
+                "owner": "nephila",
+                "repo": "giturlparse",
+                "name": "giturlparse",
+                "groups": [],
+                "path": "master/giturlparse/github.py",
+                "path_raw": "/blob/master/giturlparse/github.py",
+                "pathname": "/nephila/giturlparse/blob/master/giturlparse/github.py",
+                "branch": "",
+                "protocol": "https",
+                "protocols": ["https"],
+                "platform": "gitlab",
+            },
+        ),
+    ),
+    (
+        "HTTPS",
+        (
+            "https://gitlab.com/nephila/git-urlparse/blob/master/giturlparse/github.py",
+            {
+                "host": "gitlab.com",
+                "resource": "gitlab.com",
+                "user": "git",
+                "port": "",
+                "owner": "nephila",
+                "repo": "git-urlparse",
+                "name": "git-urlparse",
+                "groups": [],
+                "path": "master/giturlparse/github.py",
+                "path_raw": "/blob/master/giturlparse/github.py",
+                "pathname": "/nephila/git-urlparse/blob/master/giturlparse/github.py",
+                "branch": "",
+                "protocol": "https",
+                "protocols": ["https"],
+                "platform": "gitlab",
+            },
+        ),
+    ),
+    (
+        "HTTPS",
+        (
+            "https://gitlab.com/nephila/git-urlparse/-/blob/master/giturlparse/github.py",
+            {
+                "host": "gitlab.com",
+                "resource": "gitlab.com",
+                "user": "git",
+                "port": "",
+                "owner": "nephila",
+                "repo": "git-urlparse",
+                "name": "git-urlparse",
+                "groups": [],
+                "path": "master/giturlparse/github.py",
+                "path_raw": "/-/blob/master/giturlparse/github.py",
+                "pathname": "/nephila/git-urlparse/-/blob/master/giturlparse/github.py",
+                "branch": "",
+                "protocol": "https",
+                "protocols": ["https"],
+                "platform": "gitlab",
+            },
+        ),
+    ),
     (
         "HTTPS",
         (

diff --git a/giturlparse/tests/test_rewrite.py b/giturlparse/tests/test_rewrite.py
@@ -56,6 +56,11 @@
         "ssh",
         "git@host.org:Org/Group/Repo.git/-/blob/master/file.py",
     ),
+    (
+        "https://host.org/Org/Group/Repo/blob/master/file.py",
+        "ssh",
+        "git@host.org:Org/Group/Repo.git/blob/master/file.py",
+    ),
 )
 
 INVALID_PARSE_URLS = (