listpick 0.1.13.59__py3-none-any.whl → 0.1.13.61__py3-none-any.whl

listpick/listpick_app.py

@@ -449,8 +449,6 @@ class Picker:
         # self.stdscr.refresh()
         # self.draw_screen(self.indexed_items, self.highlights)
 
-
-
     def initialise_variables(self, get_data: bool = False) -> None:
         """ Initialise the variables that keep track of the data. """
 
@@ -473,6 +471,7 @@ class Picker:
         
             self.items, self.header = self.refresh_function()
 
+        self.items = pad_lists_to_same_length(self.items)
                     
         if self.items == []: self.items = [[]]
         ## Ensure that items is a List[List[Str]] object
@@ -1959,6 +1958,8 @@ class Picker:
 
         while True:
             key = self.stdscr.getch()
+            if key:
+                self.logger.info(f"key={key}")
             h, w = self.stdscr.getmaxyx()
             if key in self.disabled_keys: continue
             clear_screen=True

listpick/utils/utils.py

@@ -344,3 +344,20 @@ def guess_file_type(filename: str) -> str:
     """ Guess filetype. Currently just uses the extension of the file. """
     logger.info("function: guess_file_type (utils.py)")
     return filename.split(".")[-1]
+
+
+def pad_lists_to_same_length(list_of_lists: list[list[str]]) -> list[list[str]]:
+    """ Ensure that all lists in a list of lists are of the same length. Pad any shorter sublists with empty strings. """
+    if not list_of_lists or list_of_lists in [[], [[]]]:
+        return []
+
+    # Find the maximum length of the sublists
+    lengths = [len(sublist) for sublist in list_of_lists]
+    max_length = max(lengths)
+    min_length = min(lengths)
+    if min_length == max_length: return list_of_lists
+
+    # Pad each sublist with empty strings to match the maximum length
+    padded_list = [sublist + [''] * (max_length - len(sublist)) for sublist in list_of_lists]
+
+    return padded_list

{listpick-0.1.13.59.dist-info → listpick-0.1.13.61.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.13.59
+Version: 0.1.13.61
 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.13.59.dist-info → listpick-0.1.13.61.dist-info}/RECORD

@@ -1,10 +1,9 @@
 listpick/__init__.py,sha256=ExXc97-bibodH--wlwpQivl0zCNR5D1hvpvrf7OBofU,154
 listpick/__main__.py,sha256=wkCjDdqw093W27yWwnlC3nG_sMRKaIad7hHHWy0RBgY,193
-listpick/listpick_app.py,sha256=cAZXi69fk_1dcmWF36FfTgEptLyzLQRSdBYG8qCY9bA,165151
+listpick/listpick_app.py,sha256=xCtAMJTeWwos2XTCN7PwZgEgo3lAKmsp74M0cNgyvUI,165274
 listpick/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/ui/build_help.py,sha256=_rVKKrX3HfFJtw-pyeNb2lQWbml4-AAw8sZIUYGn97Y,8731
 listpick/ui/footer.py,sha256=s1L68MNmhWwbWRy0mn0ChmnE_dMQBAzNlTv917pyHE0,10673
-listpick/ui/footer_1.py,sha256=Mpn0gFAnX_Ely-Jl5KPP6sdZRnk8makt8EVBh9wdr4Y,10710
 listpick/ui/help_screen.py,sha256=zbfGIgb-IXtATpl4_Sx7nPbsnRXZ7eiMYlCKGS9EFmw,5608
 listpick/ui/input_field.py,sha256=eyoWHoApdZybjfXcp7Eth7xwb-C-856ZVnq5j_Q3Ojs,30412
 listpick/ui/keys.py,sha256=TzaadgBP_rC7jbp--RFJZDOkHd0EB4K1wToDTiVs6CI,13029
