Refactor parse_url and parse_query for improved clarity and maintainability

- **Revised the construction of the parsed dictionary** in the `parse_url` function for clarity.
- **Improved the `parse_query` function's structure** for better readability and maintainability.

Author: filipchristiansen

src/gitingest/parse_query.py

@@ -11,19 +11,6 @@
 
 
 def parse_url(url: str) -> Dict[str, Any]:
-    parsed = {
-        "user_name": None,
-        "repo_name": None,
-        "type": None,
-        "branch": None,
-        "commit": None,
-        "subpath": "/",
-        "local_path": None,
-        "url": None,
-        "slug": None,
-        "id": None,
-    }
-
     url = url.split(" ")[0]
     url = unquote(url)  # Decode URL-encoded characters
 
@@ -38,42 +25,62 @@ def parse_url(url: str) -> Dict[str, Any]:
     if len(path_parts) < 2:
         raise ValueError("Invalid repository URL. Please provide a valid Git repository URL.")
 
-    parsed["user_name"] = path_parts[0]
-    parsed["repo_name"] = path_parts[1]
-
-    # Keep original URL format but with decoded components
-    parsed["url"] = f"https://{domain}/{parsed['user_name']}/{parsed['repo_name']}"
-    parsed['slug'] = f"{parsed['user_name']}-{parsed['repo_name']}"
-    parsed["id"] = str(uuid.uuid4())
-    parsed["local_path"] = f"{TMP_BASE_PATH}/{parsed['id']}/{parsed['slug']}"
-
-    if len(path_parts) > 3:
-
-        parsed["type"] = path_parts[2]  # Usually 'tree' or 'blob'
-
-        # Find the commit hash or reconstruct the branch name
-        remaining_parts = path_parts[3:]
-        if remaining_parts[0] and len(remaining_parts[0]) == 40 and all(c in HEX_DIGITS for c in remaining_parts[0]):
-            parsed["commit"] = remaining_parts[0]
-            parsed["subpath"] = "/" + "/".join(remaining_parts[1:]) if len(remaining_parts) > 1 else "/"
-        else:
-            # Handle branch names with slashes and special characters
-            for i, part in enumerate(remaining_parts):
-                if part in ('tree', 'blob'):
-                    # Found another type indicator, everything before this was the branch name
-                    parsed["branch"] = "/".join(remaining_parts[:i])
-                    parsed["subpath"] = (
-                        "/" + "/".join(remaining_parts[i + 2 :]) if len(remaining_parts) > i + 2 else "/"
-                    )
-                    break
-            else:
-                # No additional type indicator found, assume everything is part of the branch name
-                parsed["branch"] = "/".join(remaining_parts)
-                parsed["subpath"] = "/"
+    user_name = path_parts[0]
+    repo_name = path_parts[1]
+    _id = str(uuid.uuid4())
+    slug = f"{user_name}-{repo_name}"
+
+    parsed = {
+        "user_name": user_name,
+        "repo_name": repo_name,
+        "type": None,
+        "branch": None,
+        "commit": None,
+        "subpath": "/",
+        "local_path": f"{TMP_BASE_PATH}/{_id}/{slug}",
+        # Keep original URL format but with decoded components
+        "url": f"https://{domain}/{user_name}/{repo_name}",
+        "slug": slug,
+        "id": _id,
+    }
+
+    if len(path_parts) < 4:
+        return parsed
+
+    parsed["type"] = path_parts[2]  # Usually 'tree' or 'blob'
+    commit = path_parts[3]
+
+    # Find the commit hash or reconstruct the branch name
+    remaining_parts = path_parts[3:]
+
+    if _is_valid_git_commit_hash(commit):
+        parsed["commit"] = commit
+        if len(remaining_parts) > 1:
+            parsed["subpath"] += "/".join(remaining_parts[1:])
+        return parsed
+
+    # Handle branch names with slashes and special characters
+
+    # Find the index of the first type indicator ('tree' or 'blob'), if any
+    type_indicator_index = next((i for i, part in enumerate(remaining_parts) if part in ('tree', 'blob')), None)
+
+    if type_indicator_index is None:
+        # No type indicator found; assume the entire input is the branch name
+        parsed["branch"] = "/".join(remaining_parts)
+        return parsed
+
+    # Found a type indicator; update branch and subpath
+    parsed["branch"] = "/".join(remaining_parts[:type_indicator_index])
+    if len(remaining_parts) > type_indicator_index + 2:
+        parsed["subpath"] += "/".join(remaining_parts[type_indicator_index + 2 :])
 
     return parsed
 
 
+def _is_valid_git_commit_hash(commit: str) -> bool:
+    return len(commit) == 40 and all(c in HEX_DIGITS for c in commit)
+
+
 def normalize_pattern(pattern: str) -> str:
     pattern = pattern.lstrip(os.sep)
     if pattern.endswith(os.sep):