listpick 0.1.14.4__tar.gz → 0.1.14.6__tar.gz

{listpick-0.1.14.4 → listpick-0.1.14.6}/CHANGELOG.md

@@ -7,6 +7,21 @@ Note that the changes between 0.1.11.0 and 1.1.12.0 are listed under 0.1.11
  - Added __sizeof__() function for the Picker class.
  - Fixed rows resizing twice when opening/switching between some files.
  - Added to settings: goto row, goto column
+ - NaN replaced with empty string when loading empty cells from xlsx or ods files.
+ - Added Picker.get_config(path) method.
+ - Can now take input on stdin -- e.g., `du -h | listpick --stdin`
+ - We now get user input via '/dev/tty' rather than stdscr.getch() (which uses stdin). 
+   - This was necessary to ensure that we can pipe data in via stdin and still receive user input.
+ - Bugs fixed:
+   - Closing files causes issues switching between files.
+ - 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)
+ - Added column number to footer
+ - Improved splitting of whitespace separated data passed on stdin.
 
 ## [0.1.14] 2025-08-20
  - Fixed bug when cells are centred vertically.

{listpick-0.1.14.4/src/listpick.egg-info → listpick-0.1.14.6}/PKG-INFO

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

@@ -12,7 +12,16 @@ ASAP
 > - [ ] Add keys for next page, next sheet, info
 > - [ ] Sort out what to do when the width of the columns is less than the terminal.
 > - [ ] Sheet states remain the same when switching files.
-> - [ ] nan in xlsx and ods 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] Arrow keys
+
 
 
 
@@ -109,7 +118,7 @@ ASAP
 > - [ ] Implement default_option_selector (!!!)
 > - [ ] Implement macros
 >   - [ ] e.g., ctrl+shift+r turns off auto refresh
-> - [ ] Implement config loading
+> - [x] Implement config loading
 >   - [ ] Allow config to be passed as an argument.
 > - [ ] Make aria2tui compatible with windows.
 > - [ ] Add different highlight styles:
@@ -129,6 +138,9 @@ ASAP
 >   - [x] Basic log setup complete
 >   - [ ] Need more useful messages to determine where an error is thrown.
 > - [ ] Pin cursor.
+> - [x] Allow data to be piped into listpick.
+>   - [x] When data is piped in it links stdin with the pipe...
+>     - [x] Rather than getting user input from stdin we can get it by getting a fd for /dev/tty and reading chars from there.
 
 
 
@@ -352,6 +364,11 @@ ASAP
 > - [ ] If the longest string in a column is the header string and show_header=False, then get_column_widths still calculates based on the header string length.
 > - [x] Rows sometimes adjust position a second time after switching files.
 >   - [x] Was due to the height of the footer being set only at the end of the Footer.draw() method. Created a new Footer.adjust_sizes() method which is run at the start of the draw_screen() loop.
+> - [x] Issues switching between open files when some of them have been closed:
+>   - [x] Wrong data for some files.
+>   - [x] Some can't be switched to...
+>   - [x] Fixed.
+>  
 
 
 

{listpick-0.1.14.4 → listpick-0.1.14.6}/setup.py

@@ -16,7 +16,7 @@ with open("README.md", "r", encoding = "utf-8") as fh:
 
 setuptools.setup(
     name = "listpick",
-    version = "0.1.14.4",
+    version = "0.1.14.6",
     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.4 → listpick-0.1.14.6}/src/listpick/listpick_app.py

@@ -20,6 +20,8 @@ import json
 import threading
 import string
 import logging
+import tty
+import select
 
 from listpick.ui.picker_colours import get_colours, get_help_colours, get_notification_colours, get_theme_count, get_fallback_colours
 from listpick.utils.options_selectors import default_option_input, output_file_option_selector, default_option_selector
@@ -108,7 +110,7 @@ class Picker:
         cell_selections: dict[tuple[int,int], bool] = {},
         selected_cells_by_row: dict = {},
         highlight_full_row: bool =False,
-        cell_cursor: bool = False,
+        cell_cursor: bool = True,
 
         items_per_page : int = -1,
         sort_method : int = 0,
@@ -349,6 +351,28 @@ class Picker:
             if not attr_name.startswith('__') and not callable(getattr(self, attr_name)):
                 size += sys.getsizeof(getattr(self, attr_name))
         return size
