listpick 0.1.13.55__tar.gz → 0.1.13.57__tar.gz

{listpick-0.1.13.55 → listpick-0.1.13.57}/CHANGELOG.md

@@ -25,17 +25,6 @@
  - Setup logging for the Picker class. Currently still very basic but will track to the last function that was run before crash if the --debug flag is passed to the picker.
  - Added pin_cursor options which keeps the cursor on the same row during a refresh rather than tracking the id of the highlighted row. 
  - Updated StandardFooter. Now shows information on two lines rather than three; all cursor and selection information on the first line and the sort information on the second. Cursor, Visual (de)selection now abreviated to C, VS, and VDS.
- - Reduced flickering when displaying an infobox.
- - Optimised cpu usage by created a class variable selected_cells_by_row which updates with selection/deselection rather than being determined each time the draw_screen loop is run.
- - Added unicode_char_width option which will set the calculating character widths. If True then wcwidth will be used to calculate the display with if False then len will be used.
-   - unicode_char_width should be set to true if special characters will be displayed
-     - Special characters=East Asian scripts, emojis, etc.
-   - With data that has several thousand columns wcwidth is extremely slow so unicode_char_width should be set to False.
- - Speed improvements:
-   - get_column_widths calculated only once when drawing the screen.
-   - unicode_char_width option to improve performance with large (in particular wide) data sets.
-   - truncate_to_display width now guesses the target width and then adjusts rather than adding one display-width character at a time. 5-10 times faster.
-   - Reduced number of calls to draw_screen. It is called (1) when a key is pressed, (2) before showing a notification, and (3) when the data is refreshed.
 
 ## [0.1.13] 2025-07-28
  - Cell-based picker is now supported.

{listpick-0.1.13.55/src/listpick.egg-info → listpick-0.1.13.57}/PKG-INFO

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

@@ -5,9 +5,6 @@ ASAP
 > - [ ] Unify in-app load and command-line input file
 > - [ ] Implement default_option_selector and pass the picker options (!!!)
 > - [ ] Make sure that all class initialisation variables are returned in the get_function_variables function.
-> - [ ] Adjust leftmost_char when:
->   - [ ] cursor_down
->   - [ ] 'g', 'G'
 
 
 
@@ -117,7 +114,6 @@ ASAP
 > - [x] Support pasting copied cells into the picker
 >   - [ ] Ensure that we can only paste when cells are editable.
 >   - [ ] Add option to insert cells; e.g., insert two columns and move the data to the right of the selected column across
->   - [ ] Add support for pasting as a string
 > - [ ] Support inserting cells/rows.
 > - [ ] Bulk edit in nvim
 > - [ ] Add formula and display value...

{listpick-0.1.13.55 → listpick-0.1.13.57}/setup.py

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

@@ -140,7 +140,6 @@ 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,
@@ -257,7 +256,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
@@ -313,6 +312,8 @@ class Picker:
         self.debug_level = debug_level
 
 
+
+
         self.initialise_picker_state(reset_colours=self.reset_colours)
 
 
@@ -323,7 +324,6 @@ class Picker:
         # self.footer = CompactFooter(self.stdscr, colours_start, self.get_function_data)
 
 
