listpick 0.1.14.9__tar.gz → 0.1.14.11__tar.gz

{listpick-0.1.14.9 → listpick-0.1.14.11}/CHANGELOG.md

@@ -16,6 +16,7 @@ Note that the changes between 0.1.11.0 and 1.1.12.0 are listed under 0.1.11
    - Closing files causes issues switching between files.
    - Fixed crash when loading non-existent config file.
    - Fixed highlighted cell not being aligned in the way that we expect.
+   - Fixed search query covering last row of data.
  - Create ~/.config/listpick directory for storing input history if it doesn't already exist.
  - Added error checking when opening files.
  - Added --headerless flag to prevent interpreting the first line of the input as the header.
@@ -24,7 +25,10 @@ Note that the changes between 0.1.11.0 and 1.1.12.0 are listed under 0.1.11
    - meta+key (input_field)
  - Added column number to footer
  - Improved splitting of whitespace separated data passed on stdin.
- - Main picker is now refreshed after a resize when there is a notification.
+ - Ensured that main picker elements resize if the terminal is resized when other dialogues are in focus: notifications, options, settings.
+ - Added method to check for terminal resize.
+   - Was necessary since we are no longer using getch from curses so we can't test whether getch() == curses.KEY_RESIZE.
+ - Added Alt+keys in build_help.
 
 ## [0.1.14] 2025-08-20
  - Fixed bug when cells are centred vertically.

{listpick-0.1.14.9/src/listpick.egg-info → listpick-0.1.14.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.14.9
+Version: 0.1.14.11
 Summary: Listpick is a powerful TUI data tool for creating TUI apps or viewing/comparing tabulated data.
 Home-page: https://github.com/grimandgreedy/listpick
 Author: Grim

{listpick-0.1.14.9 → listpick-0.1.14.11}/TODO.md

@@ -14,13 +14,14 @@ ASAP
 > - [ ] Sheet states remain the same when switching files.
 > - [x] Deal with nan values in xlsx and ods files.
 >   - [ ] They are set to empyt strings.
-> - [ ] Fix special keys not working:
->   - [ ] May need to create separate keycodes...
->   - [ ] F1-f12
->   - [ ] Tab, shift+tab
->   - [ ] Delete, shift+delete
->   - [ ] Alt+KEY
+> - [x] Fix special keys not working:
+>   - [x] May need to create separate keycodes...
+>   - [x] F1-f12
+>   - [x] Tab, shift+tab
+>   - [x] Delete, shift+delete
+>   - [x] Alt+KEY
 >   - [x] Arrow keys
+> - [x] Add new keycodes to build_help().
 
 
 
@@ -369,6 +370,8 @@ ASAP
 >   - [x] Some can't be switched to...
 >   - [x] Fixed.
 > - [x] Highlighted cells display padded cell string when it should not be padded.
+> - [x] When there is an active search it overlaps the last row.
+>   - [x] Update footer height when there is a search query.
 
 
 

{listpick-0.1.14.9 → listpick-0.1.14.11}/setup.py

@@ -16,7 +16,7 @@ with open("README.md", "r", encoding = "utf-8") as fh:
 
 setuptools.setup(
     name = "listpick",
-    version = "0.1.14.9",
+    version = "0.1.14.11",
     author = "Grim",
     author_email = "grimandgreedy@protonmail.com",
     description = "Listpick is a powerful TUI data tool for creating TUI apps or viewing/comparing tabulated data.",

{listpick-0.1.14.9 → listpick-0.1.14.11}/src/listpick/listpick_app.py

@@ -188,7 +188,6 @@ class Picker:
         sheet_index = 0,
         sheet_states = [{}],
 
-        redraw_screen_accessory: Callable = lambda : None,
 
     ):
         self.stdscr = stdscr
@@ -338,7 +337,6 @@ class Picker:
         self.sheet_states = sheet_states
         self.sheets = sheets
 
-        self.redraw_screen_accessory = redraw_screen_accessory
         self.initialise_picker_state(reset_colours=self.reset_colours)
 
         # Note: We have to set the footer after initialising the picker state so that the footer can use the get_function_data method
@@ -752,7 +750,6 @@ class Picker:
     def draw_screen_(self, indexed_items: list[Tuple[int, list[str]]], highlights: list[dict] = [{}], clear: bool = True) -> None:
         """ Draw Picker screen. """
 
-        self.redraw_screen_accessory()
         self.logger.debug("Draw screen.")
 
         if clear:
@@ -1242,7 +1239,6 @@ class Picker:
             "sheets":                           self.sheets,
             "sheet_name":                       self.sheet_name,
             "sheet_states":                     self.sheet_states,
-            "redraw_screen_accessory":          self.redraw_screen_accessory,
         }
         return function_data
 
