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

listpick/listpick_app.py

@@ -140,6 +140,7 @@ class Picker:
         footer_string_refresh_function: Optional[Callable] = None,
         footer_timer: float=1,
         get_footer_string_startup=False,
+        unicode_char_width: bool = True,
 
         colours_start: int =0,
         colours_end: int =-1,
@@ -256,7 +257,7 @@ class Picker:
         self.footer_string_refresh_function = footer_string_refresh_function
         self.footer_timer = footer_timer
         self.get_footer_string_startup = get_footer_string_startup,
-
+        self.unicode_char_width = unicode_char_width
 
 
         self.colours_start = colours_start
@@ -312,17 +313,12 @@ class Picker:
         self.debug_level = debug_level
 
 
-
-
         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
         self.footer_options = [StandardFooter(self.stdscr, colours_start, self.get_function_data), CompactFooter(self.stdscr, colours_start, self.get_function_data), NoFooter(self.stdscr, colours_start, self.get_function_data)]
         self.footer = self.footer_options[self.footer_style]
 
-        # self.footer = CompactFooter(self.stdscr, colours_start, self.get_function_data)
-
 
     def calculate_section_sizes(self):
         """
@@ -384,7 +380,6 @@ class Picker:
     def initialise_picker_state(self, reset_colours=False) -> None:
         """ Initialise state variables for the picker. These are: debugging and colours. """
 
-
         if curses.has_colors() and self.colours != None:
             # raise Exception("Terminal does not support color")
             curses.start_color()
@@ -694,7 +689,7 @@ class Picker:
         # rows = [v[1] for v in self.indexed_items] if len(self.indexed_items) else self.items
         # Determine widths based only on the currently displayed indexed rows
         rows = [v[1] for v in self.indexed_items[start_index:end_index]] if len(self.indexed_items) else self.items
-        self.column_widths = get_column_widths(rows, header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns, max_total_width=w)
+        self.column_widths = get_column_widths(rows, header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns, max_total_width=w, unicode_char_width=self.unicode_char_width)
         visible_column_widths = [c for i,c in enumerate(self.column_widths) if i not in self.hidden_columns]
         visible_columns_total_width = sum(visible_column_widths) + len(self.separator)*(len(visible_column_widths)-1)
 
@@ -793,10 +788,10 @@ class Picker:
                     else:
                         cell_value = self.indexed_items[row][1][col] + self.separator
                     # cell_value = cell_value[:min(cell_width, cell_max_width)-len(self.separator)]
-                    cell_value = truncate_to_display_width(cell_value, min(cell_width, cell_max_width)-len(self.separator))
+                    cell_value = truncate_to_display_width(cell_value, min(cell_width, cell_max_width)-len(self.separator), self.unicode_char_width)
                     cell_value = cell_value + self.separator
                     # cell_value = cell_value
-                    cell_value = truncate_to_display_width(cell_value, min(cell_width, cell_max_width))
+                    cell_value = truncate_to_display_width(cell_value, min(cell_width, cell_max_width), self.unicode_char_width)
                     # row_str = truncate_to_display_width(row_str_left_adj, min(w-self.startx, visible_columns_total_width))
                     self.stdscr.addstr(y, cell_pos, cell_value, curses.color_pair(self.colours_start+colour_pair_number) | curses.A_BOLD)
                 # Part of the cell is on screen
@@ -838,7 +833,7 @@ class Picker:
         def draw_highlights(highlights: list[dict], idx: int, y: int, item: tuple[int, list[str]]):
             self.logger.debug(f"function: draw_highlights()")
             if len(highlights) == 0: return None
-            full_row_str = format_row(item[1], self.hidden_columns, self.column_widths, self.separator, self.centre_in_cols)
+            full_row_str = format_row(item[1], self.hidden_columns, self.column_widths, self.separator, self.centre_in_cols, self.unicode_char_width)
             row_str = full_row_str[self.leftmost_char:]
             for highlight in highlights:
                 if "row" in highlight:
@@ -854,13 +849,13 @@ class Picker:
                             continue
 
                     elif type(highlight["field"]) == type(0) and highlight["field"] not in self.hidden_columns:
-                        match = re.search(highlight["match"], truncate_to_display_width(item[1][highlight["field"]], self.column_widths[highlight["field"]], centre=False), re.IGNORECASE)
+                        match = re.search(highlight["match"], truncate_to_display_width(item[1][highlight["field"]], self.column_widths[highlight["field"]], centre=False, unicode_char_width=self.unicode_char_width), re.IGNORECASE)
                         if not match: continue
                         field_start = sum([width for i, width in enumerate(self.column_widths[:highlight["field"]]) if i not in self.hidden_columns]) + sum([1 for i in range(highlight["field"]) if i not in self.hidden_columns])*wcswidth(self.separator)
 
                         ## We want to search the non-centred values but highlight the centred values.
                         if self.centre_in_cols:
-                            tmp = truncate_to_display_width(item[1][highlight["field"]], self.column_widths[highlight["field"]], self.centre_in_cols)
+                            tmp = truncate_to_display_width(item[1][highlight["field"]], self.column_widths[highlight["field"]], self.centre_in_cols, self.unicode_char_width)
                             field_start += (len(tmp) - len(tmp.lstrip()))
 
                         highlight_start = field_start + match.start()
@@ -882,11 +877,11 @@ class Picker:
             item = self.indexed_items[idx]
             y = idx - start_index + self.top_space
 
-            row_str = format_row(item[1], self.hidden_columns, self.column_widths, self.separator, self.centre_in_cols)[self.leftmost_char:]
+            # row_str = format_row(item[1], self.hidden_columns, self.column_widths, self.separator, self.centre_in_cols)[self.leftmost_char:]
             # row_str = truncate_to_display_width(row_str, min(w-self.startx, visible_columns_total_width))
-            row_str_orig = format_row(item[1], self.hidden_columns, self.column_widths, self.separator, self.centre_in_cols)
+            row_str_orig = format_row(item[1], self.hidden_columns, self.column_widths, self.separator, self.centre_in_cols, self.unicode_char_width)
             row_str_left_adj = clip_left(row_str_orig, self.leftmost_char)
-            row_str = truncate_to_display_width(row_str_left_adj, min(w-self.startx, visible_columns_total_width))
+            row_str = truncate_to_display_width(row_str_left_adj, min(w-self.startx, visible_columns_total_width), self.unicode_char_width)
             # row_str = truncate_to_display_width(row_str, min(w-self.startx, visible_columns_total_width))[self.leftmost_char:]
 
             ## Display the standard row
@@ -899,7 +894,7 @@ class Picker:
 
             # Higlight cursor cell and selected cells
             if self.cell_cursor:
-                self.selected_cells_by_row = get_selected_cells_by_row(self.cell_selections)
+                # self.selected_cells_by_row = get_selected_cells_by_row(self.cell_selections)
                 if item[0] in self.selected_cells_by_row:
                     for j in self.selected_cells_by_row[item[0]]:
                         highlight_cell(idx, j, visible_column_widths, colour_pair_number=25)
@@ -993,6 +988,7 @@ class Picker:
             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))
         
+        self.stdscr.refresh()
         ## Display infobox
         if self.display_infobox:
             self.infobox(self.stdscr, message=self.infobox_items, title=self.infobox_title)
@@ -1140,6 +1136,7 @@ class Picker:
             "debug":                            self.debug,
             "debug_level":                      self.debug_level,
             "reset_colours":                    self.reset_colours,
+            "unicode_char_width":               self.unicode_char_width,
         }
         return function_data
 
@@ -1238,7 +1235,7 @@ class Picker:
         while True:
             h, w = stdscr.getmaxyx()
 
-            choose_opts_widths = get_column_widths(options)
+            choose_opts_widths = get_column_widths(options, unicode_char_width=self.unicode_char_width)
             window_width = min(max(sum(choose_opts_widths) + 6, 50) + 6, w)
             window_height = min(h//2, max(6, len(options)+3))
 
@@ -1393,6 +1390,8 @@ class Picker:
                     self.initialise_variables()
                 elif setting == "pc":
                     self.pin_cursor = not self.pin_cursor
+                elif setting == "unicode":
+                    self.unicode_char_width = not self.unicode_char_width
 
                 elif setting.startswith("ft"):
                     if len(setting) > 2 and setting[2:].isnumeric():
@@ -1456,7 +1455,6 @@ class Picker:
                         self.draw_screen(self.indexed_items, self.highlights)
                         self.notification(self.stdscr, message=f"Theme {self.colour_theme_number} applied.")
 
-
                 else:
                     self.user_settings = ""
                     return None
@@ -1489,7 +1487,8 @@ class Picker:
             self.selections[self.indexed_items[i][0]] = True
         for i in self.cell_selections.keys():
             self.cell_selections[i] = True
-
+        for row in range(len(self.indexed_items)):
+            self.selected_cells_by_row[row] = list(range(len(self.indexed_items[row][1])))
         self.draw_screen(self.indexed_items, self.highlights)
 
     def deselect_all(self) -> None:
@@ -1499,6 +1498,7 @@ class Picker:
             self.selections[i] = False
         for i in self.cell_selections.keys():
             self.cell_selections[i] = False
+        self.selected_cells_by_row = {}
         self.draw_screen(self.indexed_items, self.highlights)
 
     def handle_visual_selection(self, selecting:bool = True) -> None:
@@ -1527,9 +1527,18 @@ class Picker:
                 xend = max(self.start_selection_col, self.selected_column)
                 for i in range(ystart, yend + 1):
                     if self.indexed_items[i][0] not in self.unselectable_indices:
-                        for j in range(xstart, xend+1):
-                            cell_index = (self.indexed_items[i][0], j)
+                        row = self.indexed_items[i][0]
+                        if row not in self.selected_cells_by_row:
+                            self.selected_cells_by_row[row] = []
+
+                        for col in range(xstart, xend+1):
+                            cell_index = (row, col)
                             self.cell_selections[cell_index] = True
+
+                            self.selected_cells_by_row[row].append(col)
+                        # Remove duplicates
+                        self.selected_cells_by_row[row] = list(set(self.selected_cells_by_row[row]))
+
             self.start_selection = -1
             self.end_selection = -1
             self.is_selecting = False
@@ -1551,10 +1560,19 @@ class Picker:
                 xstart = min(self.start_selection_col, self.selected_column)
                 xend = max(self.start_selection_col, self.selected_column)
                 for i in range(ystart, yend + 1):
+                    row = self.indexed_items[i][0]
                     if self.indexed_items[i][0] not in self.unselectable_indices:
-                        for j in range(xstart, xend+1):
-                            cell_index = (self.indexed_items[i][0], j)
-                            self.cell_selections[cell_index] = False
+                        if row in self.selected_cells_by_row:
+                            for col in range(xstart, xend+1):
+                                try:
+                                    self.selected_cells_by_row[row].remove(col)
+                                except:
+                                    pass
+                                cell_index = (row, col)
+                                self.cell_selections[cell_index] = False
+                            if self.selected_cells_by_row[row] == []:
+                                del self.selected_cells_by_row[row]
+
             self.start_selection = -1
             self.end_selection = -1
             self.is_deselecting = False
@@ -1833,7 +1851,7 @@ class Picker:
 
     def get_word_list(self) -> list[str]:
         """ Get a list of all words used in any cell of the picker. Used for completion in search/filter input_field. """
-        self.logger.info(f"function: infobox()")
+        self.logger.info(f"function: get_word_list()")
         translator = str.maketrans('', '', string.punctuation)
         
         words = []
@@ -2076,6 +2094,7 @@ class Picker:
                     options += [["rh", "Toggle row header"]]
                     options += [["modes", "Toggle modes"]]
                     options += [["ft", "Cycle through footer styles (accepts ft#)"]]
+                    options += [["unicode", "Toggle b/w using len and wcwidth to calculate char width."]]
                     options += [[f"s{i}", f"Select col. {i}"] for i in range(len(self.items[0]))]
                     options += [[f"!{i}", f"Toggle col. {i}"] for i in range(len(self.items[0]))]
                     options += [["ara", "Add empty row after cursor."]]
@@ -2140,11 +2159,31 @@ class Picker:
                 if len(self.indexed_items) > 0:
                     item_index = self.indexed_items[self.cursor_pos][0]
                     cell_index = (self.indexed_items[self.cursor_pos][0], self.selected_column)
+                    row, col = cell_index
                     selected_count = sum(self.selections.values())
                     if self.max_selected == -1 or selected_count >= self.max_selected:
                         self.toggle_item(item_index)
 
                         self.cell_selections[cell_index] = not self.cell_selections[cell_index]
+                        ## Set self.selected_cells_by_row
+                        # If any cells in the current row are selected
+                        if row in self.selected_cells_by_row:
+                            # If the current cell is selected then remove it
+                            if col in self.selected_cells_by_row[row]:
+                                # If the current cell is the only cell in the row that is selected then remove the row from the dict
+                                if len(self.selected_cells_by_row[row]) == 1:
+
+                                    del self.selected_cells_by_row[row]
+                                # else remove only the index of the current cell
+                                else:
+                                    self.selected_cells_by_row[row].remove(col)
+                            # If there are cells in the row that are selected then append the current cell to the row
+                            else:
+                                self.selected_cells_by_row[row].append(col)
+                        # Add the a list containing only the current column
+                        else:
+                            self.selected_cells_by_row[row] = [col]
+
                 self.cursor_down()
             elif self.check_key("select_all", key, self.keys_dict):  # Select all (m or ctrl-a)
                 self.select_all()
@@ -2278,7 +2317,7 @@ class Picker:
 
                 ## Scroll with column select
                 rows = self.get_visible_rows()
-                self.column_widths = get_column_widths(rows, header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns, max_total_width=w)
+                self.column_widths = get_column_widths(rows, header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns, max_total_width=w, unicode_char_width=self.unicode_char_width)
                 visible_column_widths = [c for i,c in enumerate(self.column_widths) if i not in self.hidden_columns]
                 column_set_width = sum(visible_column_widths)+len(self.separator)*len(visible_column_widths)
                 start_of_cell = sum(visible_column_widths[:self.selected_column])+len(self.separator)*self.selected_column
@@ -2305,8 +2344,7 @@ class Picker:
 
                 ## Scroll with column select
                 rows = self.get_visible_rows()
-                self.column_widths = get_column_widths(rows, header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns, max_total_width=w)
-
+                self.column_widths = get_column_widths(rows, header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns, max_total_width=w, unicode_char_width=self.unicode_char_width)
                 visible_column_widths = [c for i,c in enumerate(self.column_widths) if i not in self.hidden_columns]
                 column_set_width = sum(visible_column_widths)+len(self.separator)*len(visible_column_widths)
                 start_of_cell = sum(visible_column_widths[:self.selected_column])+len(self.separator)*self.selected_column
@@ -2321,18 +2359,13 @@ class Picker:
                     self.leftmost_char = start_of_cell
 
                 self.leftmost_char = max(0, min(column_set_width - display_width + 5, self.leftmost_char))
-                #
+
             elif self.check_key("scroll_right", key, self.keys_dict):
                 self.logger.info(f"key_function scroll_right")
-                rows = self.get_visible_rows()
-                longest_row_str_len = 0
-                for i in range(len(rows)):
-                    item = rows[i]
-                    row_str = format_row(item, self.hidden_columns, self.column_widths, self.separator, self.centre_in_cols)[self.leftmost_char:]
-                    if len(row_str) > longest_row_str_len: longest_row_str_len=len(row_str)
-
-                if longest_row_str_len >= w-self.startx:
-                    self.leftmost_char = self.leftmost_char+5
+                if len(self.indexed_items):
+                    row_width = sum(self.column_widths) + len(self.separator)*(len(self.column_widths)-1)
+                    if row_width-self.leftmost_char >= w-self.startx:
+                        self.leftmost_char = self.leftmost_char+5
 
             elif self.check_key("scroll_left", key, self.keys_dict):
                 self.logger.info(f"key_function scroll_left")
@@ -2349,7 +2382,7 @@ class Picker:
                 rows = self.get_visible_rows()
                 for i in range(len(rows)):
                     item = rows[i]
-                    row_str = format_row(item, self.hidden_columns, self.column_widths, self.separator, self.centre_in_cols)
+                    row_str = format_row(item, self.hidden_columns, self.column_widths, self.separator, self.centre_in_cols, self.unicode_char_width)
                     if len(row_str) > longest_row_str_len: longest_row_str_len=len(row_str)
                 # for i in range(len(self.indexed_items)):
                 #     item = self.indexed_items[i]
@@ -2450,7 +2483,7 @@ class Picker:
             elif key == curses.KEY_RESIZE:  # Terminal resize signal
 
                 self.calculate_section_sizes()
-                self.column_widths = get_column_widths(self.items, header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns, max_total_width=w)
+                self.column_widths = get_column_widths(self.items, header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns, max_total_width=w, unicode_char_width=self.unicode_char_width)
 
                 self.draw_screen(self.indexed_items, self.highlights)
 
@@ -2860,7 +2893,6 @@ class Picker:
 def set_colours(pick: int = 0, start: int = 0) -> Optional[int]:
     """ Initialise curses colour pairs from dictionary. """
     
-
     global COLOURS_SET, notification_colours, help_colours
     if COLOURS_SET: return None
     if start == None: start = 0
@@ -3108,6 +3140,13 @@ def main() -> None:
     #         'name': 'mp4',
     #     },
     # ]
+    highlights = [
+        {
+            "field": 1,
+            "match": "a",
+            "color": 8,
+        }
+    ]
     function_data["cell_cursor"] = True
     function_data["display_modes"] = True
     function_data["centre_in_cols"] = True
@@ -3118,6 +3157,12 @@ def main() -> None:
     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"
+    # function_data["footer_string"] = "Title"
+    function_data["highlights"] = highlights
+    function_data["show_footer"] = False
     # function_data["debug"] = True
     # function_data["debug_level"] = 1
     stdscr = start_curses()

listpick/ui/footer_1.py

@@ -0,0 +1,202 @@
+"""
+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))