-
     def calculate_section_sizes(self):
         """
         Calculte the following for the Picker:
@@ -384,6 +384,7 @@ 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()
@@ -473,6 +474,7 @@ class Picker:
         
                 if len(self.indexed_items) > 0 and len(self.indexed_items) >= self.cursor_pos and len(self.indexed_items[0][1]) >= self.id_column:
                     self.cursor_pos_id = self.indexed_items[self.cursor_pos][1][self.id_column]
+                    self.cursor_pos_prev = self.cursor_pos
         
             self.items, self.header = self.refresh_function()
 
@@ -656,6 +658,14 @@ class Picker:
         self.stdscr.refresh()
 
     def draw_screen(self, indexed_items: list[Tuple[int, list[str]]], highlights: list[dict] = [{}], clear: bool = True) -> None:
+        """ Try-except wrapper for the draw_screen_ function. """
+        try:
+            self.draw_screen_(self.indexed_items, self.highlights)
+        except Exception as e:
+            self.logger.warning(f"self.draw_screen_() error. {e}")
+            pass
+
+    def draw_screen_(self, indexed_items: list[Tuple[int, list[str]]], highlights: list[dict] = [{}], clear: bool = True) -> None:
         """ Draw Picker screen. """
         self.logger.debug("Draw screen.")
 
@@ -679,12 +689,12 @@ class Picker:
             end_index = min(start_index + self.items_per_page, len(self.indexed_items))
         if len(self.indexed_items) == 0: start_index, end_index = 0, 0
 
-        # self.column_widths = get_column_widths(self.items, header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns)
+        # 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)
         # Determine widths based only on the currently indexed rows
         # 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)
+        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)
         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)
 
@@ -982,7 +992,6 @@ class Picker:
             disp_string = f" {self.footer_string[:footer_string_width]:>{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))
-            self.stdscr.refresh()
         
         ## Display infobox
         if self.display_infobox:
@@ -1131,7 +1140,6 @@ 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
 
@@ -1385,8 +1393,6 @@ 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():
@@ -1450,6 +1456,7 @@ 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
@@ -1520,18 +1527,9 @@ 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:
-                        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)
+                        for j in range(xstart, xend+1):
+                            cell_index = (self.indexed_items[i][0], j)
                             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
@@ -1565,6 +1563,8 @@ class Picker:
     def cursor_down(self, count=1) -> bool:
         """ Move cursor down. """
         self.logger.info(f"function: cursor_down()")
+        if len(self.indexed_items) == 0 or self.cursor_pos == len(self.indexed_items) -1:
+            return False
         # Returns: whether page is turned
         new_pos = self.cursor_pos + 1
         new_pos = min(self.cursor_pos+count, len(self.indexed_items)-1)
@@ -1783,6 +1783,7 @@ class Picker:
 
             if len(self.indexed_items) > 0 and len(self.indexed_items) >= self.cursor_pos and len(self.indexed_items[0][1]) >= self.id_column:
                 self.cursor_pos_id = self.indexed_items[self.cursor_pos][1][self.id_column]
+                self.cursor_pos_prev = self.cursor_pos
         with self.data_lock:
             self.items, self.header = tmp_items, tmp_header
             self.data_ready = True
@@ -1832,7 +1833,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: get_word_list()")
+        self.logger.info(f"function: infobox()")
         translator = str.maketrans('', '', string.punctuation)
         
         words = []
@@ -1940,6 +1941,7 @@ class Picker:
 
         while True:
             key = self.stdscr.getch()
+            h, w = self.stdscr.getmaxyx()
             if key in self.disabled_keys: continue
             clear_screen=True
 
@@ -1960,7 +1962,6 @@ class Picker:
 
             elif self.check_key("refresh", key, self.keys_dict) or self.remapped_key(key, curses.KEY_F5, self.key_remappings) or (self.auto_refresh and (time.time() - initial_time) >= self.timer):
                 self.logger.debug(f"Get new data (refresh).")
-                h, w = self.stdscr.getmaxyx()
                 self.stdscr.addstr(0,w-3,"  ", curses.color_pair(self.colours_start+21) | curses.A_BOLD)
                 self.stdscr.refresh()
                 if self.get_new_data and self.refresh_function:
@@ -1974,7 +1975,6 @@ class Picker:
 
             # Refresh data synchronously
             # if self.check_key("refresh", key, self.keys_dict) or self.remapped_key(key, curses.KEY_F5, self.key_remappings) or (self.auto_refresh and (time.time() - initial_time) > self.timer):
-            #     h, w = self.stdscr.getmaxyx()
             #     self.stdscr.addstr(0,w-3,"  ", curses.color_pair(self.colours_start+21) | curses.A_BOLD)
             #     self.stdscr.refresh()
             #     if self.get_new_data and self.refresh_function:
@@ -2076,7 +2076,6 @@ 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."]]
@@ -2102,7 +2101,7 @@ class Picker:
             #     self.selected_column = (self.selected_column-1)%len(self.column_indices)
             #     # self.notification(self.stdscr, f"{str(self.column_indices)}, {tmp1}, {tmp2}")
             #     self.initialise_variables()
-            #     self.column_widths = get_column_widths([v[1] for v in self.indexed_items], header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns)
+            #     self.column_widths = get_column_widths([v[1] for v in self.indexed_items], header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns, max_total_width=w)
             #     self.draw_screen(self.indexed_items, self.highlights)
             #     # self.move_column(direction=-1)
             #
@@ -2120,19 +2119,22 @@ class Picker:
                 page_turned = self.cursor_down()
                 if not page_turned: clear_screen = False
             elif self.check_key("half_page_down", key, self.keys_dict):
-                clear_screen = False
                 self.cursor_down(count=self.items_per_page//2)
+                clear_screen = True
             elif self.check_key("five_down", key, self.keys_dict):
                 clear_screen = False
                 self.cursor_down(count=5)
+                clear_screen = True
             elif self.check_key("cursor_up", key, self.keys_dict):
                 page_turned = self.cursor_up()
                 if not page_turned: clear_screen = False
             elif self.check_key("five_up", key, self.keys_dict):
                 # if self.cursor_up(count=5): clear_screen = True
                 self.cursor_up(count=5)
+                clear_screen = True
             elif self.check_key("half_page_up", key, self.keys_dict):
                 self.cursor_up(count=self.items_per_page//2)
+                clear_screen = True
 
             elif self.check_key("toggle_select", key, self.keys_dict):
                 if len(self.indexed_items) > 0:
@@ -2143,25 +2145,6 @@ class Picker:
                         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()
@@ -2186,7 +2169,12 @@ class Picker:
                     else: break
                 if new_pos < len(self.items) and new_pos >= 0:
                     self.cursor_pos = new_pos
-
+                self.draw_screen(self.indexed_items, self.highlights)
+                # current_row = items_per_page - 1
+                # if current_page + 1 == (len(self.indexed_items) + items_per_page - 1) // items_per_page:
+                #
+                #     current_row = (len(self.indexed_items) +items_per_page - 1) % items_per_page
+                # self.draw_screen(self.indexed_items, self.highlights)
             elif self.check_key("enter", key, self.keys_dict):
                 self.logger.info(f"key_function enter")
                 # Print the selected indices if any, otherwise print the current index
@@ -2266,6 +2254,7 @@ class Picker:
                 if len(self.indexed_items) > 0:
                     current_index = self.indexed_items[self.cursor_pos][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
+                    self.draw_screen(self.indexed_items, self.highlights)
                     self.cursor_pos = [row[0] for row in self.indexed_items].index(current_index)
                 self.logger.info(f"key_function cycle_sort_order. (sort_column, sort_method, sort_reverse) = ({self.sort_column}, {self.columns_sort_method[self.sort_column]}, {self.sort_reverse[self.sort_column]})")
             elif self.check_key("col_select", key, self.keys_dict):
@@ -2289,10 +2278,10 @@ 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)
+                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)
                 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)
-                h, w = self.stdscr.getmaxyx()
+                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
                 end_of_cell = sum(visible_column_widths[:self.selected_column+1])+len(self.separator)*(self.selected_column+1)
                 display_width = w-self.startx
                 # If the full column is within the current display then don't do anything
@@ -2316,7 +2305,8 @@ 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, unicode_char_width=self.unicode_char_width)
+                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)
+
                 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
@@ -2331,13 +2321,18 @@ 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")
-                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
+                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
 
             elif self.check_key("scroll_left", key, self.keys_dict):
                 self.logger.info(f"key_function scroll_left")
@@ -2434,13 +2429,13 @@ class Picker:
                 self.logger.info(f"key_function decrease_column_width")
                 if self.max_column_width > 10:
                     self.max_column_width -= 10
-                    self.column_widths[:] = get_column_widths(self.items, header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns)
+                    # 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=2)
                     self.draw_screen(self.indexed_items, self.highlights)
             elif self.check_key("increase_column_width", key, self.keys_dict):
                 self.logger.info(f"key_function increase_column_width")
                 if self.max_column_width < 1000:
                     self.max_column_width += 10
-                    self.column_widths = get_column_widths(self.items, header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns)
+                    # 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.draw_screen(self.indexed_items, self.highlights)
             elif self.check_key("visual_selection_toggle", key, self.keys_dict):
                 self.logger.info(f"key_function visual_selection_toggle")
@@ -2455,7 +2450,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)
+                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.draw_screen(self.indexed_items, self.highlights)
 
@@ -2982,7 +2977,7 @@ def set_colours(pick: int = 0, start: int = 0) -> Optional[int]:
 def parse_arguments() -> Tuple[argparse.Namespace, dict]:
     """ Parse command line arguments. """
     parser = argparse.ArgumentParser(description='Convert table to list of lists.')
-    parser.add_argument('filename', type=str, help='The file to process')
+    # parser.add_argument('filename', type=str, help='The file to process')
     parser.add_argument('-i', dest='file', help='File containing the table to be converted.')
     parser.add_argument('--load', '-l', dest='load', type=str, help='Load file from Picker dump.')
     parser.add_argument('--stdin', dest='stdin', action='store_true', help='Table passed on stdin')
@@ -3010,8 +3005,8 @@ def parse_arguments() -> Tuple[argparse.Namespace, dict]:
         input_arg = '--stdin'
     elif args.stdin2:
         input_arg = '--stdin2'
-    elif args.filename:
-        input_arg = args.filename
+    # elif args.filename:
+    #     input_arg = args.filename
 
     elif args.generate:
         function_data["refresh_function"] = lambda : generate_picker_data(args.generate)
@@ -3122,6 +3117,7 @@ def main() -> None:
     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["debug"] = True
     # function_data["debug_level"] = 1
     stdscr = start_curses()

listpick-0.1.13.55/src/listpick/ui/footer_1.py → listpick-0.1.13.57/src/listpick/ui/footer.py

@@ -50,9 +50,6 @@ class StandardFooter(Footer):
     def draw(self, h, w):
         state = self.get_state()
         # Fill background
-        if "footer_string" in state and state["footer_string"]: self.height = 3
-        else: self.height = 2
-
         for i in range(self.height):
             self.stdscr.addstr(h-self.height+i, 0, ' '*(w-1), curses.color_pair(self.colours_start+20))
 
@@ -66,14 +63,19 @@ class StandardFooter(Footer):
         
             picker_info_y = h-3
             sort_info_y = h-2
+            self.height = 3
+
         else:
             picker_info_y = h-2
             sort_info_y = h-1
+            ""
             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} "
             self.stdscr.addstr(h - 1, w-35, f"{select_mode:>33} ", curses.color_pair(self.colours_start+20))
+            self.height = 2
+
 
         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)
@@ -105,7 +107,7 @@ class StandardFooter(Footer):
         sort_disp_str = f" Sort: ({sort_column_info}, {sort_method_info}, {sort_order_info}) "
         self.stdscr.addstr(sort_info_y, w-35, f"{sort_disp_str:>34}", curses.color_pair(self.colours_start+20))
 
-        # self.stdscr.refresh()
+        self.stdscr.refresh()
 
 
 

{listpick-0.1.13.55 → listpick-0.1.13.57}/src/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, unicode_char_width:bool = True) -> str:
+def truncate_to_display_width(text: str, max_column_width: int, centre=False) -> str:
     """ 
     Truncate and/or pad text to max_column_width using wcwidth to ensure visual width is correct 
         with foreign character sets. 
