More fixes based on CoPilot suggestions

* add a check to prevent multiple log handler additions.  Still a hack, but ok for this purpose.
* GuessKey_Statistics.__init__() now validates is_solved using same class validator as unpack()
* fix exception text to reflect allowed types for Hangman_State
* Also in Hangman_State, fix validation when input is bytes / bytearray
* In dc34_PlayHangman_validate_user_input(), strip the input before checking length.
This commit is contained in:
Henry Gabryjelski committed 2026-08-23 01:10:49 -07:00
1 parent 9a461daf96
commit 075f353f98
1 file changed
+6 -8
+6 -8
View File
@@ -42,7 +42,8 @@ if True: # Logging helper
LOG_PROXMARK.parent = LOG
LOG_PM_DEVICE.parent = LOG
LOG.addHandler(logging.StreamHandler(sys.stdout))
if len(LOG.handlers) < 1:
LOG.addHandler(logging.StreamHandler(sys.stdout))
# LOG_HF14.addHandler(logging.StreamHandler(sys.stdout))
# LOG_PROXMARK.addHandler(logging.StreamHandler(sys.stdout))
# LOG_PM_DEVICE.addHandler(logging.StreamHandler(sys.stdout))
@@ -149,10 +150,7 @@ if True: # Data classes
def __init__(self, guess_count: int, is_solved: bool):
self.guess_count = self._validate_uint16(guess_count)
if is_solved:
self.is_solved = True
else:
self.is_solved = False
self.is_solved = self._validate_bool(is_solved)
def pack(self) -> bytes:
return struct.pack(
@@ -282,13 +280,13 @@ if True: # Data classes
@classmethod
def _validate_guessed_letter_bitmask(cls, value: bytes | bytearray | int) -> int:
if not isinstance(value, (bytes, bytearray, int)):
raise ValueError("guessed letter bitmask must be bytes or bytearray.")
raise ValueError("guessed letter bitmask must be int, bytes or bytearray.")
if isinstance(value, int):
result = value
else:
if len(value) != 4:
raise ValueError(f"guessed letter bitmask must be an int or exactly 4 bytes, got {len(value)} bytes.")
result = int.from_bytes(value, byteorder="big")
result = int.from_bytes(value, byteorder="little")
if (result & cls._GUESSED_LETTER_MASK) != result:
raise ValueError(f"guessed letter bitmask must only have bits 0-25 set, got 0x{result:08x}.")
return result
@@ -861,9 +859,9 @@ if True: # Hangman interactive UI
print(f"{Hangman_State.guessed_letter_bitmask_to_remaining_letters(state.guessed_letter_bitmask)}")
def dc34_PlayHangman_validate_user_input(user_input : str, state : Hangman_State) -> Optional[str]:
user_input = user_input.strip().upper()
if len(user_input) != 1:
return None
user_input = user_input.strip().upper()
if not re.match(r"^[A-Z]$", user_input):
return None
letter_index = ord(user_input) - ord('A')