Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-01 20:36:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

check for missing before_login_hint

Browse Source
This commit is contained in:
B. Petersen
2020-01-29 17:34:41 +01:00
parent ff075ba612
commit d9ab37ea58
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/provider/update.py
View File

@@ -31,7 +31,6 @@ def file2url(f):
def process_data(data, file): def process_data(data, file):
global out_all, out_domains
status = data.get("status", "") status = data.get("status", "")
out_provider = " static ref " + file2varname(file) + ": Provider = Provider {\n" out_provider = " static ref " + file2varname(file) + ": Provider = Provider {\n"
if status == "OK" or status == "PREPARATION" or status == "BROKEN": if status == "OK" or status == "PREPARATION" or status == "BROKEN":
@@ -40,13 +39,14 @@ def process_data(data, file):
raise TypeError("bad status") raise TypeError("bad status")
comment = "" comment = ""
domains = ""
if not "domains" in data: if not "domains" in data:
raise TypeError("no domains found") raise TypeError("no domains found")
for domain in data["domains"]: for domain in data["domains"]:
domain = cleanstr(domain) domain = cleanstr(domain)
if domain == "" or domain.count(".") < 1 or domain.lower() != domain: if domain == "" or domain.count(".") < 1 or domain.lower() != domain:
raise TypeError("bad domain: " + domain) raise TypeError("bad domain: " + domain)
out_domains += " (\"" + domain + "\", &*" + file2varname(file) + "),\n" domains += " (\"" + domain + "\", &*" + file2varname(file) + "),\n"
comment += domain + ", " comment += domain + ", "
out_server = "" out_server = ""
@@ -78,16 +78,24 @@ def process_data(data, file):
out_server += (" Server { protocol: " + protocol + ", socket: " + socket + ", hostname: \"" out_server += (" Server { protocol: " + protocol + ", socket: " + socket + ", hostname: \""
+ hostname + "\", port: " + str(port) + ", username_pattern: " + username_pattern + " },\n") + hostname + "\", port: " + str(port) + ", username_pattern: " + username_pattern + " },\n")
before_login_hint = cleanstr(data.get("before_login_hint", ""))
after_login_hint = cleanstr(data.get("after_login_hint", ""))
if (not has_imap and not has_smtp) or (has_imap and has_smtp): if (not has_imap and not has_smtp) or (has_imap and has_smtp):
out_provider += " before_login_hint: \"" + cleanstr(data.get("before_login_hint", "")) + "\",\n" out_provider += " before_login_hint: \"" + before_login_hint + "\",\n"
out_provider += " after_login_hint: \"" + cleanstr(data.get("after_login_hint", "")) + "\",\n" out_provider += " after_login_hint: \"" + after_login_hint + "\",\n"
out_provider += " overview_page: \"" + file2url(file) + "\",\n" out_provider += " overview_page: \"" + file2url(file) + "\",\n"
out_provider += " server: vec![\n" + out_server + " ],\n" out_provider += " server: vec![\n" + out_server + " ],\n"
out_provider += " };\n\n" out_provider += " };\n\n"
else: else:
raise TypeError("SMTP and IMAP must be specified together or left out both") raise TypeError("SMTP and IMAP must be specified together or left out both")
out_all += " // " + file[file.rindex("/")+1:] + ": " + comment.strip(", ") + "\n" + out_provider if status != "OK" and before_login_hint == "":
raise TypeError("status PREPARATION or BROKEN requires before_login_hint: " + file)
global out_all, out_domains
out_all += " // " + file[file.rindex("/")+1:] + ": " + comment.strip(", ") + "\n"
out_all += out_provider
out_domains += domains
def process_file(file): def process_file(file):