From 66ad0f72974829642edd71a997518a5cb18e0c7a Mon Sep 17 00:00:00 2001 From: "Azalea (on HyDEV-Daisy)" Date: Sat, 30 Jul 2022 13:00:17 -0400 Subject: [PATCH] [+] Add no-color argument --- hyfetch/main.py | 10 +++++++--- hyfetch/neofetch_util.py | 5 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/hyfetch/main.py b/hyfetch/main.py index d9b92ca6..f2b29225 100755 --- a/hyfetch/main.py +++ b/hyfetch/main.py @@ -276,9 +276,10 @@ def run(): parser.add_argument('--c-scale', dest='scale', help=f'Lighten colors by a multiplier', type=float) parser.add_argument('--c-set-l', dest='light', help=f'Set lightness value of the colors', type=float) parser.add_argument('-V', '--version', dest='version', action='store_true', help=f'Check version') - parser.add_argument('--debug', action='store_true', help=color(f'Debug mode')) - parser.add_argument('--test-distro', help=color(f'Test for a specific distro')) - parser.add_argument('--test-print', action='store_true', help=color(f'Test print distro ascii art only')) + parser.add_argument('--debug', action='store_true', help=f'Debug mode') + parser.add_argument('--test-distro', help=f'Test for a specific distro') + parser.add_argument('--test-print', action='store_true', help=f'Test print distro ascii art only') + parser.add_argument('--no-color', action='store_true', help=f'Use original neofetch without colors') args = parser.parse_args() @@ -326,5 +327,8 @@ def run(): if config.lightness: preset = preset.set_light_dl(config.lightness) + if args.no_color: + preset = None + # Run run_neofetch(preset, config.color_align) diff --git a/hyfetch/neofetch_util.py b/hyfetch/neofetch_util.py index 8bdb00f5..94f0f24b 100644 --- a/hyfetch/neofetch_util.py +++ b/hyfetch/neofetch_util.py @@ -154,10 +154,11 @@ def get_distro_name(): return check_output([get_command_path(), 'ascii_distro_name']).decode().strip() -def run_neofetch(preset: ColorProfile, alignment: ColorAlignment): +def run_neofetch(preset: ColorProfile | None, alignment: ColorAlignment): asc = get_distro_ascii() w, h = ascii_size(asc) - asc = alignment.recolor_ascii(asc, preset) + if preset is not None: + asc = alignment.recolor_ascii(asc, preset) # Write temp file with TemporaryDirectory() as tmp_dir: