From 604e804e73583cd396829d41ecb8f3baf789f754 Mon Sep 17 00:00:00 2001 From: "joel@joellee.org" Date: Fri, 6 Jan 2023 11:51:46 +0800 Subject: [PATCH] fix: handle stray / --- storage3/_async/file_api.py | 14 ++++++-------- storage3/_sync/file_api.py | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/storage3/_async/file_api.py b/storage3/_async/file_api.py index 082f87cc..f5f8a7cb 100644 --- a/storage3/_async/file_api.py +++ b/storage3/_async/file_api.py @@ -81,15 +81,13 @@ async def get_public_url(self, path: str, options: TransformOptions = {}) -> str path file path, including the path and file name. For example `folder/image.png`. """ - render_path = "object" - # render_path = ( - # "render/image/authenticated" if options.get("transform") else "object" - # ) - # transformation_query = urllib.parse.urlencode(options) - # query_string = f"?{transformation_query}" if transformation_query else "" - query_string = "" + render_path = ( + "render/image/authenticated" if options.get("transform") else "object" + ) + transformation_query = urllib.parse.urlencode(options) + query_string = f"/?{transformation_query}" if transformation_query else "" _path = self._get_final_path(path) - return f"{self._client.base_url}{render_path}/public/{_path}" + return f"{self._client.base_url}{render_path}/public/{_path}{query_string}" async def move(self, from_path: str, to_path: str) -> dict[str, str]: """ diff --git a/storage3/_sync/file_api.py b/storage3/_sync/file_api.py index 85fbc51f..bd3059d9 100644 --- a/storage3/_sync/file_api.py +++ b/storage3/_sync/file_api.py @@ -81,15 +81,13 @@ def get_public_url(self, path: str, options: TransformOptions = {}) -> str: path file path, including the path and file name. For example `folder/image.png`. """ - render_path = "object" - # render_path = ( - # "render/image/authenticated" if options.get("transform") else "object" - # ) - # transformation_query = urllib.parse.urlencode(options) - # query_string = f"?{transformation_query}" if transformation_query else "" - query_string = "" + render_path = ( + "render/image/authenticated" if options.get("transform") else "object" + ) + transformation_query = urllib.parse.urlencode(options) + query_string = f"/?{transformation_query}" if transformation_query else "" _path = self._get_final_path(path) - return f"{self._client.base_url}{render_path}/public/{_path}" + return f"{self._client.base_url}{render_path}/public/{_path}{query_string}" def move(self, from_path: str, to_path: str) -> dict[str, str]: """