@@ -1277,7 +1273,6 @@ class Picker:
             "centre_in_terminal_vertical",
             "centre_in_cols",
             "centre_in_terminal",
-            "redraw_screen_accessory",
         ]
 
         for var in variables:
@@ -1370,7 +1365,6 @@ class Picker:
             "cancel_is_back": True,
             "number_columns": False,
             "reset_colours": False,
-            "cell_cursor": False,
         }
         while True:
             h, w = stdscr.getmaxyx()
@@ -1390,7 +1384,7 @@ class Picker:
             if s:
                 return {x: options[x] for x in s}, o, f
             return {}, "", f
-
+            
 
 
     def notification(self, stdscr: curses.window, message: str="", title:str="Notification", colours_end: int=0, duration:int=4) -> None:
@@ -1401,12 +1395,7 @@ class Picker:
         message_width = notification_width-5
 
         if not message: message = "!!"
-        if type(message) == type(""):
-            mw = message_width
-            submenu_items = [[message[i*mw:(i+1)*mw]] for i in range(len(message)//mw+1)]
-        elif type(message) != type([]):
-            submenu_items = [["  !!"]]
-
+        submenu_items = ["  "+message[i*message_width:(i+1)*message_width] for i in range(len(message)//message_width+1)]
 
         notification_remap_keys = { 
             curses.KEY_RESIZE: curses.KEY_F5,
@@ -1416,12 +1405,6 @@ class Picker:
             h, w = stdscr.getmaxyx()
 
             submenu_win = curses.newwin(notification_height, notification_width, 3, w - (notification_width+4))
-            # submenu_win = self.stdscr.subwin(notification_height, notification_width, 3, w - (notification_width+4))
-            def update_after_resize():
-                h, w = self.stdscr.getmaxyx()
-                submenu_win.mvwin(3, w - (notification_width+4))
-                self.draw_screen(self.indexed_items, self.highlights)
-                
             notification_data = {
                 "items": submenu_items,
                 "title": title,
@@ -1438,19 +1421,9 @@ class Picker:
                 "cancel_is_back": True,
                 "reset_colours": False,
 
-                "loaded_files": [],
-                "loaded_file_states": [],
-                "loaded_file": "",
-                "loaded_file_index": 0,
-                "cell_cursor": False,
-                # "redraw_screen_accessory": lambda : self.draw_screen(self.indexed_items, self.highlights),
-                "redraw_screen_accessory": update_after_resize,
-                "get_new_data": False,
-                # "key_remappings": notification_remap_keys,
             }
             OptionPicker = Picker(submenu_win, **notification_data)
             s, o, f = OptionPicker.run()
-            os.system(f"notify-send resizing")
 
             if o != "refresh": break
             submenu_win.clear()
@@ -1459,7 +1432,6 @@ class Picker:
             stdscr.clear()
             stdscr.refresh()
             self.draw_screen(self.indexed_items, self.highlights)
-
         # set_colours(colours=get_colours(0))
 
     def toggle_column_visibility(self, col_index:int) -> None:
@@ -2248,6 +2220,13 @@ class Picker:
         # Open tty to accept input
         tty_fd = open_tty()
 
+        h, w = self.stdscr.getmaxyx()
+        def terminal_resized(old_w, old_h) -> bool:
+            w, h = os.get_terminal_size()
+            if old_h != h or old_w != w: return True
+            else: return False
+
+        COLS, LINES = os.get_terminal_size()
         # Main loop
         while True:
             # key = self.stdscr.getch()
@@ -2255,7 +2234,14 @@ class Picker:
             key = get_char(tty_fd, timeout=0.2)
             if key != -1:
                 self.logger.info(f"key={key}")
+
+            self.term_resize_event = terminal_resized(COLS, LINES)
+            COLS, LINES = os.get_terminal_size()
+            if self.term_resize_event: 
+                key = curses.KEY_RESIZE
+
             h, w = self.stdscr.getmaxyx()
+
             if key in self.disabled_keys: continue
             clear_screen=True
 
@@ -3110,7 +3096,7 @@ class Picker:
                 self.logger.info(f"key_function opts_select")
                 s, o, f = self.choose_option(self.stdscr, self.options_list)
                 if self.user_opts.strip(): self.user_opts += " "
-                self.user_opts += " ".join([x for x in s.values()])
+                self.user_opts += " ".join([x[0] for x in s.values()])
             elif self.check_key("notification_toggle", key, self.keys_dict):
                 self.logger.info(f"key_function notification_toggle")
                 self.notification(self.stdscr, colours_end=self.colours_end)

{listpick-0.1.14.9 → listpick-0.1.14.11}/src/listpick/ui/build_help.py

@@ -7,16 +7,18 @@ Author: GrimAndGreedy
 License: MIT
 """
 
-from listpick.ui.keys import picker_keys
+from listpick.ui.keys import picker_keys, notification_keys
 import curses
 import logging
+from listpick.utils import keycodes
 
 logger = logging.getLogger('picker_log')
 
-def build_help_rows(keys_dict: dict) -> list[list[str]]:
+def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
     """ Build help rows based on the keys_dict. """
 
     logger.info(f"function: build_help_rows() (build_help.py)")
+
     ## Key names
     special_keys = {
 
@@ -35,16 +37,35 @@ def build_help_rows(keys_dict: dict) -> list[list[str]]:
             ord('\n'): "\n",
             curses.KEY_DC: "Delete",
             383: "Shift+Delete",
+            ord("\t"): "Tab",
+            curses.KEY_BACKSPACE: "Backspace",
+            keycodes.META_BS: "Alt+Backspace",
     }
 
     # Ctrl + [a-z]
     for i in range(26):
         special_keys[i+1] = f"Ctrl+{chr(ord('a')+i)}"
+        if i == 8:
+            special_keys[i+1] = f"Tab/Ctrl+{chr(ord('a')+i)}"
+
 
     # F1-F12
     for i in range(12):
         special_keys[curses.KEY_F1+i] = f"F{i+1}"
 
+    # Alt+[a-z]
+    for i in range(26):
+        special_keys[keycodes.META_a +i] = f"Alt+{chr(ord('a')+i)}"
+
+    # Alt+[A-Z]
+    for i in range(26):
+        special_keys[keycodes.META_A +i] = f"Alt+{chr(ord('A')+i)}"
+
+    # Alt+[0-9]
+    for i in range(10):
+        special_keys[keycodes.META_0] = f"Alt+{i}"
+
+
     ## Key descriptions
     help_descriptions = {
         "refresh":                          "Refresh the screen.",
@@ -119,14 +140,16 @@ def build_help_rows(keys_dict: dict) -> list[list[str]]:
         "info":                             "Display info screen.",
         "file_next":                        "Go to the next open file.",
         "file_prev":                        "Go to the previous open file.",
+        "sheet_next":                       "Go to the next sheet.",
+        "sheet_prev":                       "Go to the previous sheet.",
     }
     sections = {
         "Navigation:": [ "cursor_down", "cursor_up", "half_page_up", "half_page_down", "page_up", "page_down", "cursor_bottom", "cursor_top", "five_up", "five_down", "scroll_right", "scroll_left", "scroll_far_right", "scroll_far_left" ],
         "Selection:": [ "toggle_select", "select_all", "select_none", "visual_selection_toggle", "visual_deselection_toggle", "enter" ],
         "UI:": [ "toggle_footer", "redraw_screen", "decrease_lines_per_page", "increase_lines_per_page", "increase_column_width", "decrease_column_width", "notification_toggle" ],
         "Sort:": [ "cycle_sort_method", "cycle_sort_method_reverse", "cycle_sort_order", ] ,
-        "Data manipulation:": [ "delete", "delete_column", "edit", "edit_picker", "edit_ipython", "add_column", "add_row" ],
-        "Filter and sort:": [ "filter_input", "search_input", "continue_search_forward", "continue_search_backward", ] ,
+        "Data manipulation:": [ "delete", "delete_column", "edit", "edit_picker", "edit_ipython", "add_column_before", "add_column_after", "add_row_before", "add_row_after"],
+        "Filter and sort:": [ "filter_input", "x", "search_input", "continue_search_forward", "continue_search_backward", ] ,
         "Settings:": [ "settings_input", "settings_options" ],
         "Cancel:": [ "opts_input", "opts_select", "mode_next", "mode_prev", "pipe_input", "reset_opts", "col_select", "col_select_next", "col_select_prev", "col_hide" ],
         "Save, load, copy and paste:": [ "save", "load", "open", "copy", "paste" ],
@@ -148,36 +171,48 @@ def build_help_rows(keys_dict: dict) -> list[list[str]]:
         section_rows = []
         
         for operation in section_operations:
-            try:
-                keys = [chr(int(key)) if key not in special_keys else special_keys[key] for key in keys_dict[operation]]
+            keys = []
+            if operation in keys_dict:
+                for key in keys_dict[operation]:
+                    if key in special_keys:
+                        keys.append(special_keys[key])
+                    else:
+                        try:
+                            keys.append(chr(int(key)))
+                        except Exception as e:
+                            keys.append(f"keycode={key}")
+                            if debug: print(f"Error chr({key}): {e}")
+            else:
+                if debug: print(f"Note that {operation} is not in the keys_dict")
+                continue
+
+
+
+            if operation in help_descriptions:
                 description = help_descriptions[operation]
-                row = [f"    {str(keys)[1:-1]}", description]
-                section_rows.append(row)
-            except:
-                pass
+            else:
+                if debug: print(f"Operation={operation} has no description.")
+                description = "..."
+
+            row = [f"    {str(keys)[1:-1]}", description]
+            section_rows.append(row)
         if section_rows:
             items.append([section_name, ""])
             items += section_rows
             items.append(["",""])
 
-    # [[key_name, key_function_description], ...]
-    # for val, keys in keys_dict.items():
-    #     try: 
-    #         row = [[chr(int(key)) if key not in special_keys else special_keys[key] for key in keys], help_descriptions[val]]
-    #         items.append(row)
-    #     except:
-    #         pass
-
     return items
 
 if __name__ == "__main__":
-    from listpick.listpick_app import Picker, start_curses, close_curses
-    items = build_help_rows(picker_keys)
-    stdscr = start_curses()
-    x = Picker(
-        stdscr,
-        items=items
-    )
-    x.run()
-
-    close_curses(stdscr)
+    items = build_help_rows(picker_keys, debug=True)
+    items = build_help_rows(notification_keys, debug=True)
+
+    # from listpick.listpick_app import Picker, start_curses, close_curses
+    # stdscr = start_curses()
+    # x = Picker(
+    #     stdscr,
+    #     items=items
+    # )
+    # x.run()
+    #
+    # close_curses(stdscr)

{listpick-0.1.14.9 → listpick-0.1.14.11}/src/listpick/ui/footer.py

@@ -85,6 +85,9 @@ class StandardFooter(Footer):
             self.sheets_y -= 1
 
             self.files_y = h-1
+        if state["search_query"] and self.height < 3:
+            self.height = 3
+
 
     def draw(self, h, w):
         state = self.get_state()

{listpick-0.1.14.9 → listpick-0.1.14.11/src/listpick.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.14.9
+Version: 0.1.14.11
 Summary: Listpick is a powerful TUI data tool for creating TUI apps or viewing/comparing tabulated data.
 Home-page: https://github.com/grimandgreedy/listpick
 Author: Grim

{listpick-0.1.14.9 → listpick-0.1.14.11}/src/listpick.egg-info/SOURCES.txt

@@ -32,7 +32,6 @@ src/listpick.egg-info/top_level.txt
 src/listpick/ui/__init__.py
 src/listpick/ui/build_help.py
 src/listpick/ui/footer.py
-src/listpick/ui/git-bugreport-2025-08-16-1438.txt
 src/listpick/ui/help_screen.py
 src/listpick/ui/input_field.py
 src/listpick/ui/keys.py

listpick-0.1.14.9/src/listpick/ui/git-bugreport-2025-08-16-1438.txt

@@ -1,37 +0,0 @@
-Thank you for filling out a Git bug report!
-Please answer the following questions to help us understand your issue.
-
-What did you do before the bug happened? (Steps to reproduce your issue)
-
-What did you expect to happen? (Expected behavior)
-
-What happened instead? (Actual behavior)
-
-What's different between what you expected and what actually happened?
-
-Anything else you want to add:
-
-Please review the rest of the bug report below.
-You can delete any lines you don't wish to share.
-
-
-[System Info]
-git version:
-git version 2.50.1
-cpu: x86_64
-built from commit: d82adb61ba2fd11d8f2587fca1b6bd7925ce4044
-sizeof-long: 8
-sizeof-size_t: 8
-shell-path: /bin/sh
-libcurl: 8.14.1
-OpenSSL: OpenSSL 3.5.1 1 Jul 2025
-zlib-ng: 2.2.4
-SHA-1: SHA1_DC
-SHA-256: SHA256_BLK
-uname: Linux 6.15.9-arch1-1 #1 SMP PREEMPT_DYNAMIC Sat, 02 Aug 2025 01:20:06 +0000 x86_64
-compiler info: gnuc: 15.1
-libc info: glibc: 2.42
-$SHELL (typically, interactive shell): /usr/bin/zsh
-
-
-[Enabled Hooks]