zev/publify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check for an exact match in all cases when assigning a custom domain, on creation or after. remove a superfluous call

Browse Source
This commit is contained in:
Zev Averbach
2023-04-01 21:05:58 +02:00
parent cecaa1a2c6
commit 2456c056f4
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
publify/api.py
View File

@@ -49,7 +49,6 @@ def deploy_page_to_netlify(dirpath: pl.Path, custom_domain: str | None = None) -
rj = response.json() rj = response.json()
print("the site is published: " + rj["url"]) print("the site is published: " + rj["url"])
if custom_domain is not None: if custom_domain is not None:
check_that_custom_domain_is_not_in_use(custom_domain)
set_to_custom_domain(rj["id"], custom_domain, rj["url"]) set_to_custom_domain(rj["id"], custom_domain, rj["url"])
@@ -119,17 +118,13 @@ def get_site_id_from_custom_domain(custom_domain: str) -> tuple[str, str]:
raise NoResult raise NoResult
def check_that_custom_domain_is_not_in_use( def check_that_custom_domain_is_not_in_use(custom_domain: str) -> None:
custom_domain: str, exact_match: bool = False
) -> None:
candidate = None candidate = None
for site in get_all_sites(): for site in get_all_sites():
scd = site["custom_domain"] scd = site["custom_domain"]
if scd is None: if scd is None:
continue continue
if exact_match and scd == custom_domain: if scd == custom_domain:
raise DomainInUse(f"'{custom_domain}' is already in use")
elif not exact_match and scd.startswith(custom_domain):
if candidate is not None: if candidate is not None:
raise TooManyResults( raise TooManyResults(
f"too many results for partial domain '{custom_domain}', it's ambiguous" f"too many results for partial domain '{custom_domain}', it's ambiguous"