+    
+    def set_config(self, path: str ="~/.config/listpick/config.toml"):
+        """ Set config from toml file. """
+        config = self.get_config(path)
+        self.logger.info(f"function: set_config()")
+        if "general" in config:
+            for key, val in config["general"].items():
+                self.logger.info(f"set_config: key={key}, val={val}.")
+                try:
+                    setattr(self, key, val)
+                except Exception as e:
+                    self.logger.error(f"set_config: key={key}, val={val}. {e}")
+
+
+    def get_config(self, path: str ="~/.config/listpick/config.toml") -> dict:
+        """ Get config from file. """
+        self.logger.info(f"function: get_config()")
+        import toml
+        if os.path.exists(os.path.expanduser(path)):
+            with open(os.path.expanduser(path), "r") as f:
+                config = toml.load(f)
+                return config
 
     def calculate_section_sizes(self):
         """
@@ -1957,10 +1981,12 @@ class Picker:
             self.items, self.header = tmp_items, tmp_header
             self.data_ready = True
 
-    def save_input_history(self, file_path: str) -> bool:
+    def save_input_history(self, file_path: str, force_save: bool=True) -> bool:
         """ Save input field history. Returns True if successful save. """
         self.logger.info(f"function: save_input_history()")
         file_path = os.path.expanduser(file_path)
+        file_path = os.path.expandvars(file_path)
+        directory = os.path.dirname(file_path)
         history_dict = {
             "history_filter_and_search" :       self.history_filter_and_search,
             "history_pipes" :                   self.history_pipes,
@@ -1968,8 +1994,10 @@ class Picker:
             "history_edits" :                   self.history_edits,
             "history_settings":                 self.history_settings,
         }
-        with open(file_path, 'w') as f:
-            json.dump(history_dict, f)
+        if os.path.exists(directory) or force_save:
+            os.makedirs(os.path.dirname(file_path), exist_ok=True)
+            with open(file_path, 'w') as f:
+                json.dump(history_dict, f)
 
         return True
 
@@ -2067,27 +2095,32 @@ class Picker:
             self.notification(self.stdscr, message = f"File not found: {filename}")
             return None
 
-        filetype = guess_file_type(filename)
-        items, header, sheets = table_to_list(filename, file_type=filetype)
+        try:
+            filetype = guess_file_type(filename)
+            items, header, sheets = table_to_list(filename, file_type=filetype)
 
-        if items != None:
-            self.items = items
-            self.header = header if header != None else []
-            self.sheets = sheets
+            if items != None:
+                self.items = items
+                self.header = header if header != None else []
+                self.sheets = sheets
 
 
-            self.initialise_variables()
+                self.initialise_variables()
+        except Exception as e:
+            self.notification(self.stdscr, message=f"Error loading {filename}: {e}")
 
     def load_sheet(self, filename: str, sheet_number: int = 0):
         filetype = guess_file_type(filename)
-        items, header, sheets = table_to_list(filename, file_type=filetype, sheet_number=sheet_number)
-
-        if items != None:
-            self.items = items
-            self.header = header if header != None else []
-            self.sheets = sheets
+        try:
+            items, header, sheets = table_to_list(filename, file_type=filetype, sheet_number=sheet_number)
+            if items != None:
+                self.items = items
+                self.header = header if header != None else []
+                self.sheets = sheets
 
-            self.initialise_variables()
+                self.initialise_variables()
+        except Exception as e:
+            self.notification(self.stdscr, message=f"Error loading {filename}, sheet {sheet_number}: {e}")
 
     def switch_file(self, increment=1) -> None:
         """ Go to the next file. """
@@ -2100,6 +2133,7 @@ class Picker:
         self.loaded_file_index = (self.loaded_file_index + increment) % len(self.loaded_files)
         self.loaded_file = self.loaded_files[self.loaded_file_index]
 
+        idx, file = self.loaded_file_index, self.loaded_file
         # If we already have a loaded state for this file
         if self.loaded_file_states[self.loaded_file_index]:
             self.set_function_data(self.loaded_file_states[self.loaded_file_index])
@@ -2107,6 +2141,7 @@ class Picker:
             self.set_function_data({}, reset_absent_variables=True)
             self.load_file(self.loaded_file)
 
+        self.loaded_file_index, self.loaded_file = idx, file
 
     def switch_sheet(self, increment=1) -> None:
         if not os.path.exists(self.loaded_file):
@@ -2179,10 +2214,14 @@ class Picker:
             function_data = self.get_function_data()
             return [], "", function_data
 
-        # Main loop
+        # Open tty to accept input
+        tty_fd = open_tty()
 
+        # Main loop
         while True:
-            key = self.stdscr.getch()
+            # key = self.stdscr.getch()
+
+            key = get_char(tty_fd, timeout=0.2)
             if key != -1:
                 self.logger.info(f"key={key}")
             h, w = self.stdscr.getmaxyx()
@@ -2386,6 +2425,7 @@ class Picker:
                     del self.loaded_file_states[self.loaded_file_index]
                     self.loaded_file_index = min(self.loaded_file_index, len(self.loaded_files)-1)
                     self.loaded_file = self.loaded_files[self.loaded_file_index]
+                    idx, file = self.loaded_file_index, self.loaded_file
 
 
                     # If we already have a loaded state for this file
@@ -2394,6 +2434,7 @@ class Picker:
                     else:
                         self.set_function_data({}, reset_absent_variables=True)
                         self.load_file(self.loaded_file)
+                    self.loaded_file_index, self.loaded_file = idx, file
                     self.draw_screen(self.indexed_items, self.highlights)
 
             elif self.check_key("full_exit", key, self.keys_dict):
@@ -2421,7 +2462,7 @@ class Picker:
                     formula_auto_complete=False,
                     function_auto_complete=False,
                     word_auto_complete=True,
-                    auto_complete_words=["ft", "ct", "cv"]
+                    auto_complete_words=["ft", "ct", "cv"],
                 )
                 if return_val:
                     self.user_settings = usrtxt
@@ -3402,10 +3443,11 @@ def parse_arguments() -> Tuple[argparse.Namespace, dict]:
     parser.add_argument('--stdin', dest='stdin', action='store_true', help='Table passed on stdin')
     parser.add_argument('--stdin2', action='store_true', help='Table passed on stdin')
     parser.add_argument('--generate', '-g', type=str, help='Pass file to generate data for listpick Picker.')
-    parser.add_argument('-d', dest='delimiter', default='\t', help='Delimiter for rows in the table (default: tab)')
+    parser.add_argument('--delimiter', '-d', dest='delimiter', default='\t', help='Delimiter for rows in the table (default: tab)')
     parser.add_argument('-t', dest='file_type', choices=['tsv', 'csv', 'json', 'xlsx', 'ods', 'pkl'], help='Type of file (tsv, csv, json, xlsx, ods)')
     parser.add_argument('--debug', action="store_true", help="Enable debug log.")
     parser.add_argument('--debug-verbose', action="store_true", help="Enable debug verbose log.")
+    parser.add_argument('--headerless', action="store_false", help="By default the first row is interpreted as a header row. If --headerless is passed then there is no header.")
     args = parser.parse_args()
 
 
@@ -3458,13 +3500,31 @@ def parse_arguments() -> Tuple[argparse.Namespace, dict]:
         filetype = args.file_type
     
 
-    items, header, sheets = table_to_list(input_arg, args.delimiter, filetype)
+    while True:
+        try:
+            items, header, sheets = table_to_list(
+                input_arg=input_arg, 
+                delimiter=args.delimiter, 
+                file_type = filetype,
+                first_row_is_header=args.headerless,
+            )
+            if args.file:
+                function_data["loaded_file"] = args.file[0]
+                function_data["loaded_files"] = args.file
+            break
+
+        except Exception as e:
+            items, header, sheets = [], [], []
+            function_data["startup_notification"] = f"Error loading {input_arg}. {e}"
+            if args.file:
+                args.file = args.file[1:]
+                input_arg = args.file[0]
+            else:
+                break
+
     function_data["items"] = items
     if header: function_data["header"] = header
     function_data["sheets"] = sheets
-    if args.file:
-        function_data["loaded_file"] = args.file[0]
-        function_data["loaded_files"] = args.file
 
     return args, function_data
 
@@ -3505,6 +3565,52 @@ def unrestrict_curses(stdscr: curses.window) -> None:
     curses.raw() # Disable control keys (ctrl-c, ctrl-s, ctrl-q, etc.)
     curses.curs_set(False)
 
+
+def open_tty():
+    """ Return a file descriptor for the tty that we are opening"""
+    tty_fd = os.open('/dev/tty', os.O_RDONLY)
+    tty.setraw(tty_fd)
+    return tty_fd
+
+def get_char(tty_fd, timeout: float = 0.2, secondary: bool = False) -> int:
+    """ Get character from a tty_fd with a timeout. """
+    rlist, _, _ = select.select([tty_fd], [], [], timeout)
+    if rlist:
+        # key = ord(tty_fd.read(1))
+        key = ord(os.read(tty_fd, 1))
+        if not secondary:
+            if key == 27:
+                key2 = get_char(tty_fd, timeout=0.01, secondary=True)
+                key3 = get_char(tty_fd, timeout=0.01, secondary=True)
+                key4 = get_char(tty_fd, timeout=0.01, secondary=True)
+                key5 = get_char(tty_fd, timeout=0.01, secondary=True)
+                if key2 == ord('O') and key3 == ord('B'):
+                    key = curses.KEY_DOWN
+                elif key2 == ord('O') and key3 == ord('A'):
+                    key = curses.KEY_UP
+                elif key2 == ord('O') and key3 == ord('D'):
+                    key = curses.KEY_LEFT
+                elif key2 == ord('O') and key3 == ord('C'):
+                    key = curses.KEY_RIGHT
+                elif key2 == ord('[') and key3 == ord('Z'):
+                    key = 353
+                elif key2 == ord('O') and key3 == ord('F'):
+                    key = curses.KEY_END
+                elif key2 == ord('O') and key3 == ord('H'):
+                    key = curses.KEY_HOME
+                elif key2 == ord('[') and key3 == ord('3') and key4 == ord('~'):
+                    key = curses.KEY_DC
+                elif key2 == ord('[') and key3 == ord('3') and key4 == ord('~'):
+                    key = curses.KEY_DC
+                elif key2 == ord('O') and key3 == ord('P'):
+                    key = curses.KEY_F1
+                elif key2 == ord('[') and key3 == ord('1') and key4 == ord('5') and key5 == ord('~'):
+                    key = curses.KEY_F5
+
+    else:
+        key = -1
+    return key
+
 def main() -> None:
     """ Main function when listpick is executed. Deals with command line arguments and starts a Picker. """
     args, function_data = parse_arguments()
@@ -3540,16 +3646,16 @@ def main() -> None:
             "color": 8,
         }
     ]
-    function_data["cell_cursor"] = True
-    function_data["display_modes"] = True
-    function_data["centre_in_cols"] = True
-    function_data["show_row_header"] = True
-    function_data["keys_dict"] = picker_keys
-    function_data["id_column"] = -1
-    function_data["track_entries_upon_refresh"] = True
-    function_data["centre_in_terminal_vertical"] = True
-    function_data["highlight_full_row"] = True
-    function_data["pin_cursor"] = True
+    # function_data["cell_cursor"] = True
+    # function_data["display_modes"] = True
+    # function_data["centre_in_cols"] = True
+    # function_data["show_row_header"] = True
+    # function_data["keys_dict"] = picker_keys
+    # function_data["id_column"] = -1
+    # function_data["track_entries_upon_refresh"] = True
+    # function_data["centre_in_terminal_vertical"] = True
+    # function_data["highlight_full_row"] = True
+    # function_data["pin_cursor"] = True
     # function_data["display_infobox"] = True
     # function_data["infobox_items"] = [["1"], ["2"], ["3"]]
     # function_data["infobox_title"] = "Title"
@@ -3572,6 +3678,7 @@ def main() -> None:
 
         # app = Picker(stdscr, **function_data)
         app = Picker(stdscr)
+        app.set_config("~/.config/listpick/config.toml")
         app.set_function_data(function_data)
         app.splash_screen("Listpick is loading your data...")
         app.load_input_history("~/.config/listpick/cmdhist.json")

{listpick-0.1.14.4 → listpick-0.1.14.6}/src/listpick/ui/footer.py

@@ -94,9 +94,11 @@ class StandardFooter(Footer):
 
 
 
+        ## Clear background of footer rows
         for i in range(self.height):
             self.stdscr.addstr(h-self.height+i, 0, ' '*(w-1), curses.color_pair(self.colours_start+20))
 
+        # Display loaded files
         if len(state["loaded_files"]) > 1 and state["loaded_file"] in state["loaded_files"]:
 
             sep = "◢ "
@@ -172,17 +174,23 @@ class StandardFooter(Footer):
 
 
 
+
+        ## Cursor selection mode
         select_mode = "C"
         if state["is_selecting"]: select_mode = "VS"
         elif state["is_deselecting"]: select_mode = "VDS"
         if state["pin_cursor"]: select_mode = f"{select_mode} "
+
         # Cursor & selection info
         selected_count = sum(state["selections"].values())
         if state["paginate"]:
-            # cursor_disp_str = f" [{selected_count}] {state['cursor_pos']+1}/{len(state['indexed_items'])} | Page {state['cursor_pos']//state['items_per_page']}/{len(state['indexed_items'])//state['items_per_page']} | {select_mode}"
             cursor_disp_str = f" [{selected_count}] {state['cursor_pos']+1}/{len(state['indexed_items'])} | Page {state['cursor_pos']//state['items_per_page']}/{len(state['indexed_items'])//state['items_per_page']} | {select_mode}"
         else:
-            cursor_disp_str = f" [{selected_count}] {state['cursor_pos']+1}/{len(state['indexed_items'])} | {select_mode}"
+            # cursor_disp_str = f" [{selected_count}] {state['cursor_pos']+1},{state['selected_column']}/{len(state['indexed_items'])},{len(state['column_widths'])} | {select_mode}"
+            if state["cell_cursor"]:
+                cursor_disp_str = f" [{selected_count}] {state['cursor_pos']+1}/{len(state['indexed_items'])} | {state['selected_column']}/{len(state['column_widths'])} | {select_mode}"
+            else:
+                cursor_disp_str = f" [{selected_count}] {state['cursor_pos']+1}/{len(state['indexed_items'])} | {select_mode}"
 
         # Maximum chars that should be displayed
         max_chars = min(len(cursor_disp_str)+2, w)

{listpick-0.1.14.4 → listpick-0.1.14.6}/src/listpick/ui/input_field.py

@@ -16,7 +16,25 @@ from datetime import datetime
 import logging
 
 logger = logging.getLogger('picker_log')
-
+import select
+import tty
+
+def open_tty():
+    """ Return a file descriptor for the tty that we are opening"""
+    tty_fd = os.open('/dev/tty', os.O_RDONLY)
+    tty.setraw(tty_fd)
+    return tty_fd
+
+def get_char(tty_fd, timeout: float = 0.2) -> int:
+    """ Get character from a tty_fd with a timeout. """
+    rlist, _, _ = select.select([tty_fd], [], [], timeout)
+    if rlist:
+        # key = ord(tty_fd.read(1))
+        key = ord(os.read(tty_fd, 1))
+    else:
+        key = -1
+    return key
+    
 def input_field(
     stdscr: curses.window,
     usrtxt:str="",
@@ -106,6 +124,8 @@ def input_field(
     offscreen_x, offscreen_y = False, False
     orig_x, orig_y = x, y
 
+    tty_fd = open_tty()
+
     # Input field loop
     while True:
 
@@ -131,7 +151,7 @@ def input_field(
 
         # Clear background to end of the input field
         stdscr.addstr(field_y, x(), " "*(max_field_length), curses.color_pair(colours_start+colour_pair_bg))
-        stdscr.refresh()
+        # stdscr.refresh()
 
         if literal:
             field_string_length = len(repr(usrtxt)) + len(field_prefix)
@@ -206,12 +226,15 @@ def input_field(
                     pass
 
 
-        key = stdscr.getch()
+        stdscr.refresh()
+        key = get_char(tty_fd, timeout=0.5)
+        # key = stdscr.getch()
 
         if key in [27, 7]:                                                           # ESC/ALT key or Ctrl+g
             # For Alt-key combinations: set nodelay and get the second key
-            stdscr.nodelay(True)
-            key2 = stdscr.getch()
+            # stdscr.nodelay(True)
+            # key2 = stdscr.getch()
+            key2 = get_char(tty_fd, timeout=0.05)
 
             if key2 == -1:                  # ESCAPE key (no key-combination)
                 stdscr.nodelay(False)
@@ -311,7 +334,7 @@ def input_field(
             curses.endwin()
             exit()
 
-        elif key == 10:                                                         # Enter/return key
+        elif key in [10, 13]:                                                         # Enter/return key
             # Return
             return usrtxt, True
 

listpick-0.1.14.6/src/listpick/ui/keycodes.py

@@ -0,0 +1,70 @@
+# Define constants for alt+a to alt+z
+META_A = 1000
+META_B = 1001
+META_C = 1002
+META_D = 1003
+META_E = 1004
+META_F = 1005
+META_G = 1006
+META_H = 1007
+META_I = 1008
+META_J = 1009
+META_K = 1010
+META_L = 1011
+META_M = 1012
+META_N = 1013
+META_O = 1014
+META_P = 1015
+META_Q = 1016
+META_R = 1017
+META_S = 1018
+META_T = 1019
+META_U = 1020
+META_V = 1021
+META_W = 1022
+META_X = 1023
+META_Y = 1024
+META_Z = 1025
+
+# Define constants for alt+A to alt+Z (using uppercase)
+META_a = 1050
+META_b = 1051
+META_c = 1052
+META_d = 1053
+META_e = 1054
+META_f = 1055
+META_g = 1056
+META_h = 1057
+META_i = 1058
+META_j = 1059
+META_k = 1060
+META_l = 1061
+META_m = 1062
+META_n = 1063
+META_o = 1064
+META_p = 1065
+META_q = 1066
+META_r = 1067
+META_s = 1068
+META_t = 1069
+META_u = 1070
+META_v = 1071
+META_w = 1072
+META_x = 1073
+META_y = 1074
+META_z = 1075
+
+# Dictionary to map character to its constant value
+META_KEY_MAP = {
+    'a': META_a, 'b': META_b, 'c': META_c, 'd': META_d, 'e': META_e,
+    'f': META_f, 'g': META_g, 'h': META_h, 'i': META_i, 'j': META_j,
+    'k': META_k, 'l': META_l, 'm': META_m, 'n': META_n, 'o': META_o,
+    'p': META_p, 'q': META_q, 'r': META_r, 's': META_s, 't': META_t,
+    'u': META_u, 'v': META_v, 'w': META_w, 'x': META_x, 'y': META_y,
+    'z': META_z, 'A': META_A, 'B': META_B, 'C': META_C, 'D': META_D,
+    'E': META_E, 'F': META_F, 'G': META_G, 'H': META_H, 'I': META_I,
+    'J': META_J, 'K': META_K, 'L': META_L, 'M': META_M, 'N': META_N,
+    'O': META_O, 'P': META_P, 'Q': META_Q, 'R': META_R, 'S': META_S,
+    'T': META_T, 'U': META_U, 'V': META_V, 'W': META_W, 'X': META_X,
+    'Y': META_Y, 'Z': META_Z
+}

{listpick-0.1.14.4 → listpick-0.1.14.6}/src/listpick/ui/keys.py

@@ -32,7 +32,7 @@ picker_keys = {
     "select_none":                      [ord('M'), 18],   # Ctrl-r
     "visual_selection_toggle":          [ord('v')],
     "visual_deselection_toggle":        [ord('V')],
-    "enter":                            [ord('\n'), curses.KEY_ENTER],
+    "enter":                            [ord('\n'), curses.KEY_ENTER, 13],
     "redraw_screen":                    [12], # Ctrl-l
     "cycle_sort_method":                [ord('s')],
     "cycle_sort_method_reverse":        [ord('S')],
@@ -122,7 +122,7 @@ help_keys = {
 
 
 notification_keys = {
-    "exit":                             [ord('q'), ord('h'), curses.KEY_ENTER, ord('\n'), ord(' '), 27],
+    "exit":                             [ord('q'), ord('h'), curses.KEY_ENTER, ord('\n'), ord(' '), 27, 13],
     "full_exit":                        [3], # Ctrl+c
     "cursor_down":                      [ord('j'), curses.KEY_DOWN],
     "cursor_up":                        [ord('k'), curses.KEY_UP],
@@ -152,7 +152,7 @@ menu_keys = {
     "cursor_top":                       [ord('g'), curses.KEY_HOME],
     "five_up":                          [ord('K')],
     "five_down":                        [ord('J')],
-    "enter":                            [ord('\n'), curses.KEY_ENTER, ord('l')],
+    "enter":                            [ord('\n'), curses.KEY_ENTER, ord('l'), 13],
     "redraw_screen":                    [12], # Ctrl-l
     "filter_input":                     [ord('f')],
     "search_input":                     [ord('/')],
@@ -183,7 +183,7 @@ options_keys = {
     "select_none":                      [ord('M'), 18],   # Ctrl-r
     "visual_selection_toggle":          [ord('v')],
     "visual_deselection_toggle":        [ord('V')],
-    "enter":                            [ord('\n'), curses.KEY_ENTER, ord('l')],
+    "enter":                            [ord('\n'), curses.KEY_ENTER, ord('l'), 13],
     "redraw_screen":                    [12], # Ctrl-l
     "cycle_sort_method":                [ord('s')],
     "cycle_sort_method_reverse":        [ord('S')],
@@ -213,7 +213,7 @@ edit_menu_keys = {
     "cursor_top":                       [ord('g'), curses.KEY_HOME],
     "five_up":                          [ord('K')],
     "five_down":                        [ord('J')],
-    "enter":                            [ord('\n'), curses.KEY_ENTER],
+    "enter":                            [ord('\n'), curses.KEY_ENTER, 13],
     "redraw_screen":                    [12], # Ctrl-l
     "cycle_sort_method":                [ord('s')],
     "cycle_sort_method_reverse":        [ord('S')],

{listpick-0.1.14.4 → listpick-0.1.14.6}/src/listpick/utils/table_to_list_of_lists.py

@@ -36,13 +36,117 @@ def strip_whitespace(item: Iterable) -> Iterable:
         return item
 
 
+def xlsx_to_list(file_name: str, sheet_number:int = 0, extract_formulae: bool = False, first_row_is_header: bool = True):
+    import pandas as pd
+    from openpyxl import load_workbook
+    # wb = load_workbook(filename=input_arg, read_only=True)
+    # values or formulae
+    if not os.path.exists(file_name):
+        return [], [], []
+    wb = load_workbook(filename=file_name, read_only=True, data_only=not extract_formulae)
+    
+    if not isinstance(sheet_number, int): sheet_number = 0
+    sheet_number = max(0, min(sheet_number, len(wb.sheetnames)-1))
+    ws = wb.worksheets[sheet_number]
+    
+    # Read data and formulas from the sheet
+    table_data = []
+    # table_data = [[cell for cell in row] for row in ws.iter_rows(min_row=1, values_only=False)]
+    # table_data = [[cell.value for cell in row] for row in ws.iter_rows(min_row=1, values_only=False)]
+    table_data = [[cell if cell != None else "" for cell in row] for row in ws.iter_rows(min_row=1, values_only=True)]
+    header = []
+    # header = [cell for cell in list(ws.iter_rows(values_only=True))[0]]  # Assuming the first row is the header
+    if first_row_is_header and len(table_data) > 1:
+        header = table_data[0]
+        table_data = table_data[1:]
+    else:
+        header = []
+    #
+    # for row in ws.iter_rows(min_row=2, values_only=True):  # Skip the header row
+    #     row_data = []
+    #     for cell in row:
+    #         if isinstance(cell, str) and '=' in cell:  # Check if it's a formula
+    #             row_data.append(cell)
+    #         else:
+    #             row_data.append(str(cell))
+    #     table_data.append(row_data)
+    
+    return table_data, header, wb.sheetnames
+
+def ods_to_list(filename: str, sheet_number: int = 0, extract_formulas: bool = False, first_row_is_header: bool = True):
+    from odf.opendocument import load
+    from odf import table, text
+
+    from odf.namespaces import TABLENS
+    # Load the ODS file
+    doc = load(filename)
+
+    sheets = doc.spreadsheet.getElementsByType(table.Table)
+    sheet_names = [s.attributes.get((TABLENS, 'name')) for s in sheets]
+
+
+    # Get the sheet by index
+    sheet = doc.spreadsheet.getElementsByType(table.Table)[sheet_number]
+
+    data = []
+    for row in sheet.getElementsByType(table.TableRow):
+        row_data = []
+        for cell in row.getElementsByType(table.TableCell):
+            if extract_formulas:
+                formula = cell.attributes.get((TABLENS, 'formula'))
+                if formula is not None:
+                    row_data.append(formula)
+                    continue  # Skip extracting value if formula found
+            
+            # Extract value (as text) from <text:p> elements
+            cell_text = ""
+            for p in cell.getElementsByType(text.P):
+                cell_text += str(p.firstChild) if p.firstChild is not None else ""
+            row_data.append(cell_text)
+        data.append(row_data)
+    if first_row_is_header and len(data) > 1:
+        header = data[0]
+        data = data[1:]
+    else:
+        header = []
+
+    return data, header, sheet_names
+
+def ods_to_list_old(file_name: str, sheet_number:int = 0, extract_formulae: bool = False, first_row_is_header: bool = True):
+    try:
+        import pandas as pd
+        ef = pd.ExcelFile(file_name)
+        sheets = ef.sheet_names
+        sheet_number = max(0, min(sheet_number, len(sheets)-1))
+        df = pd.read_excel(file_name, engine='odf', sheet_name=sheet_number)
+        # if sheet_number < len(sheets):
+        #     df = pd.read_excel(input_arg, engine='odf', sheet_name=sheet_number)
+        # else:
+        #     df = pd.read_excel(input_arg, engine='odf')
+        table_data = df.values.tolist()
+        table_data = [[x if not pd.isna(x) else "" for x in row] for row in table_data]
+        
+        try:
+            header = list(df.columns)
+        except:
+            header = []
+
+        if not first_row_is_header and header:
+            table_data = [header] + table_data
+            header = []
+
+        return table_data, header, sheets
+    except Exception as e:
+        print(f"Error loading ODS file: {e}")
+        return [], [], []
 
-def table_to_list(
 
-        input_arg: str,
-        delimiter:str='\t',
-        file_type:Optional[str]=None,
-        sheet_number:int = 0,
+def table_to_list(
+    input_arg: str,
+    delimiter:str='\t',
+    file_type:Optional[str]=None,
+    sheet_number:int = 0,
+    first_row_is_header:bool = True,
 
 ) -> Tuple[list[list[str]], list[str], list[str]]:
     """ 
