olog/symconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve output formatting

Browse Source
This commit is contained in:
Sam G. 2024-07-05 04:11:54 -07:00
parent 6c01071f04
commit fe3729eef7
3 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile
View File

@ -8,6 +8,9 @@ endif
## ------------------ docs ------------------ ##
docs-publish:
scp -r docs/_build/html/* hetz-cloud:/var/www/doc.olog.io/symconf/
docs-serve:
cd docs/_build/html && python -m http.server 9091
@ -19,23 +22,18 @@ docs-clean:
make -C docs/ clean
rm -rf docs/_autoref
rm -rf docs/_autosummary
## ------------------------------------------ ##
## ------------------ sync ------------------ ##
sync:
$(BASH) autoconf/sync.sh
## ----------------- tests ------------------ ##
test:
pytest --pyargs tests -v
## ------------------------------------------ ##
## ----------------- build ------------------ ##
build:
python -m build
## ----------------- themes ----------------- ##
gen-tone4:
$(PYTHON) autoconf/gen_theme.py -a kitty -p tone4
set-tone4-light:
$(PYTHON) autoconf/set_theme.py -p tone4 -s light -a "*"
set-tone4-dark:
$(PYTHON) autoconf/set_theme.py -p tone4 -s dark -a "*"
publish:
python -m twine upload dist/*
## ------------------------------------------ ##

1
symconf/__main__.py
View File

@ -94,7 +94,6 @@ add_set_subparser(subparsers)
if __name__ == '__main__':
args = parser.parse_args()
print(args)
if 'func' in args:
args.func(args)

36
symconf/config.py
View File

@ -424,6 +424,8 @@ class ConfigManager:
full_path, # to internal config location
))
print('├─ ' + Fore.YELLOW + f'{app_name} :: matched {len(to_symlink)} config files')
links_succ = []
links_fail = []
for from_path, to_path in to_symlink:
@ -455,6 +457,17 @@ class ConfigManager:
from_path.symlink_to(to_path)
links_succ.append((from_path, to_path))
# link report
for from_p, to_p in links_succ:
from_p = from_p
to_p = to_p.relative_to(self.config_dir)
print(Fore.GREEN + f'│ > linked {from_p} -> {to_p}')
for from_p, to_p in links_fail:
from_p = from_p
to_p = to_p.relative_to(self.config_dir)
print(Fore.RED + f'│ > failed to link {from_p} -> {to_p}')
# run matching scripts for app-specific reload
script_list = self.get_matching_scripts(
app_name,
@ -463,22 +476,16 @@ class ConfigManager:
)
for script in script_list:
print(Fore.BLUE + f'> Running script "{script.relative_to(self.config_dir)}"')
print(Fore.BLUE + f'│ > running script "{script.relative_to(self.config_dir)}"')
output = subprocess.check_output(str(script), shell=True)
if output:
fmt_output = output.decode().strip().replace('\n','\n│ ')
print(
Fore.BLUE + Style.DIM + f'-> Captured script output "{output.decode().strip()}"' + Style.RESET_ALL
Fore.BLUE + Style.DIM \
+ f'│ > captured script output "{fmt_output}"' \
+ Style.RESET_ALL
)
for from_p, to_p in links_succ:
from_p = from_p
to_p = to_p.relative_to(self.config_dir)
print(Fore.GREEN + f'> {app_name} :: {from_p} -> {to_p}')
for from_p, to_p in links_fail:
from_p = from_p
to_p = to_p.relative_to(self.config_dir)
print(Fore.RED + f'> {app_name} :: {from_p} -> {to_p}')
def update_apps(
self,
apps: str | list[str] = '*',
@ -496,6 +503,11 @@ class ConfigManager:
print(f'None of the apps "{apps}" are registered, exiting')
return
print('> symconf parameters: ')
print(' > registered apps :: ' + Fore.YELLOW + f'{app_list}' + Style.RESET_ALL)
print(' > palette :: ' + Fore.YELLOW + f'{palette}' + Style.RESET_ALL)
print(' > scheme :: ' + Fore.YELLOW + f'{scheme}\n' + Style.RESET_ALL)
for app_name in app_list:
self.update_app_config(
app_name,