From bd5d76167e32994af3590197730e9b870107398f Mon Sep 17 00:00:00 2001 From: "Azalea (on HyDEV-Daisy)" Date: Sun, 23 Oct 2022 02:06:45 -0400 Subject: [PATCH] [F] Fix incorrect coloring when the first color isn't ${c1} --- hyfetch/main.py | 8 ++++---- hyfetch/neofetch_util.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hyfetch/main.py b/hyfetch/main.py index f4ccdfd1..6fc873e7 100755 --- a/hyfetch/main.py +++ b/hyfetch/main.py @@ -284,16 +284,16 @@ def create_config() -> Config: # Random color schemes pis = list(range(len(_prs.unique_colors().colors))) - slots = len(set(re.findall('(?<=\\${c)[0-9](?=})', asc))) - while len(pis) < slots: + slots = list(set(re.findall('(?<=\\${c)[0-9](?=})', asc))) + while len(pis) < len(slots): pis += pis - perm = {p[:slots] for p in permutations(pis)} + perm = {p[:len(slots)] for p in permutations(pis)} random_count = ascii_per_row * ascii_rows - len(arrangements) if random_count > len(perm): choices = perm else: choices = random.sample(perm, random_count) - choices = [{i + 1: n for i, n in enumerate(c)} for c in choices] + choices = [{slots[i]: n for i, n in enumerate(c)} for c in choices] arrangements += [(f'random{i}', ColorAlignment('custom', r)) for i, r in enumerate(choices)] asciis = [[*ca.recolor_ascii(asc, _prs).split('\n'), k.center(asc_width)] for k, ca in arrangements] diff --git a/hyfetch/neofetch_util.py b/hyfetch/neofetch_util.py index 9002bdab..864cdaf7 100644 --- a/hyfetch/neofetch_util.py +++ b/hyfetch/neofetch_util.py @@ -288,8 +288,9 @@ def get_fore_back(distro: str | None = None) -> tuple[int, int] | None: distro = GLOBAL_CFG.override_distro if not distro: distro = get_distro_name().lower() + distro = distro.lower() for k, v in fore_back.items(): - if distro.startswith(k.lower()): + if distro == k.lower(): return v return None