@@ -46,36 +46,19 @@ def truncate_to_display_width(text: str, max_column_width: int, centre=False, un
 
     """
     # logger.debug("function: truncate_to_display_width (utils.py)")
-    if unicode_char_width:
-        result = ''
-        width = 0
-
-
-        for char in text:
-            w = wcwidth(char)
-            if w < 0:
-                continue
-            if width + w > max_column_width:
-                break
-            result += char
-            width += w
-
-        # test_str = text[:max_column_width]
-        # while True:
-        #     width = wcswidth(test_str)
-        #     if width  < max_column_width or width == 0:
-        #         break
-        #     test_str = test_str[:-1]
-        # result = test_str
-    
-
-        # Pad if it's shorter
-        # padding = max_column_width - wcswidth(result)
-        # return result + ' ' * padding
-    else:
-        result = text[:max_column_width]
-        width = len(result)
-    padding = max_column_width - width
+    result = ''
+    width = 0
+    for char in text:
+        w = wcwidth(char)
+        if w < 0:
+            continue
+        if width + w > max_column_width:
+            break
+        result += char
+        width += w
+    # Pad if it's shorter
+    padding = max_column_width - wcswidth(result)
+    # return result + ' ' * padding
     if centre:
         result = ' '*(padding//2) + result + ' '*(padding//2 + padding%2)
     else:
@@ -100,7 +83,7 @@ def format_full_row(row:str) -> str:
     return '\t'.join(row)
 
 
-def format_row(row: list[str], hidden_columns: list, column_widths: list[int], separator: str, centre:bool=False, unicode_char_width:bool = True) -> str:
+def format_row(row: list[str], hidden_columns: list, column_widths: list[int], separator: str, centre:bool=False) -> 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):
@@ -108,22 +91,20 @@ def format_row(row: list[str], hidden_columns: list, column_widths: list[int], s
         # if is_formula_cell(cell):
         #     cell = evaluate_cell(cell)
         
-        val = truncate_to_display_width(str(cell), column_widths[i], centre, unicode_char_width)
+        val = truncate_to_display_width(str(cell), column_widths[i], centre)
         row_str += val + separator
     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 = "    ", unicode_char_width:bool=True) -> 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 = "    ") -> list[int]:
     """ Calculate maximum width of each column with clipping. """
     if len(items) == 0: return [0]
     assert len(items) > 0
-
-    if unicode_char_width:
-        widths = [max(wcswidth(str(row[i])) for row in items) for i in range(len(items[0]))]
-        # widths = [max(len(str(row[i])) for row in items) for i in range(len(items[0]))]
-        if header:
-            header_widths = [wcswidth(f"{i}. {str(h)}") if number_columns else wcswidth(str(h)) for i, h in enumerate(header)]
-            col_widths =  [min(max_column_width, max(widths[i], header_widths[i])) for i in range(len(header))]
-
+    widths = [max(wcswidth(str(row[i])) for row in items) for i in range(len(items[0]))]
+    # widths = [max(len(str(row[i])) for row in items) for i in range(len(items[0]))]
+    if header:
+        header_widths = [wcswidth(f"{i}. {str(h)}") if number_columns else wcswidth(str(h)) for i, h in enumerate(header)]
+        col_widths =  [min(max_column_width, max(widths[i], header_widths[i])) for i in range(len(header))]
         # actual_max_widths = [max(header_widths[i], widths[i]) for i in range(len(widths))]
         #
         # if sum(col_widths) + len(separator)*(len(col_widths)-1) < max_total_width:
@@ -143,15 +124,8 @@ def get_column_widths(items: list[list[str]], header: list[str]=[], max_column_w
         #     else:
         #         # Maximise balance.....
         #         pass
-        else:
-            col_widths = [min(max_column_width, width) for width in widths]
     else:
-        widths = [max(len(str(row[i])) for row in items) for i in range(len(items[0]))]
-        if header:
-            header_widths = [len(f"{i}. {str(h)}") if number_columns else len(str(h)) for i, h in enumerate(header)]
-            col_widths =  [min(max_column_width, max(widths[i], header_widths[i])) for i in range(len(header))]
-        else:
-            col_widths = [min(max_column_width, width) for width in widths]
+        col_widths = [min(max_column_width, width) for width in widths]
     return col_widths
 
 def get_mode_widths(item_list: list[str]) -> list[int]:

{listpick-0.1.13.55 → listpick-0.1.13.57/src/listpick.egg-info}/PKG-INFO

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

@@ -21,8 +21,6 @@ examples/video_duplicates.toml
 src/listpick/__init__.py
 src/listpick/__main__.py
 src/listpick/listpick_app.py
-src/listpick/listpick_app_1.py
-src/listpick/lpapp2.py
 src/listpick.egg-info/PKG-INFO
 src/listpick.egg-info/SOURCES.txt
 src/listpick.egg-info/dependency_links.txt
@@ -32,7 +30,6 @@ src/listpick.egg-info/top_level.txt
 src/listpick/ui/__init__.py
 src/listpick/ui/build_help.py
 src/listpick/ui/footer.py
-src/listpick/ui/footer_1.py
 src/listpick/ui/help_screen.py
 src/listpick/ui/input_field.py
 src/listpick/ui/keys.py