@@ -62,25 +166,60 @@ def table_to_list(
     logger.info("function: table_to_list (table_to_list_of_lists.py)")
     table_data = []
 
-    def parse_csv_like(data:str, delimiter:str) -> list[list[str]]:
+    def parse_csv_like2(data:str, delimiter:str) -> list[list[str]]:
         """ Convert value-separated data (e.g., CSV or TSV) to list of lists. """
         logger.info("function: parse_csv_like (table_to_list_of_lists.py)")
 
         try:
-            reader = csv.reader(StringIO(data), delimiter=delimiter)
+            # reader = csv.reader(StringIO(data), delimiter=delimiter)
+            reader = csv.reader(StringIO(data), dialect='unix')
             return [row for row in reader]
         except Exception as e:
             print(f"Error reading CSV-like input: {e}")
             return []
+    def parse_csv_like(data:str, delimiter: str=" "):
+        import re
+        def split_columns(line):
+            # Define the regex pattern to match quoted strings and split by whitespace
+            # pattern = r"(?:'[^']*'|[^'\s]+)"
+            pattern = r"(?:\"[^\"]*\"|'[^']*'|[^'\s]+)"
+            
+            # Find all matches using the defined pattern
+            columns = re.findall(pattern, line)
+    
+            return columns
+
+        lines = data.strip().split('\n')
+        result = []
+        
+        for line in lines:
+            result.append(split_columns(line))
+        
+        return result
 
-    def csv_string_to_list(csv_string:str) -> list[list[str]]:
+    def csv_string_to_list(csv_string:str, first_row_is_header: bool = True) -> list[list[str]]:
         """ Convert csv string to list of lists using csv.reader. """
         logger.info("function: csv_string_to_list (table_to_list_of_lists.py)")
         f = StringIO(csv_string)
         reader = csv.reader(f, skipinitialspace=True)
-        return [row for row in reader]
+        table_data = [row for row in reader]
+        if first_row_is_header and len(table_data) > 1:
+            header = table_data[0]
+            table_data = table_data[1:]
+        else:
+            header = []
+        return table_data, header
+            
 
-    if file_type == 'csv' or delimiter in [',']:
+    if input_arg == '--stdin':
+        input_data = sys.stdin.read()
+    elif input_arg == '--stdin2':
+        input_count = int(sys.stdin.readline())
+        input_data = "\n".join([sys.stdin.readline() for i in range(input_count)])
+        sys.stdin.flush()
+        # sys.stdin.close()
+        # sys.stdin = open('/dev/tty', 'r')
+    elif file_type == 'csv' or delimiter in [',']:
         try:
             if input_arg == '--stdin':
                 input_data = sys.stdin.read()
@@ -90,10 +229,11 @@ def table_to_list(
             else:
                 input_data = read_file_content(input_arg)
 
-            table_data = csv_string_to_list(input_data)
+            table_data, header = csv_string_to_list(input_data, first_row_is_header)
             table_data = strip_whitespace(table_data)
+            header = strip_whitespace([header])[0]
             # table_data = parse_csv_like(input_data, ",")
-            return table_data, [], []
+            return table_data, header, []
         except Exception as e:
             print(f"Error reading CSV/TSV input: {e}")
             return [], [], []
@@ -141,45 +281,12 @@ def table_to_list(
             return [], [], []
 
     elif file_type == 'xlsx':
-        import pandas as pd
-        ef = pd.ExcelFile(input_arg)
-        sheets = ef.sheet_names
-        sheet_number = min(0, max(sheet_number, len(sheets)-1))
-        df = pd.read_excel(input_arg, engine='odf', sheet_name=sheet_number)
-        # if sheet_number < len(sheets):
-        #     df = pd.read_excel(input_arg, sheet_name=sheet_number)
-        # else:
-        #     df = pd.read_excel(input_arg)
-        table_data = df.values.tolist()
-        table_data = [[x if not pd.isna(x) else "" for x in row] for row in table_data]
-        try:
-            header = list(df.columns)
-        except:
-            header = []
-        return table_data, header, sheets
+        extract_formulae = False
+        return xlsx_to_list(input_arg, sheet_number, extract_formulae, first_row_is_header)
 
     elif file_type == 'ods':
-        try:
-            import pandas as pd
-            ef = pd.ExcelFile(input_arg)
-            sheets = ef.sheet_names
-            sheet_number = min(0, max(sheet_number, len(sheets)-1))
-            df = pd.read_excel(input_arg, engine='odf', sheet_name=sheet_number)
-            # if sheet_number < len(sheets):
-            #     df = pd.read_excel(input_arg, engine='odf', sheet_name=sheet_number)
-            # else:
-            #     df = pd.read_excel(input_arg, engine='odf')
-            table_data = df.values.tolist()
-            table_data = [[x if not pd.isna(x) else "" for x in row] for row in table_data]
-            
-            try:
-                header = list(df.columns)
-            except:
-                header = []
-            return table_data, header, sheets
-        except Exception as e:
-            print(f"Error loading ODS file: {e}")
-            return [], [], []
+        extract_formulae = False
+        return ods_to_list(input_arg, sheet_number, extract_formulae, first_row_is_header)
     elif file_type == 'pkl':
         with open(os.path.expandvars(os.path.expanduser(input_arg)), 'rb') as f:
             loaded_data = pickle.load(f)
@@ -187,17 +294,18 @@ def table_to_list(
         header = loaded_data["header"] if "header" in loaded_data else []
         return items, header, []
 
-    if input_arg == '--stdin':
-        input_data = sys.stdin.read()
-    elif input_arg == '--stdin2':
-        input_count = int(sys.stdin.readline())
-        input_data = "\n".join([sys.stdin.readline() for i in range(input_count)])
     else:
         input_data = read_file_content(input_arg)
     
     table_data = parse_csv_like(input_data, delimiter)
+    if first_row_is_header and len(table_data) > 1:
+        header = table_data[0]
+        table_data = table_data[1:]
+    else:
+        header = []
+
 
-    return table_data, [], []
+    return table_data, header, []
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Convert table to list of lists.')

{listpick-0.1.14.4 → listpick-0.1.14.6/src/listpick.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.14.4
+Version: 0.1.14.6
 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.4 → listpick-0.1.14.6}/src/listpick.egg-info/SOURCES.txt

@@ -35,6 +35,7 @@ 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/keycodes.py
 src/listpick/ui/keys.py
 src/listpick/ui/pane_stuff.py
 src/listpick/ui/picker_colours.py