GitHubMirror/sshyp
1
0
Fork 0
mirror of https://github.com/rwinkhart/sshyp.git synced 2026-09-06 00:57:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve text wrapping for entry list - list now uses full width of terminal and can be displayed in smaller terminals without crashing

Browse Source
This commit is contained in:
RandyTheSilly
2023-12-11 02:58:04 -05:00
parent 27cf610a1f
commit 23e51ae133
2 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/sshyp.py
+16 -17
View File
@@ -18,29 +18,28 @@ home = expanduser('~')
# generates and prints full entry list # generates and prints full entry list
def entry_list_gen(_directory=f"{home}/.local/share/sshyp/"): def entry_list_gen(_directory=f"{home}/.local/share/sshyp/"):
from shutil import get_terminal_size from shutil import get_terminal_size
from textwrap import fill _ran, _width = False, get_terminal_size().columns
_ran = False print(f"\nfor a list of usable commands, run 'sshyp help'\n\n\u001b[38;5;0;48;5;15msshyp entries ({str(_width)} cols):\u001b[0m", end='')
print("\nfor a list of usable commands, run 'sshyp help'\n\n\u001b[38;5;0;48;5;15msshyp entries:\u001b[0m\n")
for _root, _dirs, _files in sorted(walk(_directory, topdown=True)): for _root, _dirs, _files in sorted(walk(_directory, topdown=True)):
_entry_list, _color_alternator = [], 1 _color_alternator = 1
if _ran: if _ran:
print(f"\u001b[38;5;7;48;5;8m{_root.replace(f'{home}/.local/share/sshyp', '', 1)}/\u001b[0m") print(f"\n\n\u001b[38;5;7;48;5;8m{_root.replace(f'{home}/.local/share/sshyp', '', 1)}/\u001b[0m")
for filename in sorted(_files): _char_counter = 0
for _filename in sorted(_files):
if _color_alternator > 0: if _color_alternator > 0:
_entry_list.append(filename[:-4]) _print_string = _filename[:-4]
else: else:
_entry_list.append(f"\u001b[38;5;8m{filename[:-4]}\u001b[0m") _print_string = f"\u001b[38;5;8m{_filename[:-4]}\u001b[0m"
# -3 instead of -4 to account for trailing space character
_char_counter += len(_filename)-3
if _char_counter >= _width:
# reset _char_counter to length of first entry in new line
_char_counter = len(_filename)-3
print()
print(_print_string + ' ', end='')
_color_alternator = _color_alternator * -1 _color_alternator = _color_alternator * -1
_real = len(' '.join(_entry_list)) - (5.5 * len(_entry_list))
if _real <= get_terminal_size()[0]:
_width = len(' '.join(_entry_list))
else:
_width = (len(' '.join(_entry_list)) / (_real / get_terminal_size()[0]) - 25)
if len(_entry_list) > 0:
print(fill(' '.join(_entry_list), width=_width) + '\n')
elif _ran:
print('\u001b[38;5;9m-empty directory-\u001b[0m\n')
_ran = True _ran = True
print('\n')
# displays the contents of an entry in a readable format # displays the contents of an entry in a readable format
lib/stweak.py
+5 -5
View File
@@ -45,12 +45,12 @@ def curses_radio(_options, _pretext):
_current_line = 0 _current_line = 0
for _line in _pretext_lines: for _line in _pretext_lines:
if _current_line <= _height-4: if _current_line <= _height-4:
_remaining, _button_gen = _line, True _button_gen = True
while len(_remaining) > _width: while len(_line) > _width:
stdscr.addstr(_current_line, 0, _remaining[:_width]) stdscr.addstr(_current_line, 0, _line[:_width])
_remaining = _remaining[_width:] _line = _line[_width:]
_current_line += 1 _current_line += 1
stdscr.addstr(_current_line, 0, _remaining) stdscr.addstr(_current_line, 0, _line)
_current_line += 1 _current_line += 1
else: else:
_button_gen = False _button_gen = False