SeedShield 0.2.1__tar.gz → 0.2.2__tar.gz

{seedshield-0.2.1/SeedShield.egg-info → seedshield-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: SeedShield
-Version: 0.2.1
+Version: 0.2.2
 Summary: Secure BIP39 word viewer with masking and reveal functionality
 Author-email: Barlog951 <barlog951@gmail.com>
 Project-URL: Documentation, https://github.com/Barlog951/SeedShield/blob/main/README.md

{seedshield-0.2.1 → seedshield-0.2.2/SeedShield.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: SeedShield
-Version: 0.2.1
+Version: 0.2.2
 Summary: Secure BIP39 word viewer with masking and reveal functionality
 Author-email: Barlog951 <barlog951@gmail.com>
 Project-URL: Documentation, https://github.com/Barlog951/SeedShield/blob/main/README.md

{seedshield-0.2.1 → seedshield-0.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "SeedShield"
-version = "0.2.1"
+version = "0.2.2"
 readme = { file = "README.md", content-type = "text/markdown" }
 description = "Secure BIP39 word viewer with masking and reveal functionality"
 authors = [

{seedshield-0.2.1 → seedshield-0.2.2}/seedshield/config.py

@@ -12,7 +12,7 @@ import sys
 
 # Application constants
 APP_NAME = "SeedShield"
-VERSION = "0.2.1"
+VERSION = "0.2.2"
 
 # Security settings
 REVEAL_TIMEOUT = 3  # Seconds before auto-hiding revealed words

{seedshield-0.2.1 → seedshield-0.2.2}/seedshield/display_handler.py

@@ -10,6 +10,7 @@ from typing import List, Optional, Any
 
 from .config import logger, MASK_CHARACTER, MASK_LENGTH
 from .config import SCROLL_INDICATOR_UP, SCROLL_INDICATOR_DOWN, MENU_TEXT
+from .state_handler import StateHandler
 
 
 class DisplayHandler:
@@ -35,6 +36,7 @@ class DisplayHandler:
         self.ui_manager = ui_manager
         self.mask = MASK_CHARACTER * MASK_LENGTH
         self.legacy_mask = self.mask  # For backward compatibility with tests
+        self.state_handler: Optional[StateHandler] = None  # Will be set later
 
         # Store the last state to optimize rendering
         self._last_height = 0
@@ -42,8 +44,10 @@ class DisplayHandler:
 
         logger.debug("DisplayHandler initialized with %s words", len(words))
 
-    def _add_scroll_indicators(self, stdscr: Any, visible_start: int, visible_end: int,
-                             positions: List[int], height: int, width: int) -> None:
+    def _add_scroll_indicators(
+            self, stdscr: Any, visible_start: int, visible_end: int,
+            positions: List[int], height: int, width: int
+    ) -> None:
         """
         Add scroll indicators to the display if needed.
 
@@ -94,6 +98,7 @@ class DisplayHandler:
 
             # Show reset option only if we've reached the last word
             menu_text = MENU_TEXT["with_reset"] if is_last_reached else MENU_TEXT["standard"]
+            # We no longer show the wordlist info on any screen to avoid blocking words
 
             # Split menu text across lines if it's too long
             if len(menu_text) > self._last_width - 2:
@@ -168,8 +173,10 @@ class DisplayHandler:
         logger.warning("Invalid word position: %s", pos)
         return f"INVALID({pos})"
 
-    def display_words(self, stdscr: Any, positions: List[int], scroll_position: int,
-                    cursor_pos: Optional[int], is_last_reached: bool) -> int:
+    def display_words(
+            self, stdscr: Any, positions: List[int], scroll_position: int,
+            cursor_pos: Optional[int], is_last_reached: bool
+    ) -> int:
         """
         Display words with masking in the terminal interface.
 
@@ -213,10 +220,12 @@ class DisplayHandler:
         result: int = visible_end - visible_start
         return result
 
-    def _display_visible_words(self, stdscr: Any, positions: List[int],
-                              visible_start: int, visible_end: int,
-                              scroll_position: int, cursor_pos: Optional[int],
-                              height: int, width: int) -> None:
+    def _display_visible_words(
+            self, stdscr: Any, positions: List[int],
+            visible_start: int, visible_end: int,
+            scroll_position: int, cursor_pos: Optional[int],
+            height: int, width: int
+    ) -> None:
         """
         Display the visible words on the screen.
 

{seedshield-0.2.1 → seedshield-0.2.2}/seedshield/input_handler.py

@@ -187,6 +187,50 @@ class InputHandler:
             logger.error("Unexpected error reading positions file: %s", str(e))
             return None
 
+    def _display_error(self, stdscr: Any, message: str, error: Optional[Exception] = None) -> None:
+        """
+        Display an error message on the screen.
+
+        Args:
+            stdscr: Curses window object
+            message: Error message to display
+            error: Optional exception to log
+        """
+        if error:
+            logger.error("%s: %s", message, str(error))
+        stdscr.addstr(6, 0, message)
+        stdscr.refresh()
+        time.sleep(1)
+
+    def _process_input_command(self, stdscr: Any, input_str: str) -> Optional[List[int]]:
+        """
+        Process a specific input command.
+
+        Args:
+            stdscr: Curses window object
+            input_str: User input string
+
+        Returns:
+            Optional[List[int]]: Processed positions or None
+        """
+        # Handle quitting
+        if input_str == 'q':
+            return None
+
+        # Handle clipboard input
+        if input_str == 'v':
+            return self.process_clipboard_input(stdscr)
+
+        # Handle individual number
+        validated_input = self.validate_number_input(input_str)
+        if validated_input:
+            return validated_input
+
+        # Invalid input
+        err_msg = f"Invalid input. Please enter a number between 1-{self.word_count}"
+        self._display_error(stdscr, err_msg)
+        return []  # Empty list indicates continuing input loop
+
     def get_input(self, stdscr: Any) -> Optional[List[int]]:
         """
         Get user input, validating it and handling different input types.
@@ -198,45 +242,30 @@ class InputHandler:
             Optional[List[int]]: List of valid position numbers or None for quit command
         """
         while True:
+            # Clear any previous error messages
+            stdscr.move(6, 0)
+            stdscr.clrtoeol()
             self.display_input_prompt(stdscr)
             curses.echo()
 
             try:
                 input_str = stdscr.getstr().decode('utf-8').strip().lower()
+                # Skip empty input
+                if not input_str:
+                    continue
 
-                # Handle quitting
-                if input_str == 'q':
+                result = self._process_input_command(stdscr, input_str)
+                # None means quit, empty list means continue, otherwise return the result
+                if result is None:
                     return None
-
-                # Handle clipboard input
-                if input_str == 'v':
-                    clipboard_numbers = self.process_clipboard_input(stdscr)
-                    if clipboard_numbers:
-                        return clipboard_numbers
-
-                # Handle individual number
-                validated_input = self.validate_number_input(input_str)
-                if validated_input:
-                    return validated_input
-
-                stdscr.addstr(6, 0, f"Invalid input. Please enter a number between 1-{self.word_count}")
-                stdscr.refresh()
-                time.sleep(1)
+                if result:  # Non-empty list
+                    return result
 
             except UnicodeDecodeError as e:
-                logger.error("Unicode decode error: %s", str(e))
-                stdscr.addstr(6, 0, "Invalid character input")
-                stdscr.refresh()
-                time.sleep(1)
+                self._display_error(stdscr, "Invalid character input", e)
             except ValueError as e:
-                logger.error("Value error: %s", str(e))
-                stdscr.addstr(6, 0, "Invalid input format")
-                stdscr.refresh()
-                time.sleep(1)
+                self._display_error(stdscr, "Invalid input format", e)
             except Exception as e:
-                logger.error("Unexpected input error: %s", str(e))
-                stdscr.addstr(6, 0, "Error processing input")
-                stdscr.refresh()
-                time.sleep(1)
+                self._display_error(stdscr, "Error processing input", e)
             finally:
                 curses.noecho()

{seedshield-0.2.1 → seedshield-0.2.2}/seedshield/secure_word_interface.py

@@ -45,6 +45,8 @@ class SecureWordInterface:
         self.input_handler = InputHandler(len(self.words), self.ui_manager)
         self.display_handler = DisplayHandler(self.words, self.ui_manager)
         self.state_handler = StateHandler()
+        # Set state_handler reference in display_handler
+        self.display_handler.state_handler = self.state_handler
 
         # For backward compatibility with tests
         self._initialize_curses = self.ui_manager.initialize
@@ -179,8 +181,10 @@ class SecureWordInterface:
 
         return should_reinit, new_positions, new_scroll
 
-    def _process_user_input(self, stdscr: Any, positions: List[int], scroll_position: int,
-                          visible_count: int, current_time: float) -> Tuple[bool, int]:
+    def _process_user_input(
+            self, stdscr: Any, positions: List[int], scroll_position: int,
+            visible_count: int, current_time: float
+    ) -> Tuple[bool, int]:
         """
         Process user input and update state accordingly.
 
@@ -206,6 +210,8 @@ class SecureWordInterface:
                 # Handle timeout adjustment for input mode
                 if should_reinit:
                     stdscr.timeout(10000)
+                    # Clear positions to force entering input mode on next loop
+                    positions.clear()
 
                 # Handle quit command
                 if should_quit:
@@ -309,9 +315,10 @@ class SecureWordInterface:
         except Exception as e:
             logger.debug("Error handling mouse event: %s", str(e))
 
-    def _handle_user_input(self, c: int, positions: List[int], scroll_position: int,
-                         visible_count: int, current_time: float
-                         ) -> Tuple[bool, bool, int, List[int]]:
+    def _handle_user_input(
+            self, c: int, positions: List[int], scroll_position: int,
+            visible_count: int, current_time: float
+    ) -> Tuple[bool, bool, int, List[int]]:
         """
         Process a single user input and determine actions.
 
@@ -353,11 +360,11 @@ class SecureWordInterface:
     def _get_load_positions_func(self) -> Callable[[str], Optional[List[int]]]:
         """Return a function that loads positions from a file."""
         return self.input_handler.load_positions_from_file
-        
+
     def _get_handle_autoscroll_func(self) -> Callable[[Optional[int], int, int], int]:
         """Return a function that handles autoscrolling."""
         return self.display_handler.handle_autoscroll
-        
+
     def _load_positions_file(self, file_path: str) -> List[int]:
         """
         Load word positions from a file.

{seedshield-0.2.1 → seedshield-0.2.2}/seedshield/state_handler.py

@@ -138,7 +138,9 @@ class StateHandler:
         if positions:
             self.current_index = 0
 
-    def handle_commands(self, key: int, positions: List[int], current_time: float) -> Optional[List[int]]:
+    def handle_commands(
+            self, key: int, positions: List[int], current_time: float
+    ) -> Optional[List[int]]:
         """
         Process user commands and update state accordingly.
 

{seedshield-0.2.1 → seedshield-0.2.2}/setup.py

@@ -23,7 +23,7 @@ class PreBuild(_build_py):
 
 setup(
     name="seedshield",
-    version="0.2.1",  # This should match VERSION in seedshield/config.py
+    version="0.2.2",  # This should match VERSION in seedshield/config.py
 
     packages=find_namespace_packages(
         include=['seedshield', 'seedshield.*']