From d63424e793a5acc0c2506467a278f39a899d9769 Mon Sep 17 00:00:00 2001 From: deadc0de6 Date: Wed, 27 Nov 2019 19:33:46 +0100 Subject: [PATCH] refactor printing dotfiles --- dotdrop/dotdrop.py | 15 +++++++++------ dotdrop/logger.py | 15 +++++++++++---- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/dotdrop/dotdrop.py b/dotdrop/dotdrop.py index 0d8bef9..09ba096 100644 --- a/dotdrop/dotdrop.py +++ b/dotdrop/dotdrop.py @@ -408,9 +408,11 @@ def cmd_importer(o): def cmd_list_profiles(o): """list all profiles""" - LOG.log('Available profile(s):') + LOG.emph('Available profile(s):\n') for p in o.profiles: - LOG.sub(p.key) + LOG.sub(p.key, end='') + LOG.log(' ({} dotfiles)'.format(len(p.dotfiles))) + #LOG.sub('{} ({} dotfile(s))'.format(p.key, len(p.dotfiles))) LOG.log('') @@ -422,15 +424,16 @@ def cmd_list_files(o): what = 'Dotfile(s)' if o.files_templateonly: what = 'Template(s)' - LOG.emph('{} for profile \"{}\"\n'.format(what, o.profile)) + LOG.emph('{} for profile \"{}\":\n'.format(what, o.profile)) for dotfile in o.dotfiles: if o.files_templateonly: src = os.path.join(o.dotpath, dotfile.src) if not Templategen.is_template(src): continue - LOG.log('{} (src: \"{}\", link: {})'.format(dotfile.key, dotfile.src, - dotfile.link.name.lower())) - LOG.sub('{}'.format(dotfile.dst)) + LOG.log('{}'.format(dotfile.key), bold=True) + LOG.sub('dst: {}'.format(dotfile.dst)) + LOG.sub('src: {}'.format(dotfile.src)) + LOG.sub('link: {}'.format(dotfile.link.name.lower())) LOG.log('') diff --git a/dotdrop/logger.py b/dotdrop/logger.py index a784ac0..8f23622 100644 --- a/dotdrop/logger.py +++ b/dotdrop/logger.py @@ -24,15 +24,22 @@ class Logger: def __init__(self): pass - def log(self, string, end='\n', pre=''): + def log(self, string, end='\n', pre='', bold=False): cs = self._color(self.BLUE) ce = self._color(self.RESET) - sys.stdout.write('{}{}{}{}{}'.format(pre, cs, string, end, ce)) + if bold: + bl = self._color(self.BOLD) + fmt = '{}{}{}{}{}{}{}'.format(pre, cs, bl, + string, ce, + end, ce) + else: + fmt = '{}{}{}{}{}'.format(pre, cs, string, end, ce) + sys.stdout.write(fmt) - def sub(self, string): + def sub(self, string, end='\n'): cs = self._color(self.BLUE) ce = self._color(self.RESET) - sys.stdout.write('\t{}->{} {}\n'.format(cs, ce, string)) + sys.stdout.write('\t{}->{} {}{}'.format(cs, ce, string, end)) def emph(self, string): cs = self._color(self.EMPH)