[-] Remove no-color option

This commit is contained in:
Azalea (on HyDEV-Daisy) 2022-07-30 13:27:26 -04:00
parent 66ad0f7297
commit a917a9a693
3 changed files with 10 additions and 25 deletions

View file

@ -8,13 +8,10 @@ import re
from itertools import permutations from itertools import permutations
from typing import Iterable from typing import Iterable
from hyfetch import presets from .color_util import printc, color, clear_screen
from .color_util import printc, color, clear_screen, LightDark
from .constants import CONFIG_PATH, VERSION, TERM_LEN, TEST_ASCII_WIDTH, TEST_ASCII, GLOBAL_CFG from .constants import CONFIG_PATH, VERSION, TERM_LEN, TEST_ASCII_WIDTH, TEST_ASCII, GLOBAL_CFG
from .models import Config from .models import Config
from .neofetch_util import run_neofetch, get_distro_ascii, ColorAlignment, ascii_size, fore_back, \ from .neofetch_util import run_neofetch, get_distro_ascii, ColorAlignment, ascii_size, get_fore_back
get_fore_back
from .presets import PRESETS from .presets import PRESETS
@ -279,7 +276,6 @@ def run():
parser.add_argument('--debug', action='store_true', help=f'Debug mode') 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-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('--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() args = parser.parse_args()
@ -327,8 +323,5 @@ def run():
if config.lightness: if config.lightness:
preset = preset.set_light_dl(config.lightness) preset = preset.set_light_dl(config.lightness)
if args.no_color:
preset = None
# Run # Run
run_neofetch(preset, config.color_align) run_neofetch(preset, config.color_align)

View file

@ -154,11 +154,16 @@ def get_distro_name():
return check_output([get_command_path(), 'ascii_distro_name']).decode().strip() return check_output([get_command_path(), 'ascii_distro_name']).decode().strip()
def run_neofetch(preset: ColorProfile | None, alignment: ColorAlignment): def run_neofetch(preset: ColorProfile, alignment: ColorAlignment):
"""
Run neofetch with colors
:param preset: Color palette
:param alignment: Color alignment settings
"""
asc = get_distro_ascii() asc = get_distro_ascii()
w, h = ascii_size(asc) w, h = ascii_size(asc)
if preset is not None: asc = alignment.recolor_ascii(asc, preset)
asc = alignment.recolor_ascii(asc, preset)
# Write temp file # Write temp file
with TemporaryDirectory() as tmp_dir: with TemporaryDirectory() as tmp_dir:

View file

@ -11646,17 +11646,4 @@ get_print_custom_ascii() {
echo "$ascii_data" echo "$ascii_data"
} }
get_test_distro_ascii() {
# Load default config.
eval "$config"
distro="$CUSTOM_DISTRO"
ascii_distro=$distro
get_bold
get_distro_ascii
image_backend
dynamic_prompt
}
main "$@" main "$@"