style: Apply linter fixes

This commit is contained in:
Paul Gauthier (aider) 2025-05-08 14:08:11 -07:00
parent 8f0fa6684d
commit 20faadcbd9

View file

@ -1,12 +1,13 @@
import os import os
import platform import platform
import oslex
import subprocess import subprocess
import sys import sys
import tempfile import tempfile
import time import time
from pathlib import Path from pathlib import Path
import oslex
from aider.dump import dump # noqa: F401 from aider.dump import dump # noqa: F401
IMAGE_EXTENSIONS = {".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff", ".webp", ".pdf"} IMAGE_EXTENSIONS = {".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff", ".webp", ".pdf"}
@ -259,7 +260,7 @@ class Spinner:
self.scanner_width = 7 # Width of the scanning area (e.g., 7 for "[---■--]") self.scanner_width = 7 # Width of the scanning area (e.g., 7 for "[---■--]")
self.scanner_pos = 0 self.scanner_pos = 0
self.scanner_dir = 1 if self.scanner_width > 1 else 0 # Direction of scanner movement self.scanner_dir = 1 if self.scanner_width > 1 else 0 # Direction of scanner movement
# Attempt to use Unicode characters for the scanner, fallback to ASCII # Attempt to use Unicode characters for the scanner, fallback to ASCII
self.scanner_char = "#" # ASCII fallback self.scanner_char = "#" # ASCII fallback
@ -269,13 +270,13 @@ class Spinner:
# Test print Unicode chars and erase them to check encoding support # Test print Unicode chars and erase them to check encoding support
sys.stdout.write("■─") sys.stdout.write("■─")
sys.stdout.flush() sys.stdout.flush()
sys.stdout.write("\b\b \b\b") # Backspace, write spaces, backspace sys.stdout.write("\b\b \b\b") # Backspace, write spaces, backspace
sys.stdout.flush() sys.stdout.flush()
self.scanner_char = "" # Unicode self.scanner_char = "" # Unicode
self.trail_char = "" # Unicode self.trail_char = "" # Unicode
except UnicodeEncodeError: except UnicodeEncodeError:
pass # Stick to ASCII fallbacks pass # Stick to ASCII fallbacks
except Exception: # Catch other potential IO errors on strange terminals except Exception: # Catch other potential IO errors on strange terminals
pass pass
self.animation_len = self.scanner_width + 2 # For brackets like "[]" self.animation_len = self.scanner_width + 2 # For brackets like "[]"
@ -298,7 +299,7 @@ class Spinner:
frame = [self.trail_char] * self.scanner_width frame = [self.trail_char] * self.scanner_width
# Ensure scanner_pos is within bounds for frame assignment # Ensure scanner_pos is within bounds for frame assignment
current_pos_in_frame = max(0, min(self.scanner_pos, self.scanner_width - 1)) current_pos_in_frame = max(0, min(self.scanner_pos, self.scanner_width - 1))
if self.scanner_width > 0: # Only place char if width is positive if self.scanner_width > 0: # Only place char if width is positive
frame[current_pos_in_frame] = self.scanner_char frame[current_pos_in_frame] = self.scanner_char
animation_segment = f"[{''.join(frame)}]" animation_segment = f"[{''.join(frame)}]"
@ -308,7 +309,7 @@ class Spinner:
if self.scanner_width > 1: if self.scanner_width > 1:
self.scanner_pos += self.scanner_dir self.scanner_pos += self.scanner_dir
if self.scanner_pos >= self.scanner_width - 1: # Reached or passed the end if self.scanner_pos >= self.scanner_width - 1: # Reached or passed the end
self.scanner_pos = self.scanner_width - 1 # Pin to end self.scanner_pos = self.scanner_width - 1 # Pin to end
self.scanner_dir = -1 # Reverse direction self.scanner_dir = -1 # Reverse direction
elif self.scanner_pos <= 0: # Reached or passed the beginning elif self.scanner_pos <= 0: # Reached or passed the beginning
self.scanner_pos = 0 # Pin to start self.scanner_pos = 0 # Pin to start
@ -316,8 +317,8 @@ class Spinner:
def end(self): def end(self):
if self.visible and self.is_tty: if self.visible and self.is_tty:
clear_len = len(self.text) + 1 + self.animation_len # text + space + animation segment clear_len = len(self.text) + 1 + self.animation_len # text + space + animation segment
print("\r" + " " * clear_len + "\r", end="", flush=True) # Clear line and reset cursor print("\r" + " " * clear_len + "\r", end="", flush=True) # Clear line and reset cursor
self.visible = False self.visible = False