kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[O] Optimize, fix python 3 conventions

Browse source
This commit is contained in:
Azalea (on HyDEV-Daisy) 2022-08-13 15:24:00 -04:00
parent 71dd40ecb9
commit 0837ac87cf
1 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
hyfetch/main.py
View file

@ -10,7 +10,7 @@ from typing import Iterable
from math import ceil from math import ceil
from .color_util import printc, color, clear_screen from .color_util import printc, color, clear_screen
from .constants import CONFIG_PATH, VERSION, TERM_LEN, TERM_LINES, TEST_ASCII_WIDTH, TEST_ASCII, GLOBAL_CFG from .constants import *
from .models import Config from .models import Config
from .neofetch_util import run_neofetch, get_distro_ascii, ColorAlignment, ascii_size, get_fore_back from .neofetch_util import run_neofetch, get_distro_ascii, ColorAlignment, ascii_size, get_fore_back
from .presets import PRESETS from .presets import PRESETS
@ -137,39 +137,29 @@ def create_config() -> Config:
flags_per_row = TERM_LEN // (spacing + 2) flags_per_row = TERM_LEN // (spacing + 2)
row_per_page = (TERM_LINES - 13) // 5 row_per_page = (TERM_LINES - 13) // 5
num_pages = ceil(len(flags) / (flags_per_row * row_per_page)) num_pages = ceil(len(flags) / (flags_per_row * row_per_page))
print(num_pages)
# Create pages
pages = [] pages = []
done = False for i in range(num_pages):
for i in range(0, num_pages):
page = [] page = []
for j in range(0, row_per_page): for j in range(row_per_page):
row = [] page.append(flags[:flags_per_row])
for k in range(0, flags_per_row): flags = flags[flags_per_row:]
try: if not flags:
row.append(flags[0])
flags = flags[1:]
except IndexError:
done = True
break
page.append(row)
if done:
break break
pages.append(page) pages.append(page)
def print_flag_page(page, page_num): def print_flag_page(page: list[list[list[str]]], page_num: int):
clear_screen(title) clear_screen(title)
printc('&a3. Let\'s choose a flag!') printc('&a3. Let\'s choose a flag!')
printc('Available flag presets:') printc('Available flag presets:')
print('Page: ' + str(page_num + 1) + ' of ' + str(num_pages)) print(f'Page: {page_num + 1} of {num_pages}')
print() print()
for i in page: for i in page:
print_flag_row(i) print_flag_row(i)
print() print()
def print_flag_row(current): def print_flag_row(current: list[list[str]]):
[printc(' '.join(line)) for line in zip(*current)] [printc(' '.join(line)) for line in zip(*current)]
print() print()
@ -183,7 +173,7 @@ def create_config() -> Config:
opts.append('next') opts.append('next')
if page > 0: if page > 0:
opts.append('prev') opts.append('prev')
print("Enter \'next\' to go to the next page and \'prev\' to go to the previous page.") print("Enter 'next' to go to the next page and 'prev' to go to the previous page.")
preset = literal_input(f'Which {tmp} do you want to use? ', opts, 'rainbow', show_ops=False) preset = literal_input(f'Which {tmp} do you want to use? ', opts, 'rainbow', show_ops=False)
if preset == 'next': if preset == 'next':
page += 1 page += 1
@ -192,7 +182,7 @@ def create_config() -> Config:
else: else:
_prs = PRESETS[preset] _prs = PRESETS[preset]
title += f'\n&e3. Selected flag: &r{_prs.color_text(preset)}' title += f'\n&e3. Selected flag: &r{_prs.color_text(preset)}'
break; break
############################# #############################
# 4. Dim/lighten colors # 4. Dim/lighten colors