@@ -23,10 +22,10 @@ listpick/utils/search_and_filter_utils.py,sha256=XxGfkyDVXO9OAKcftPat8IReMTFIuTH
 listpick/utils/searching.py,sha256=Xk5UIqamNHL2L90z3ACB_Giqdpi9iRKoAJ6pKaqaD7Q,3093
 listpick/utils/sorting.py,sha256=WZZiVlVA3Zkcpwji3U5SNFlQ14zVEk3cZJtQirBkecQ,5329
 listpick/utils/table_to_list_of_lists.py,sha256=T-i-nV1p6g8UagdgUPKrhIGpKY_YXZDxf4xZzcPepNA,7635
-listpick/utils/utils.py,sha256=_4HW0p1gnundsTJcKsSsIKCZxy3DtolbxjBpuYQyFBw,12948
-listpick-0.1.13.59.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
-listpick-0.1.13.59.dist-info/METADATA,sha256=bD3N7PxFIQnVXf080zULv-TjMr9ia7RL8pLSZO2smYY,7988
-listpick-0.1.13.59.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-listpick-0.1.13.59.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
-listpick-0.1.13.59.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
-listpick-0.1.13.59.dist-info/RECORD,,
+listpick/utils/utils.py,sha256=m4uzL2ZPVpFuboIola0_ZIfLzlbGqirdz0_oo61tIlU,13636
+listpick-0.1.13.61.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
+listpick-0.1.13.61.dist-info/METADATA,sha256=VPjp9FR1XNwseaF4k0z4jyEHp3J7qXqXe3vFVlMXZrQ,7988
+listpick-0.1.13.61.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+listpick-0.1.13.61.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
+listpick-0.1.13.61.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
+listpick-0.1.13.61.dist-info/RECORD,,

listpick/ui/footer_1.py

