listpick 0.1.14.10__tar.gz → 0.1.14.12__tar.gz

{listpick-0.1.14.10 → listpick-0.1.14.12}/CHANGELOG.md

@@ -16,17 +16,20 @@ 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.
+   - Discovered missing keys from colour_theme 0 which caused menus not to be displayed.
  - 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.
  - Fixed special keys not working:
-   - arrow keys (main picker)
-   - meta+key (input_field)
+   - arrow keys (main picker, input_field)
+   - meta+key (input_field, main picker)
  - Added column number to footer
  - Improved splitting of whitespace separated data passed on stdin.
  - 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.10/src/listpick.egg-info → listpick-0.1.14.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.14.10
+Version: 0.1.14.12
 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.10 → listpick-0.1.14.12}/TODO.md

@@ -21,6 +21,7 @@ ASAP
 >   - [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.10 → listpick-0.1.14.12}/setup.py

@@ -16,7 +16,7 @@ with open("README.md", "r", encoding = "utf-8") as fh:
 
 setuptools.setup(
     name = "listpick",
-    version = "0.1.14.10",
+    version = "0.1.14.12",
     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.10 → listpick-0.1.14.12}/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
@@ -453,7 +451,7 @@ class Picker:
             if reset_colours:
                 global COLOURS_SET
                 COLOURS_SET = False
-                colours_end = set_colours(pick=self.colour_theme_number, start=self.colours_start)
+                self.colours_end = set_colours(pick=self.colour_theme_number, start=self.colours_start)
             if curses.COLORS >= 255 and curses.COLOR_PAIRS >= 150:
                 self.colours_start = self.colours_start
                 self.notification_colours_start = self.colours_start+50
@@ -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:
@@ -3452,7 +3447,7 @@ def set_colours(pick: int = 0, start: int = 0) -> Optional[int]:
         curses.init_pair(start+24, colours['footer_string_fg'], colours['footer_string_bg'])
         curses.init_pair(start+25, colours['selected_cell_fg'], colours['selected_cell_bg'])
         curses.init_pair(start+26, colours['deselecting_cell_fg'], colours['deselecting_cell_bg'])
-    except:
+    except Exception as e:
         pass
     COLOURS_SET = True
     return start+21
@@ -3603,7 +3598,7 @@ def main() -> None:
     except:
         pass
         
-    function_data["colour_theme_number"] = 3
+    # function_data["colour_theme_number"] = 3
     # function_data["modes"]  = [ 
     #     {
     #         'filter': '',

{listpick-0.1.14.10 → listpick-0.1.14.12}/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.10 → listpick-0.1.14.12}/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.10 → listpick-0.1.14.12}/src/listpick/ui/picker_colours.py

@@ -67,6 +67,8 @@ def get_colours(pick:int=0) -> Dict[str, int]:
         'footer_string_fg': 253,
         'selected_cell_bg': 237,
         'selected_cell_fg': 253,
+        'deselecting_cell_bg': 162,
+        'deselecting_cell_fg': 253,
     },
         ### (1) Black and white
     {
@@ -286,6 +288,9 @@ def get_colours(pick:int=0) -> Dict[str, int]:
         colour["paused_bg"] = colour["background"]
         colour["paused_bg"] = colour["background"]
         # colour["search_bg"] = colour["background"]
+    # tmp = colours[0]
+    # colours[0] = colours[2]
+    # colours[2] = tmp
     if pick > len(colours) - 1:
         return colours[0]
     return colours[pick]

{listpick-0.1.14.10 → listpick-0.1.14.12/src/listpick.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.14.10
+Version: 0.1.14.12
 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.10 → listpick-0.1.14.12}/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.10/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]