flavours/cli: colorise output, add -j/--json arg
This commit is contained in:
parent
69c73e41dd
commit
f140fa36ce
2 changed files with 64 additions and 11 deletions
|
@ -1,20 +1,54 @@
|
|||
import click
|
||||
import logging
|
||||
|
||||
from .flavour import get_flavours
|
||||
from json import dumps
|
||||
|
||||
from config.state import config
|
||||
from utils import colors_supported, color_str
|
||||
|
||||
from .flavour import get_flavours, get_profile_flavour
|
||||
|
||||
profile_option = click.option('-p', '--profile', help="name of the profile to use", required=False, default=None)
|
||||
|
||||
|
||||
@click.command(name='flavours')
|
||||
def cmd_flavours():
|
||||
@click.option('-j', '--json', is_flag=True, help='output machine-parsable JSON format')
|
||||
def cmd_flavours(json: bool = False):
|
||||
'list information about available flavours'
|
||||
results = []
|
||||
profile_flavour = None
|
||||
flavours = get_flavours()
|
||||
use_colors = colors_supported(config.runtime.colors)
|
||||
if not flavours:
|
||||
raise Exception("No flavours found!")
|
||||
if not json:
|
||||
try:
|
||||
profile_flavour = get_profile_flavour()
|
||||
except Exception as ex:
|
||||
logging.debug(f"Failed to get profile flavour for marking as currently selected, continuing anyway. Exception: {ex}")
|
||||
for name in sorted(flavours.keys()):
|
||||
f = flavours[name]
|
||||
try:
|
||||
f.parse_flavourinfo()
|
||||
except:
|
||||
pass
|
||||
print(f)
|
||||
except Exception as ex:
|
||||
logging.debug(f"A problem happened while parsing flavourinfo for {name}, continuing anyway. Exception: {ex}")
|
||||
if not json:
|
||||
block = [*f.nice_str(newlines=True, colors=use_colors).split('\n'), '']
|
||||
if profile_flavour == f:
|
||||
prefix = color_str('>>> ', bold=True, fg='bright_green', use_colors=use_colors)
|
||||
block += [
|
||||
color_str("Currently selected by profile ", bold=True, use_colors=use_colors) +
|
||||
color_str(f'"{config.file.profiles.current}"\n', bold=True, fg="bright_green")
|
||||
]
|
||||
block = [prefix + line for line in block]
|
||||
results += block
|
||||
else:
|
||||
f.pkgbuild = f.pkgbuild.name if f.pkgbuild else None
|
||||
d = dict(f)
|
||||
results += [d]
|
||||
print()
|
||||
if json:
|
||||
print(dumps({r['name']: r for r in results}, indent=4))
|
||||
else:
|
||||
for r in results:
|
||||
print(r)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue