n
/
git-time-machine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Add bounds checking and error handling for curses drawing

This commit is contained in:
n loewen (aider) 2025-06-08 09:26:55 +01:00
parent 328f0de01d
commit dcf892a8ea
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gtm
View File

@ -941,15 +941,31 @@ def draw_commit_details(stdscr, state: AppState, layout: StatusBarLayout):
# Draw the author and branch on the right # Draw the author and branch on the right
author_branch_info = f" {state.commit_author} [{state.commit_branch}] " author_branch_info = f" {state.commit_author} [{state.commit_branch}] "
right_x = layout.screen_width - len(author_branch_info) right_x = layout.screen_width - len(author_branch_info)
if right_x >= 0: if right_x >= len(commit_info) and right_x >= 0:
stdscr.addstr(second_line, right_x, author_branch_info, curses.A_REVERSE) try:
stdscr.addstr(second_line, right_x, author_branch_info, curses.A_REVERSE)
except curses.error:
# If it still fails, truncate the author info to fit
max_author_width = layout.screen_width - len(commit_info) - 4 # Leave some margin
if max_author_width > 10: # Only show if we have reasonable space
truncated_info = f" {state.commit_author[:max_author_width-10]}... "
try:
stdscr.addstr(second_line, layout.screen_width - len(truncated_info), truncated_info, curses.A_REVERSE)
except curses.error:
pass # Give up if we still can't fit it
# Draw the first line of the commit message in between # Draw the first line of the commit message in between
available_width = layout.screen_width - len(commit_info) - len(author_branch_info) - 1 # Only draw if we have space and the author info was successfully placed
first_line = message_lines[0] if message_lines else "" if right_x >= len(commit_info):
if len(first_line) > available_width: available_width = right_x - len(commit_info) - 1
first_line = first_line[:available_width-3] + "..." first_line = message_lines[0] if message_lines else ""
stdscr.addstr(second_line, len(commit_info), first_line, curses.A_REVERSE) if available_width > 0:
if len(first_line) > available_width:
first_line = first_line[:available_width-3] + "..."
try:
stdscr.addstr(second_line, len(commit_info), first_line, curses.A_REVERSE)
except curses.error:
pass # Silently fail if we can't draw the message
# Draw additional lines of the commit message if we have more space # Draw additional lines of the commit message if we have more space
for i, line in enumerate(message_lines[1:], 1): for i, line in enumerate(message_lines[1:], 1):