Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-08 09:26:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify provider update script with pathlib

Browse Source
This commit is contained in:
link2xt
2022-08-06 11:58:57 +00:00
parent 50e53f2c82
commit c0d1c97490
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -18,6 +18,7 @@
### Changes ### Changes
- refactorings #3545 - refactorings #3545
- use [pathlib](https://docs.python.org/3/library/pathlib.html) in provider update script #3543
### Fixes ### Fixes
- improved error handling for account setup from qrcode #3474 - improved error handling for account setup from qrcode #3474

17
src/provider/update.py
View File

@@ -2,9 +2,9 @@
# if the yaml import fails, run "pip install pyyaml" # if the yaml import fails, run "pip install pyyaml"
import sys import sys
import os
import yaml import yaml
import datetime import datetime
from pathlib import Path
out_all = "" out_all = ""
out_domains = "" out_domains = ""
@@ -24,7 +24,7 @@ def cleanstr(s):
def file2id(f): def file2id(f):
return os.path.basename(f).replace(".md", "") return f.stem
def file2varname(f): def file2varname(f):
@@ -141,7 +141,7 @@ def process_data(data, file):
# finally, add the provider # finally, add the provider
global out_all, out_domains, out_ids global out_all, out_domains, out_ids
out_all += "// " + file[file.rindex("/")+1:] + ": " + comment.strip(", ") + "\n" out_all += "// " + file.name + ": " + comment.strip(", ") + "\n"
# also add provider with no special things to do - # also add provider with no special things to do -
# eg. _not_ supporting oauth2 is also an information and we can skip the mx-lookup in this case # eg. _not_ supporting oauth2 is also an information and we can skip the mx-lookup in this case
@@ -151,7 +151,7 @@ def process_data(data, file):
def process_file(file): def process_file(file):
print("processing file: " + file, file=sys.stderr) print("processing file: {}".format(file), file=sys.stderr)
with open(file) as f: with open(file) as f:
# load_all() loads "---"-separated yamls - # load_all() loads "---"-separated yamls -
# by coincidence, this is also the frontmatter separator :) # by coincidence, this is also the frontmatter separator :)
@@ -160,11 +160,10 @@ def process_file(file):
def process_dir(dir): def process_dir(dir):
print("processing directory: " + dir, file=sys.stderr) print("processing directory: {}".format(dir), file=sys.stderr)
files = [f for f in os.listdir(dir) if f.endswith(".md")] files = sorted(f for f in dir.iterdir() if f.suffix == '.md')
files.sort()
for f in files: for f in files:
process_file(os.path.join(dir, f)) process_file(f)
if __name__ == "__main__": if __name__ == "__main__":
@@ -179,7 +178,7 @@ if __name__ == "__main__":
"use std::collections::HashMap;\n\n" "use std::collections::HashMap;\n\n"
"use once_cell::sync::Lazy;\n\n") "use once_cell::sync::Lazy;\n\n")
process_dir(sys.argv[1]) process_dir(Path(sys.argv[1]))
out_all += "pub(crate) static PROVIDER_DATA: Lazy<HashMap<&'static str, &'static Provider>> = Lazy::new(|| [\n" out_all += "pub(crate) static PROVIDER_DATA: Lazy<HashMap<&'static str, &'static Provider>> = Lazy::new(|| [\n"
out_all += out_domains; out_all += out_domains;