rhpidfyre/proxmox-ntfy
1
0
Fork 0
mirror of https://github.com/unixtensor/proxmox-ntfy.git synced 2025-06-28 03:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the url argument appending an extra forward slash if its already present

Browse Source
This commit is contained in:
rhpidfyre
2025-06-10 16:59:06 -04:00
parent 1d8c74a9d2
commit dd84f772b9
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.py
View File

@ -22,13 +22,14 @@ class Address:
def __init__(self, address: str): def __init__(self, address: str):
self.address = address self.address = address
def valid(self) -> bool: def is_valid(self) -> bool:
if re.search(r"^\d+[.]\d+[.]\d+[.]\d+|^(https|http)://.+$", self.address): return re.search(r"^\d+[.]\d+[.]\d+[.]\d+|^(https|http)://.+$", self.address) != None
return True
return False
def format(self, topic: str) -> str: def format(self, topic: str) -> str:
return self.address + "/" + topic addr = self.address
if self.address[len(self.address)-1] != "/":
addr += "/"
return addr + topic
def not_valid_prompt(self) -> str: def not_valid_prompt(self) -> str:
return f"""The address "{self.address}" is not valid. return f"""The address "{self.address}" is not valid.
@ -38,9 +39,9 @@ http://domain.com
https://domain.com\033[0m https://domain.com\033[0m
Address with a topic: Address with a topic:
\033[32m10.0.0.69:42069 -t|--topic example_topic \033[32m10.0.0.69:42069\033[0m -t|--topic \033[32mexample_topic\033[0m
http://domain.com -t|--topic example_topic \033[32mhttp://domain.com\033[0m -t|--topic \033[32mexample_topic\033[0m
https://domain.com -t|--topic example_topic\033[0m""" \033[32mhttps://domain.com\033[0m -t|--topic \033[32mexample_topic\033[0m"""
class Config(TypedDict): class Config(TypedDict):
cpu_temp_warning_timeout: int cpu_temp_warning_timeout: int
@ -77,7 +78,7 @@ class Init:
def main(): def main():
cli_args = cli.Interface() cli_args = cli.Interface()
address = Address(cli_args.server_address_no_topic) address = Address(cli_args.server_address_no_topic)
if address.valid(): if address.is_valid():
Init({ Init({
"cpu_temp_warning_timeout": cli_args.cpu_temp_warning_timeout, "cpu_temp_warning_timeout": cli_args.cpu_temp_warning_timeout,
"cpu_temp_warning_message": cli_args.cpu_temp_warning_message, "cpu_temp_warning_message": cli_args.cpu_temp_warning_message,