YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

domain_info: add 'topest_parent' info + fix small bug with return_self option for _get_parent_domain_of

Browse source
This commit is contained in:
Alexandre Aubin 2022-10-07 15:07:48 +02:00
parent 435084c20b
commit b30962a44f
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/domain.py
View file

@ -167,6 +167,7 @@ def domain_info(domain):
"registrar": registrar, "registrar": registrar,
"apps": apps, "apps": apps,
"main": _get_maindomain() == domain, "main": _get_maindomain() == domain,
"topest_parent": _get_parent_domain_of(domain, return_self=True, topest=True),
# TODO : add parent / child domains ? # TODO : add parent / child domains ?
} }
@ -188,15 +189,17 @@ def _list_subdomains_of(parent_domain):
return out return out
def _get_parent_domain_of(domain, return_self=True): def _get_parent_domain_of(domain, return_self=True, topest=False):
_assert_domain_exists(domain) _assert_domain_exists(domain)
domains = _get_domains() domains = _get_domains(exclude_subdomains=topest)
while "." in domain:
domain = domain.split(".", 1)[1] domain_ = domain
if domain in domains: while "." in domain_:
return domain domain_ = domain_.split(".", 1)[1]
if domain_ in domains:
return domain_
return domain if return_self else None return domain if return_self else None