Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(shared): fix missing port in public_url

This commit is contained in:
jo 2022-02-22 18:40:46 +01:00 committed by Kyle Robbertze
parent f24996e144
commit ba0897a023
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shared/libretime_shared/config.py
View File

@ -105,7 +105,7 @@ class GeneralConfig(BaseModel):
protocol: str = "http" protocol: str = "http"
base_url: str = "localhost" base_url: str = "localhost"
base_port: int = 80 base_port: Optional[int]
base_dir: str = "/" base_dir: str = "/"
force_ssl: bool = False force_ssl: bool = False
@ -113,8 +113,13 @@ class GeneralConfig(BaseModel):
def public_url(self) -> str: def public_url(self) -> str:
scheme = "https" if self.force_ssl else self.protocol scheme = "https" if self.force_ssl else self.protocol
url = urlunsplit((scheme, self.base_url, self.base_dir, None, None)) location = self.base_url
return url.rstrip("/") if self.base_port is not None:
location += f":{self.base_port}"
path = self.base_dir.rstrip("/")
return urlunsplit((scheme, location, path, None, None))
# pylint: disable=too-few-public-methods # pylint: disable=too-few-public-methods