@@ -1,202 +0,0 @@
-"""
-footer.py
-Lines to be displayed on the help screen.
-
-Author: GrimAndGreedy
-License: MIT
-"""
-
-import curses
-import logging
-
-logger = logging.getLogger('picker_log')
-
-class Footer:
-    def __init__(self, stdscr, colours_start, get_state_function):
-        """
-        stdscr: curses screen object
-        colours_start: base colour pair index
-        get_state_callback: function that returns a dict with all required data for rendering
-        """
-        self.stdscr = stdscr
-        self.colours_start = colours_start
-        self.get_state = get_state_function
-        self.height = 0
-
-    def draw(self, h, w):
-        """
-        Draw the footer. Must be implemented by subclasses.
-        """
-        raise NotImplementedError
-
-class StandardFooter(Footer):
-    def __init__(self, stdscr, colours_start, get_state_function):
-        """
-        stdscr: curses screen object
-        colours_start: base colour pair index
-        get_state_callback: function that returns a dict with all required data for rendering
-        """
-        self.stdscr = stdscr
-        self.colours_start = colours_start
-        self.get_state = get_state_function
-        self.height = 3
-    def draw(self, h, w):
-        state = self.get_state()
-
-        # Fill background
-        for i in range(3):
-            self.stdscr.addstr(h-3+i, 0, ' '*(w-1), curses.color_pair(self.colours_start+20))
-
-        if state["filter_query"]:
-            self.stdscr.addstr(h - 2, 2, f" Filter: {state['filter_query']} "[:w-40], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
-        if state["search_query"]:
-            self.stdscr.addstr(h - 3, 2, f" Search: {state['search_query']} [{state['search_index']}/{state['search_count']}] "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
-        if state["user_opts"]:
-            self.stdscr.addstr(h - 1, 2, f" Opts: {state['user_opts']} "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
-
-        # Sort info
-        sort_column_info = f"{state['sort_column'] if state['sort_column'] is not None else 'None'}"
-        sort_method_info = f"{state['SORT_METHODS'][state['columns_sort_method'][state['sort_column']]]}" if state['sort_column'] is not None else "NA"
-        sort_order_info = "Desc." if state["sort_reverse"] else "Asc."
-        sort_order_info = "▼" if state["sort_reverse"][state['sort_column']] else "▲"
-        sort_disp_str = f" Sort: ({sort_column_info}, {sort_method_info}, {sort_order_info}) "
-        self.stdscr.addstr(h - 2, w-35, f"{sort_disp_str:>34}", curses.color_pair(self.colours_start+20))
-
-        if state["footer_string"]:
-            # footer_string_width = min(w-1, max(len(state["footer_string"]), 50))
-            # disp_string = f"{state['footer_string'][:footer_string_width]:>{footer_string_width-1}} "
-            # self.stdscr.addstr(h - 1, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
-            # self.stdscr.addstr(h - 1, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))
-
-            # disp_string = f"{footer_string:>{footer_string_width-1}} "
-            # self.stdscr.addstr(h - 1, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
-            # self.stdscr.addstr(h - 1, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))
-
-            footer_string_width = min(w-1, len(state["footer_string"])+2)
-
-            disp_string = f"{state["footer_string"][:footer_string_width]}"
-            disp_string = f" {disp_string:>{footer_string_width-2}} "
-            self.stdscr.addstr(h - 1, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
-            self.stdscr.addstr(h - 1, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))
-        
-
-        else:
-            select_mode = "Cursor"
-            if state["is_selecting"]: select_mode = "Visual Selection"
-            elif state["is_deselecting"]: select_mode = "Visual deselection"
-            self.stdscr.addstr(h - 1, w-35, f"{select_mode:>33} ", curses.color_pair(self.colours_start+20))
-
-        # Cursor & selection info
-        selected_count = sum(state["selections"].values())
-        if state["paginate"]:
-            cursor_disp_str = f" {state['cursor_pos']+1}/{len(state['indexed_items'])}  Page {state['cursor_pos']//state['items_per_page']}/{len(state['indexed_items'])}  Selected {selected_count}"
-        else:
-            cursor_disp_str = f" {state['cursor_pos']+1}/{len(state['indexed_items'])}  |  Selected {selected_count}"
-        self.stdscr.addstr(h - 3, w-35, f"{cursor_disp_str:>33} ", curses.color_pair(self.colours_start+20))
-
-        self.stdscr.refresh()
-
-
-
-class CompactFooter(Footer):
-    def __init__(self, stdscr, colours_start, get_state_function):
-        """
-        stdscr: curses screen object
-        colours_start: base colour pair index
-        get_state_callback: function that returns a dict with all required data for rendering
-        """
-        self.stdscr = stdscr
-        self.colours_start = colours_start
-        self.get_state = get_state_function
-        self.height = 1
-
-    def draw(self, h, w):
-        state = self.get_state()
-
-        # Fill background
-        if state["search_query"]: self.height = 3
-        elif state["filter_query"]: self.height = 2
-        elif state["user_opts"]: self.height = 1
-        elif state["footer_string"]: self.height = 2
-        else: self.height = 1
-        for i in range(self.height):
-            self.stdscr.addstr(h-(i+1), 0, ' '*(w-1), curses.color_pair(self.colours_start+20))
-
-        if state["user_opts"]:
-            self.stdscr.addstr(h - 1, 2, f" Opts: {state['user_opts']} "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
-        if state["filter_query"]:
-            self.stdscr.addstr(h - 2, 2, f" Filter: {state['filter_query']} "[:w-40], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
-        if state["search_query"]:
-            self.stdscr.addstr(h - 3, 2, f" Search: {state['search_query']} [{state['search_index']}/{state['search_count']}] "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
-
-        right_width = 40
-        # Sort info
-        sort_column_info = f"{state['sort_column'] if state['sort_column'] is not None else 'None'}"
-        sort_method_info = f"{state['SORT_METHODS'][state['columns_sort_method'][state['sort_column']]]}" if state['sort_column'] is not None else "NA"
-        sort_order_info = "Desc." if state["sort_reverse"][state['sort_column']] else "Asc."
-        sort_order_info = "▼" if state["sort_reverse"][state['sort_column']] else "▲"
-        sort_disp_str = f" ({sort_column_info}, {sort_method_info}, {sort_order_info}) "
-        # self.stdscr.addstr(h - 2, w-right_width, f"{sort_disp_str:>{right_width-1}}", curses.color_pair(self.colours_start+20))
-
-        if state["footer_string"]:
-            footer_string_width = min(w-1, len(state["footer_string"])+2)
-
-            disp_string = f"{state["footer_string"][:footer_string_width]}"
-            disp_string = f" {disp_string:>{footer_string_width-2}} "
-            self.stdscr.addstr(h - 1, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
-            self.stdscr.addstr(h - 1, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))
-            selected_count = sum(state["selections"].values())
-            if state["paginate"]:
-                cursor_disp_str = f" {state['cursor_pos']+1}/{len(state['indexed_items'])}  Page {state['cursor_pos']//state['items_per_page']}/{len(state['indexed_items'])}  Selected {selected_count}"
-            else:
-                cursor_disp_str = f"{sort_disp_str} [{selected_count}] {state['cursor_pos']+1}/{len(state['indexed_items'])}"
-            self.stdscr.addstr(h-2, w-right_width, f"{cursor_disp_str:>{right_width-2}}"[:right_width-1], curses.color_pair(self.colours_start+20))
-        else:
-            # Cursor & selection info
-            selected_count = sum(state["selections"].values())
-            if state["paginate"]:
-                cursor_disp_str = f" {state['cursor_pos']+1}/{len(state['indexed_items'])}  Page {state['cursor_pos']//state['items_per_page']}/{len(state['indexed_items'])}  Selected {selected_count}"
-            else:
-                cursor_disp_str = f"{sort_disp_str} [{selected_count}] {state['cursor_pos']+1}/{len(state['indexed_items'])}"
-            self.stdscr.addstr(h - 1, w-right_width, f"{cursor_disp_str:>{right_width-2}}"[:right_width-1], curses.color_pair(self.colours_start+20))
-
-        self.stdscr.refresh()
-
-class NoFooter(Footer):
-    def __init__(self, stdscr, colours_start, get_state_function):
-        """
-        stdscr: curses screen object
-        colours_start: base colour pair index
-        get_state_callback: function that returns a dict with all required data for rendering
-        """
-        self.stdscr = stdscr
-        self.colours_start = colours_start
-        self.get_state = get_state_function
-        self.height = 0
-    def draw(self, h, w):
-        state = self.get_state()
-
-        if state["search_query"]: self.height = 3
-        elif state["filter_query"]: self.height = 2
-        elif state["user_opts"]: self.height = 1
-        elif state["footer_string"]: self.height = 1
-        else: self.height = 0
-
-        for i in range(self.height):
-            self.stdscr.addstr(h-(i+1), 0, ' '*(w-1), curses.color_pair(self.colours_start+20))
-
-        if state["user_opts"]:
-            self.stdscr.addstr(h - 1, 2, f" Opts: {state['user_opts']} "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
-        if state["filter_query"]:
-            self.stdscr.addstr(h - 2, 2, f" Filter: {state['filter_query']} "[:w-40], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
-        if state["search_query"]:
-            self.stdscr.addstr(h - 3, 2, f" Search: {state['search_query']} [{state['search_index']}/{state['search_count']}] "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
-            self.height = 3
-
-
-        if state["footer_string"]:
-            footer_string_width = min(w-1, len(state["footer_string"])+2)
-            disp_string = f"{state["footer_string"][:footer_string_width]}"
-            disp_string = f" {disp_string:>{footer_string_width-2}} "
-            self.stdscr.addstr(h - 1, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
-            self.stdscr.addstr(h - 1, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))