listpick/utils/utils.py

@@ -36,7 +36,7 @@ def clip_left(text, n):
         width += char_width
     return text  # If the total width is less than n, return the full string
 
-def truncate_to_display_width(text: str, max_column_width: int, centre=False) -> str:
+def truncate_to_display_width(text: str, max_column_width: int, centre=False, unicode_char_width: bool = True) -> str:
     """ 
     Truncate and/or pad text to max_column_width using wcwidth to ensure visual width is correct 
         with foreign character sets. 
@@ -74,16 +74,16 @@ def evaluate_cell(cell:str) -> str:
     return str(eval(cell[1:]))
 
 
-def format_row_full(row: list[str], hidden_columns:list = []) -> str:
+def format_row_full(row: list[str], hidden_columns:list = [], unicode_char_width: bool = True) -> str:
     """ Format list of strings as a tab-separated single string. No hidden columns. """
     return '\t'.join(str(row[i]) for i in range(len(row)) if i not in hidden_columns)
 
-def format_full_row(row:str) -> str:
+def format_full_row(row:str, unicode_char_width: bool = True) -> str:
     """ Format list of strings as a tab-separated single string. Includes hidden columns. """
     return '\t'.join(row)
 
 
-def format_row(row: list[str], hidden_columns: list, column_widths: list[int], separator: str, centre:bool=False) -> str:
+def format_row(row: list[str], hidden_columns: list, column_widths: list[int], separator: str, centre:bool=False, unicode_char_width: bool = True) -> str:
     """ Format list of strings as a single string. Requires separator string and the maximum width of the columns. """
     row_str = ""
     for i, cell in enumerate(row):
@@ -96,7 +96,7 @@ def format_row(row: list[str], hidden_columns: list, column_widths: list[int], s
     return row_str
     # return row_str.strip()
 
-def get_column_widths(items: list[list[str]], header: list[str]=[], max_column_width:int=70, number_columns:bool=True, max_total_width=-1, separator = "    ") -> list[int]:
+def get_column_widths(items: list[list[str]], header: list[str]=[], max_column_width:int=70, number_columns:bool=True, max_total_width=-1, separator = "    ", unicode_char_width: bool = True) -> list[int]:
     """ Calculate maximum width of each column with clipping. """
     if len(items) == 0: return [0]
     assert len(items) > 0

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

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

@@ -1,9 +1,10 @@
 listpick/__init__.py,sha256=ExXc97-bibodH--wlwpQivl0zCNR5D1hvpvrf7OBofU,154
 listpick/__main__.py,sha256=wkCjDdqw093W27yWwnlC3nG_sMRKaIad7hHHWy0RBgY,193
-listpick/listpick_app.py,sha256=nF4NTNqOb-cxvNG2sP4TbcA7m5g1P3dCqpeS9ZP-QWM,161953
+listpick/listpick_app.py,sha256=cAZXi69fk_1dcmWF36FfTgEptLyzLQRSdBYG8qCY9bA,165151
 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
@@ -22,10 +23,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=8nsjjTDQH13tHTU93YcKklLQ_uuMAz-rbDTmao83T4Q,12783
-listpick-0.1.13.57.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
-listpick-0.1.13.57.dist-info/METADATA,sha256=78uDTAuXg1RZq4D7k_9SVZY9nb_dEUlO_k1ELe_nHhM,7988
-listpick-0.1.13.57.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-listpick-0.1.13.57.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
-listpick-0.1.13.57.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
-listpick-0.1.13.57.dist-info/RECORD,,
+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,,