Jaculabilis
/
amanuensis
1
1
Fork 0
Code Issues 19 Pull Requests Projects 1 Releases Activity

Unify path argument behavior across config helpers

This commit is contained in:
Tim Van Baak 2020-01-16 23:22:51 -08:00
parent 11d231aba8
commit 4c41407d69
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
amanuensis/config/__init__.py
View File

@ -41,13 +41,16 @@ def get(key):
return GLOBAL_CONFIG[key] return GLOBAL_CONFIG[key]
def prepend(*path): def prepend(*path):
return os.path.join(CONFIG_DIR, *path) joined = os.path.join(*path)
if not joined.startswith(CONFIG_DIR):
joined = os.path.join(CONFIG_DIR, joined)
return joined
def open_sh(path, mode): def open_sh(*path, mode):
return config.loader.open_sh(prepend(path), mode) return config.loader.open_sh(prepend(*path), mode)
def open_ex(path, mode): def open_ex(*path, mode):
return config.loader.open_ex(prepend(path), mode) return config.loader.open_ex(prepend(*path), mode)
def json_ro(*path): def json_ro(*path):
return config.loader.json_ro(prepend(*path)) return config.loader.json_ro(prepend(*path))
@ -59,11 +62,11 @@ def new_user(user_json):
user_dir = prepend("user", user_json['uid']) user_dir = prepend("user", user_json['uid'])
# Create user dir and put config in it # Create user dir and put config in it
os.mkdir(user_dir) os.mkdir(user_dir)
with config.loader.open_ex(os.path.join(user_dir, "config.json"), 'w') as f: with open_ex(user_dir, "config.json", mode='w') as f:
json.dump(user_json, f, allow_nan=False, indent='\t') json.dump(user_json, f, allow_nan=False, indent='\t')
# Ensure index exists # Ensure index exists
if not os.path.isdir(prepend('user', 'index.json')): if not os.path.isfile(prepend('user', 'index.json')):
with open_ex(os.path.join('user', 'index.json'), 'w') as f: with open_ex('user', 'index.json', mode='w') as f:
json.dump({}, f) json.dump({}, f)
# Update index # Update index
with json_rw('user', 'index.json') as j: with json_rw('user', 'index.json') as j: