feat: speed up url joins (#220)

uilibs · Sep 19, 2024 · a10fc5a · a10fc5a
1 parent 2a65bff
commit a10fc5a
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/uiprotect/api.py b/src/uiprotect/api.py
@@ -17,7 +17,7 @@
 from ipaddress import IPv4Address, IPv6Address
 from pathlib import Path
 from typing import Any, Literal, cast
-from urllib.parse import urljoin
+from urllib.parse import SplitResult
 
 import aiofiles
 import aiohttp
@@ -327,7 +327,9 @@ async def request(
         if require_auth:
             await self.ensure_authenticated()
 
-        request_url = self._url.joinpath(url[1:])
+        request_url = self._url.join(
+            URL(SplitResult("", "", url, "", ""), encoded=True)
+        )
         headers = kwargs.get("headers") or self.headers
         _LOGGER.debug("Request url: %s", request_url)
         if not self._verify_ssl:
@@ -387,10 +389,9 @@ async def api_request_raw(
         **kwargs: Any,
     ) -> bytes | None:
         """Make a request to UniFi Protect API"""
-        url = urljoin(self.api_path, url)
         response = await self.request(
             method,
-            url,
+            f"{self.api_path}{url}",
             require_auth=require_auth,
             auto_close=False,
             **kwargs,
@@ -1542,7 +1543,7 @@ async def get_camera_video(
 
         r = await self.request(
             "get",
-            urljoin(self.api_path, path),
+            f"{self.api_path}{path}",
             auto_close=False,
             timeout=0,
             params=params,