listpick 0.1.14.3__tar.gz → 0.1.14.5__tar.gz

{listpick-0.1.14.3 → listpick-0.1.14.5}/CHANGELOG.md

@@ -7,6 +7,7 @@ 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.
 
 ## [0.1.14] 2025-08-20
  - Fixed bug when cells are centred vertically.

{listpick-0.1.14.3/src/listpick.egg-info → listpick-0.1.14.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.14.3
+Version: 0.1.14.5
 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.3 → listpick-0.1.14.5}/setup.py

@@ -16,7 +16,7 @@ with open("README.md", "r", encoding = "utf-8") as fh:
 
 setuptools.setup(
     name = "listpick",
-    version = "0.1.14.3",
+    version = "0.1.14.5",
     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.3 → listpick-0.1.14.5}/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
@@ -349,6 +351,65 @@ 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
+        # full_config = self.get_default_config()
+        # default_path = "~/.config/listpick/config.toml"
+        #
+        # CONFIGPATH = default_path
+
+
+
+        #     if "general" in config:
+        #         for key in config["general"]:
+        #             full_config["general"][key] = config["general"][key]
+        #     if "appearance" in config:
+        #         for key in config["appearance"]:
+        #             full_config["appearance"][key] = config["appearance"][key]
+        #
+        # return full_config
+
+    def get_default_config(self) -> dict:
+        default_config = {
+            "general" : {
+                "url": "http://localhost",
+                "port": "6800",
+                "token": "",
+                "startupcmds": ["aria2c"],
+                "restartcmds": ["pkill aria2c && sleep 1 && aria2c"],
+                "ariaconfigpath": "~/.config/aria2/aria2.conf",
+                "paginate": False,
+                "refresh_timer": 2,
+                "global_stats_timer": 1,
+                "terminal_file_manager": "yazi",
+                "gui_file_manager": "kitty yazi",
+                "launch_command": "xdg-open",
+            },
+            "appearance":{
+                "theme": 0
+            }
+        }
+        return default_config
 
     def calculate_section_sizes(self):
         """
@@ -573,10 +634,6 @@ class Picker:
         # If a sort is passed
         if len(self.indexed_items) > 0:
             sort_items(self.indexed_items, sort_method=self.columns_sort_method[self.sort_column], sort_column=self.sort_column, sort_reverse=self.sort_reverse[self.sort_column])  # Re-sort self.items based on new column
-        # if len(self.items[0]) == 1:
-        #     self.number_columns = False
-
-
 
         h, w = self.stdscr.getmaxyx()
 
@@ -677,7 +734,14 @@ class Picker:
         # Update current column index
         self.selected_column = new_index
 
-    def test_screen_size(self):
+    def test_screen_size(self) -> bool:
+        """ 
+        Determine if the terminal is large enough to display the picker. 
+        If the terminal is too small then display a message saying so.
+
+        Returns: True if terminal is large enough to display the Picker.
+
+        """
         self.logger.debug("function: test_screen_size()")
         h, w = self.stdscr.getmaxyx()
         ## Terminal too small to display Picker
@@ -689,9 +753,10 @@ class Picker:
             return False
         return True
 
-    def splash_screen(self, message=""):
-        self.logger.info(f"function: splash_screen({message})")
+    def splash_screen(self, message="") -> None:
         """ Display a splash screen with a message. Useful when loading a large data set. """
+
+        self.logger.info(f"function: splash_screen({message})")
         h, w =self.stdscr.getmaxyx()
         self.stdscr.bkgd(' ', curses.color_pair(2))
         try:
@@ -854,14 +919,6 @@ class Picker:
             except:
                 pass
 
-        # Draw:
-        #    1. standard row
-        #    2. highlights l0
-        #    3. selected
-        #    4. above-selected highlights l1
-        #    5. cursor
-        #    6. top-level highlights l2
-        ## Display rows and highlights
 
         def sort_highlights(highlights):
             """ 
@@ -921,6 +978,15 @@ class Picker:
                 except:
                     pass
 
+        # Draw:
+        #    1. standard row
+        #    2. highlights l0
+        #    3. selected
+        #    4. above-selected highlights l1
+        #    5. cursor
+        #    6. top-level highlights l2
+        ## Display rows and highlights
+
         l0_highlights, l1_highlights, l2_highlights = sort_highlights(self.highlights)
 
 
@@ -2174,10 +2240,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()
@@ -2416,7 +2486,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
@@ -3500,6 +3570,24 @@ 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) -> 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))
+        # os.system(f"notify-send { key }")
+    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()
@@ -3535,16 +3623,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"
@@ -3567,6 +3655,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.3 → listpick-0.1.14.5}/src/listpick/ui/input_field.py

@@ -16,7 +16,26 @@ 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))
+        # os.system(f"notify-send { key }")
+    else:
+        key = -1
+    return key
+    
 def input_field(
     stdscr: curses.window,
     usrtxt:str="",
@@ -106,6 +125,10 @@ def input_field(
     offscreen_x, offscreen_y = False, False
     orig_x, orig_y = x, y
 
+    # tty_fd = open('/dev/tty')
+    # tty_fd = os.open('/dev/tty', os.O_RDONLY)
+    # tty.setraw(tty_fd)
+    tty_fd = open_tty()
     # Input field loop
     while True:
 
@@ -131,7 +154,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 +229,30 @@ def input_field(
                     pass
 
 
-        key = stdscr.getch()
+        stdscr.refresh()
+        # timeout = 0.05
+        # rlist, _, _ = select.select([tty_fd], [], [], timeout)
+        # if rlist:
+        #     # key = ord(tty_fd.read(1))
+        #     key = ord(os.read(tty_fd, 1))
+        #     os.system(f"notify-send { key }")
+        # else:
+        #     key = -1
+        key = get_char(tty_fd, timeout=0.5)
+        # key = ord(tty.read(1))
+        # 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()
+            # rlist, _, _ = select.select([tty_fd], [], [], timeout)
+            # if rlist:
+            #     key2 = ord(os.read(tty_fd, 1))
+            #     os.system(f"notify-send 'metakey { key }'")
+            # else:
+            #     key2 = -1
+            key2 = get_char(tty_fd, timeout=0.05)
 
             if key2 == -1:                  # ESCAPE key (no key-combination)
                 stdscr.nodelay(False)
@@ -311,7 +352,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.3 → listpick-0.1.14.5}/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')],
@@ -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.3 → listpick-0.1.14.5}/src/listpick/utils/table_to_list_of_lists.py

@@ -36,6 +36,102 @@ def strip_whitespace(item: Iterable) -> Iterable:
         return item
 
 
+def xlsx_to_list(file_name: str, sheet_number:int = 0, extract_formulae: bool = False):
+    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
+    header = table_data[0]
+    table_data = table_data[1:]
+    #
+    # 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) > 0:
+        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):
+    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 = []
+        return table_data, header, sheets
+    except Exception as e:
+        print(f"Error loading ODS file: {e}")
+        return [], [], []
+
 
 def table_to_list(
 
@@ -80,7 +176,17 @@ def table_to_list(
         reader = csv.reader(f, skipinitialspace=True)
         return [row for row in reader]
 
-    if file_type == 'csv' or delimiter in [',']:
+    if input_arg == '--stdin':
+        os.system(f"notify-send stdin")
+        input_data = sys.stdin.read()
+    elif input_arg == '--stdin2':
+        os.system(f"notify-send 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()
@@ -141,38 +247,12 @@ def table_to_list(
             return [], [], []
 
     elif file_type == 'xlsx':
-        import pandas as pd
-        ef = pd.ExcelFile(input_arg)
-        sheets = ef.sheet_names
-        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()
-        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)
 
     elif file_type == 'ods':
-        try:
-            import pandas as pd
-            ef = pd.ExcelFile(input_arg)
-            sheets = ef.sheet_names
-            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()
-            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)
     elif file_type == 'pkl':
         with open(os.path.expandvars(os.path.expanduser(input_arg)), 'rb') as f:
             loaded_data = pickle.load(f)
@@ -180,11 +260,6 @@ 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)
     

{listpick-0.1.14.3 → listpick-0.1.14.5/src/listpick.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.14.3
+Version: 0.1.14.5
 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