listpick 0.1.16.4__py3-none-any.whl → 0.1.16.6__py3-none-any.whl

listpick/listpick_app.py

@@ -20,8 +20,6 @@ import json
 import threading
 import string
 import logging
-import tty
-import select
 
 from listpick.pane.pane_utils import get_file_attributes
 from listpick.ui.picker_colours import get_colours, get_help_colours, get_notification_colours, get_theme_count, get_fallback_colours
@@ -36,22 +34,15 @@ from listpick.utils.paste_operations import *
 from listpick.utils.searching import search
 from listpick.ui.help_screen import help_lines
 from listpick.ui.keys import picker_keys, notification_keys, options_keys, help_keys
-# from listpick.utils.generate_data import generate_picker_data
 from listpick.utils.generate_data_multithreaded import generate_picker_data_from_file
 from listpick.utils.dump import dump_state, load_state, dump_data
 from listpick.ui.build_help import build_help_rows
 from listpick.ui.footer import StandardFooter, CompactFooter, NoFooter
 from listpick.utils.picker_log import setup_logger
-from listpick.utils.user_input import get_char, open_tty
+from listpick.utils.user_input import get_char, open_tty, restore_terminal_settings
 from listpick.pane.pane_functions import right_split_file_attributes, right_split_file_attributes_dynamic, right_split_graph, right_split_display_list
 from listpick.pane.get_data import *
 
-
-try:
-    from tmp.data_stuff import test_items, test_highlights, test_header
-except:
-    test_items, test_highlights, test_header = [], [], []
-
 COLOURS_SET = False
 help_colours, notification_colours = {}, {}
 
@@ -414,6 +405,14 @@ class Picker:
             config = toml.load(f)
             return config
 
+    def update_term_size(self):
+        self.term_h, self.term_w = self.stdscr.getmaxyx()
+
+    def get_term_size(self):
+        return self.stdscr.getmaxyx()
+        w, h = os.get_terminal_size()
+        return h, w
+
     def calculate_section_sizes(self):
         """
         Calculte the following for the Picker:
@@ -428,8 +427,7 @@ class Picker:
         self.bottom_space = self.footer.height if self.show_footer else 0
 
         ## self.top_space
-        h, w = self.stdscr.getmaxyx()
-        self.term_h, self.term_w = self.stdscr.getmaxyx()
+        self.update_term_size()
         if self.split_right and len(self.right_panes):
             proportion = self.right_panes[self.right_pane_index]["proportion"]
             self.rows_w, self.rows_h = int(self.term_w*proportion), self.term_h
@@ -551,7 +549,7 @@ class Picker:
 
         # self.stdscr.clear()
         # self.stdscr.refresh()
-        # self.draw_screen(self.indexed_items, self.highlights)
+        # self.draw_screen()
 
     def initialise_variables(self, get_data: bool = False) -> None:
         """ Initialise the variables that keep track of the data. """
@@ -759,13 +757,13 @@ class Picker:
 
         """
         self.logger.debug("function: test_screen_size()")
-        h, w = self.stdscr.getmaxyx()
+        self.update_term_size()
         ## Terminal too small to display Picker
-        if h<3 or w<len("Terminal"): return False
-        if (self.show_footer or self.footer_string) and (h<12 or w<35) or (h<12 and w<10):
-            self.stdscr.addstr(h//2-1, (w-len("Terminal"))//2, "Terminal")
-            self.stdscr.addstr(h//2, (w-len("Too"))//2, "Too")
-            self.stdscr.addstr(h//2+1, (w-len("Small"))//2, "Small")
+        if self.term_h<3 or self.term_w<len("Terminal"): return False
+        if (self.show_footer or self.footer_string) and (self.term_h<12 or self.term_w<35) or (self.term_h<12 and self.term_w<10):
+            self.stdscr.addstr(self.term_h//2-1, (self.term_w-len("Terminal"))//2, "Terminal")
+            self.stdscr.addstr(self.term_h//2, (self.term_w-len("Too"))//2, "Too")
+            self.stdscr.addstr(self.term_h//2+1, (self.term_w-len("Small"))//2, "Small")
             return False
         return True
 
@@ -778,28 +776,28 @@ class Picker:
 
         if type(message) == type(""): message = [message]
 
-        h, w =self.stdscr.getmaxyx()
-        if len(message) > h: start_y = 0
-        else: start_y = (h-len(message))//2
+        self.update_term_size()
+        if len(message) > self.term_h: start_y = 0
+        else: start_y = (self.term_h-len(message))//2
 
         for i in range(len(message)):
             try:
                 s = message[i]
-                if len(s) > w: s = s[:w-2]
-                self.stdscr.addstr(start_y+i, (w-len(s))//2, s, curses.color_pair(2))
+                if len(s) > self.term_w: s = s[:self.term_w-2]
+                self.stdscr.addstr(start_y+i, (self.term_w-len(s))//2, s, curses.color_pair(2))
             except:
                 pass
         self.stdscr.refresh()
 
-    def draw_screen(self, indexed_items: list[Tuple[int, list[str]]], highlights: list[dict] = [{}], clear: bool = True) -> None:
+    def draw_screen(self, clear: bool = True) -> None:
         """ Try-except wrapper for the draw_screen_ function. """
         try:
-            self.draw_screen_(self.indexed_items, self.highlights)
+            self.draw_screen_(clear)
         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:
+    def draw_screen_(self, clear: bool = True) -> None:
         """ Draw Picker screen. """
 
         self.logger.debug("Draw screen.")
@@ -807,8 +805,7 @@ class Picker:
         if clear:
             self.stdscr.erase()
 
-        h, w = self.stdscr.getmaxyx()
-        self.term_h, self.term_w = self.stdscr.getmaxyx()
+        self.update_term_size()
         if self.split_right and len(self.right_panes):
             proportion = self.right_panes[self.right_pane_index]["proportion"]
             self.rows_w, self.rows_h = int(self.term_w*proportion), self.term_h
@@ -846,7 +843,7 @@ class Picker:
 
         # Determine the number of items_per_page, top_size and bottom_size
         # self.calculate_section_sizes()
-        
+
         # top_space = self.top_gap
 
         ## Display title (if applicable)
@@ -918,11 +915,11 @@ class Picker:
                     # Start of selected column is on the screen
                     if self.leftmost_char <= len(up_to_selected_col) and self.leftmost_char+self.rows_w-self.startx > len(up_to_selected_col):
                         x_pos = len(up_to_selected_col) - self.leftmost_char + self.startx
-                        
+
                         # Whole cell of the selected column is on the screen
                         if len(up_to_selected_col)+col_width - self.leftmost_char < self.rows_w-self.startx:
                             disp_str = highlighted_col_str
-                            
+
                         # Start of the cell is on the screen, but the end of the cell is not
                         else:
                             overflow = (len(up_to_selected_col)+len(highlighted_col_str)) - (self.leftmost_char+self.rows_w - self.startx)
@@ -974,7 +971,7 @@ class Picker:
                     #     self.stdscr.addstr(header_ypos, highlighed_col_startx , highlighted_col_str[start_of_highlighted_col_str:end_of_highlighted_col_str][:self.column_widths[self.selected_column]+len(self.separator)], curses.color_pair(self.colours_start+19) | curses.A_BOLD)
             except:
                 pass
-                
+
         # Display row header 
         if self.show_row_header:
             for idx in range(start_index, end_index):
@@ -986,7 +983,7 @@ class Picker:
 
 
         def highlight_cell(row: int, col:int, visible_column_widths, colour_pair_number: int = 5, bold: bool = False, y:int = 0):
-            
+
             cell_pos = sum(visible_column_widths[:col])+col*len(self.separator)-self.leftmost_char + self.startx
             # cell_width = self.column_widths[self.selected_column]
             cell_width = visible_column_widths[col] + len(self.separator)
@@ -1119,7 +1116,7 @@ class Picker:
 
             ## Display the standard row
             self.stdscr.addstr(y, self.startx, row_str[:min(self.rows_w-self.startx, visible_columns_total_width)], curses.color_pair(self.colours_start+2))
-            
+
 
             ## Highlight column
             if self.crosshair_cursor:
@@ -1190,7 +1187,7 @@ class Picker:
                     highlight_cell(idx, self.selected_column, visible_column_widths, colour_pair_number=5, bold=True, y=y)
                 else:
                     self.stdscr.addstr(y, self.startx, row_str[:min(self.rows_w-self.startx, visible_columns_total_width)], curses.color_pair(self.colours_start+5) | curses.A_BOLD)
-            
+
             if not self.highlights_hide:
                 draw_highlights(l2_highlights, idx, y, item)
 
@@ -1226,7 +1223,6 @@ class Picker:
         ## Display footer
         if self.show_footer:
             # self.footer = NoFooter(self.stdscr, self.colours_start, self.get_function_data)
-            h, w = self.stdscr.getmaxyx()
             try:
                 self.footer.draw(self.term_h, self.term_w)
             except:
@@ -1259,7 +1255,7 @@ class Picker:
                 cell = self.indexed_items[self.cursor_pos][1][self.selected_column] if self.indexed_items else "",
                 data=data,
             )
-        
+
         self.stdscr.refresh()
         ## Display infobox
         if self.display_infobox:
@@ -1272,8 +1268,10 @@ class Picker:
         """ Display non-interactive infobox window. """
 
         self.logger.info(f"function: infobox()")
-        h, w = stdscr.getmaxyx()
-        notification_width, notification_height = w//2, 3*h//5
+        self.update_term_size()
+
+
+        notification_width, notification_height = self.term_w//2, 3*self.term_h//5
         message_width = notification_width-5
 
         if not message: message = "!!"
@@ -1289,9 +1287,9 @@ class Picker:
         if len(submenu_items) > notification_height - 2:
             submenu_items = submenu_items[:notification_height-3] + [f"{'....':^{notification_width}}"]
         while True:
-            h, w = stdscr.getmaxyx()
 
-            submenu_win = curses.newwin(notification_height, notification_width, 3, w - (notification_width+4))
+            self.update_term_size()
+            submenu_win = curses.newwin(notification_height, notification_width, 3, self.term_w - (notification_width+4))
             infobox_data = {
                 "items": submenu_items,
                 "colours": notification_colours,
@@ -1501,7 +1499,7 @@ class Picker:
         self.selections = {i:False for i in range(len(self.indexed_items))}
         self.cursor_pos = min(self.cursor_pos, len(self.indexed_items)-1)
         self.initialise_variables()
-        self.draw_screen(self.indexed_items, self.highlights)
+        self.draw_screen()
 
 
     def choose_option(
@@ -1558,19 +1556,19 @@ class Picker:
             "crosshair_cursor": False,
         }
         while True:
-            h, w = stdscr.getmaxyx()
+            self.update_term_size()
 
             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))
+            window_width = min(max(sum(choose_opts_widths) + 6, 50) + 6, self.term_w)
+            window_height = min(self.term_h//2, max(6, len(options)+3))
 
-            submenu_win = curses.newwin(window_height, window_width, (h-window_height)//2, (w-window_width)//2)
+            submenu_win = curses.newwin(window_height, window_width, (self.term_h-window_height)//2, (self.term_w-window_width)//2)
             submenu_win.keypad(True)
             OptionPicker = Picker(submenu_win, **option_picker_data)
             s, o, f = OptionPicker.run()
 
             if o == "refresh": 
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.draw_screen()
                 continue
             if s:
                 return {x: options[x] for x in s}, o, f
@@ -1595,9 +1593,9 @@ class Picker:
             27: ord('q')
         }
         while True:
-            h, w = stdscr.getmaxyx()
+            self.update_term_size()
 
-            submenu_win = curses.newwin(notification_height, notification_width, 3, w - (notification_width+4))
+            submenu_win = curses.newwin(notification_height, notification_width, 3, self.term_w - (notification_width+4))
             notification_data = {
                 "items": submenu_items,
                 "title": title,
@@ -1628,7 +1626,7 @@ class Picker:
             del submenu_win
             stdscr.clear()
             stdscr.refresh()
-            self.draw_screen(self.indexed_items, self.highlights)
+            self.draw_screen()
         # set_colours(colours=get_colours(0))
 
     def toggle_column_visibility(self, col_index:int) -> None:
@@ -1735,7 +1733,7 @@ class Picker:
                 elif setting == "file_prev":
                     self.command_stack.append(Command("setting", self.user_settings))
                     self.switch_file(increment=-1)
-                    # self.draw_screen(self.indexed_items, self.highlights)
+                    # self.draw_screen()
                     # self.stdscr.refresh()
 
                 elif setting == "sheet_next":
@@ -1799,7 +1797,7 @@ class Picker:
                             theme_number = int(setting[2:].strip())
                             self.colour_theme_number = min(get_theme_count()-1, theme_number)
                             set_colours(self.colour_theme_number)
-                            self.draw_screen(self.indexed_items, self.highlights)
+                            self.draw_screen()
                             self.notification(self.stdscr, message=f"Theme {self.colour_theme_number} applied.")
                         except:
                             pass
@@ -1808,7 +1806,7 @@ class Picker:
                         self.colour_theme_number = (self.colour_theme_number + 1)%get_theme_count()
                         # self.colour_theme_number = int(not bool(self.colour_theme_number))
                         set_colours(self.colour_theme_number)
-                        self.draw_screen(self.indexed_items, self.highlights)
+                        self.draw_screen()
                         self.notification(self.stdscr, message=f"Theme {self.colour_theme_number} applied.")
 
                 else:
@@ -1834,7 +1832,7 @@ class Picker:
         """ Toggle selection of item at index. """
         self.logger.info(f"function: toggle_item()")
         self.selections[index] = not self.selections[index]
-        self.draw_screen(self.indexed_items, self.highlights)
+        self.draw_screen()
 
     def select_all(self) -> None:
         """ Select all in indexed_items. """
@@ -1845,7 +1843,7 @@ class Picker:
             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)
+        self.draw_screen()
 
     def deselect_all(self) -> None:
         """ Deselect all items in indexed_items. """
@@ -1855,7 +1853,7 @@ class Picker:
         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)
+        self.draw_screen()
 
     def handle_visual_selection(self, selecting:bool = True) -> None:
         """ Toggle visual selection or deselection. """
@@ -1899,7 +1897,7 @@ class Picker:
             self.end_selection = -1
             self.is_selecting = False
 
-            self.draw_screen(self.indexed_items, self.highlights)
+            self.draw_screen()
 
         elif self.is_deselecting:
             self.end_selection = self.indexed_items[self.cursor_pos][0]
@@ -1932,7 +1930,7 @@ class Picker:
             self.start_selection = -1
             self.end_selection = -1
             self.is_deselecting = False
-            self.draw_screen(self.indexed_items, self.highlights)
+            self.draw_screen()
 
     def cursor_down(self, count=1) -> bool:
         """ Move cursor down. """
@@ -2050,12 +2048,12 @@ class Picker:
                     if not acceptable_data_type:
                         break
                 if not acceptable_data_type:
-                    self.draw_screen(self.indexed_items, self.highlights)
+                    self.draw_screen()
                     self.notification(self.stdscr, message="Error pasting data.")
                     return None
 
         except:
-            self.draw_screen(self.indexed_items, self.highlights)
+            self.draw_screen()
             self.notification(self.stdscr, message="Error pasting data.")
             return None
         if type(pasta) == type([]) and len(pasta) > 0 and type(pasta[0]) == type([]):
@@ -2102,7 +2100,7 @@ class Picker:
             for idx in s.keys():
                 save_path_entered, save_path = output_file_option_selector(
                     self.stdscr,
-                    refresh_screen_function=lambda: self.draw_screen(self.indexed_items, self.highlights)
+                    refresh_screen_function=lambda: self.draw_screen()
                 )
                 if save_path_entered:
                     return_val = funcs[idx](save_path)
@@ -2136,7 +2134,7 @@ class Picker:
                 self.loaded_file_states[self.loaded_file_index] = self.get_function_data()
 
                 self.stdscr.clear()
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.draw_screen()
 
                 tmp = self.stdscr
 
@@ -2156,7 +2154,7 @@ class Picker:
                 # header = return_val["header"]
                 self.stdscr.clear()
                 # self.initialise_variables()
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.draw_screen()
                 # self.stdscr.refresh()
 
                 # if return_val:
@@ -2400,7 +2398,7 @@ class Picker:
 
         self.initialise_variables(get_data=self.get_data_startup)
 
-        self.draw_screen(self.indexed_items, self.highlights)
+        self.draw_screen()
 
         self.initial_time = time.time()
         self.initial_time_footer = time.time()-self.footer_timer
@@ -2428,7 +2426,7 @@ class Picker:
 
         # Set terminal background color
         self.stdscr.bkgd(' ', curses.color_pair(self.colours_start+3))  # Apply background color
-        self.draw_screen(self.indexed_items, self.highlights)
+        self.draw_screen()
 
         if self.display_only:
             self.stdscr.refresh()
@@ -2436,15 +2434,15 @@ class Picker:
             return [], "", function_data
 
         # Open tty to accept input
-        tty_fd = open_tty()
+        tty_fd, self.saved_terminal_state = open_tty()
 
-        h, w = self.stdscr.getmaxyx()
-        self.term_h, self.term_w = self.stdscr.getmaxyx()
+        self.update_term_size()
         if self.split_right and len(self.right_panes):
             proportion = self.right_panes[self.right_pane_index]["proportion"]
             self.rows_w, self.rows_h = int(self.term_w*proportion), self.term_h
         else:
             self.rows_w, self.rows_h = self.term_w, self.term_h
+
         def terminal_resized(old_w, old_h) -> bool:
             w, h = os.get_terminal_size()
             if old_h != h or old_w != w: return True
@@ -2462,6 +2460,7 @@ class Picker:
             key = get_char(tty_fd, timeout=0.2)
             if key != -1:
                 self.logger.info(f"key={key}")
+                self.last_key = key
 
             # Ensure that
 
@@ -2478,8 +2477,7 @@ class Picker:
             if self.term_resize_event: 
                 key = curses.KEY_RESIZE
 
-            h, w = self.stdscr.getmaxyx()
-            self.term_h, self.term_w = self.stdscr.getmaxyx()
+            self.update_term_size()
 
             if self.split_right and len(self.right_panes):
                 proportion = self.right_panes[self.right_pane_index]["proportion"]
@@ -2500,7 +2498,7 @@ class Picker:
 
                         self.initial_time = time.time()
 
-                        self.draw_screen(self.indexed_items, self.highlights, clear=False)
+                        self.draw_screen(clear=False)
 
                         self.refreshing_data = False
                         self.data_ready = False
@@ -2536,7 +2534,7 @@ class Picker:
                 self.logger.debug(f"footer_string_auto_refresh")
                 self.footer_string = self.footer_string_refresh_function()
                 self.initial_time_footer = time.time()
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.draw_screen()
 
             if self.split_right and len(self.right_panes) and self.right_panes[self.right_pane_index]["auto_refresh"] and ((time.time() - self.initial_split_time) > self.right_panes[self.right_pane_index]["refresh_time"]):
                 get_data = self.right_panes[self.right_pane_index]["get_data"]
@@ -2572,7 +2570,7 @@ class Picker:
                 }
                 OptionPicker = Picker(self.stdscr, **help_data)
                 s, o, f = OptionPicker.run()
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.draw_screen()
 
             if self.check_key("info", key, self.keys_dict):
                 self.logger.info(f"key_function help")
@@ -2686,13 +2684,13 @@ class Picker:
                 OptionPicker = Picker(self.stdscr, **info_data)
                 s, o, f = OptionPicker.run()
                 
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.draw_screen()
 
             elif self.check_key("exit", key, self.keys_dict):
                 self.stdscr.clear()
                 if len(self.loaded_files) <= 1:
                     function_data = self.get_function_data()
-                    function_data["last_key"] = key
+                    restore_terminal_settings(tty_fd, self.saved_terminal_state)
                     return [], "", function_data
                 else:
                     del self.loaded_files[self.loaded_file_index]
@@ -2709,28 +2707,29 @@ class Picker:
                         self.set_function_data({}, reset_absent_variables=True)
                         self.load_file(self.loaded_file)
                     self.loaded_file_index, self.loaded_file = idx, file
-                    self.draw_screen(self.indexed_items, self.highlights)
+                    self.draw_screen()
 
             elif self.check_key("full_exit", key, self.keys_dict):
                 close_curses(self.stdscr)
+                restore_terminal_settings(tty_fd, self.saved_terminal_state)
                 exit()
 
             elif self.check_key("settings_input", key, self.keys_dict):
                 self.logger.info(f"Settings input")
                 usrtxt = f"{self.user_settings.strip()} " if self.user_settings else ""
-                field_end_f = lambda: self.stdscr.getmaxyx()[1]-38 if self.show_footer else lambda: self.stdscr.getmaxyx()[1]-3
-                if self.show_footer and self.footer.height >= 2: field_end_f = lambda: self.stdscr.getmaxyx()[1]-38
-                else: field_end_f = lambda: self.stdscr.getmaxyx()[1]-3
+                field_end_f = lambda: self.get_term_size()[1]-38 if self.show_footer else lambda: self.get_term_size()[1]-3
+                if self.show_footer and self.footer.height >= 2: field_end_f = lambda: self.get_term_size()[1]-38
+                else: field_end_f = lambda: self.get_term_size()[1]-3
                 self.set_registers()
                 usrtxt, return_val = input_field(
                     self.stdscr,
                     usrtxt=usrtxt,
                     field_prefix=" Settings: ",
                     x=lambda:2,
-                    y=lambda: self.stdscr.getmaxyx()[0]-1,
+                    y=lambda: self.get_term_size()[0]-1,
                     max_length=field_end_f,
                     registers=self.registers,
-                    refresh_screen_function=lambda: self.draw_screen(self.indexed_items, self.highlights),
+                    refresh_screen_function=lambda: self.draw_screen(),
                     history=self.history_settings,
                     path_auto_complete=True,
                     formula_auto_complete=False,
@@ -2786,6 +2785,7 @@ class Picker:
 
             elif self.check_key("redo", key, self.keys_dict):
                 self.redo()
+
             # elif self.check_key("move_column_left", key, self.keys_dict):
             #     tmp1 = self.column_indices[self.selected_column]
             #     tmp2 = self.column_indices[(self.selected_column-1)%len(self.column_indices)]
@@ -2795,7 +2795,7 @@ class Picker:
             #     # 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, max_total_width=w)
-            #     self.draw_screen(self.indexed_items, self.highlights)
+            #     self.draw_screen()
             #     # self.move_column(direction=-1)
             #
             # elif self.check_key("move_column_right", key, self.keys_dict):
@@ -2805,7 +2805,7 @@ class Picker:
             #     self.column_indices[(self.selected_column+1)%(len(self.column_indices))] = tmp1
             #     self.selected_column = (self.selected_column+1)%len(self.column_indices)
             #     self.initialise_variables()
-            #     self.draw_screen(self.indexed_items, self.highlights)
+            #     self.draw_screen()
             #     # self.move_column(direction=1)
 
             elif self.check_key("cursor_down", key, self.keys_dict):
@@ -2873,7 +2873,7 @@ class Picker:
                 if new_pos < len(self.indexed_items):
                     self.cursor_pos = new_pos
 
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.draw_screen()
 
             elif self.check_key("cursor_bottom", key, self.keys_dict):
                 new_pos = len(self.indexed_items)-1
@@ -2882,19 +2882,19 @@ 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)
+                self.draw_screen()
                 # 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)
+                # self.draw_screen()
             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
                 if self.is_selecting or self.is_deselecting: self.handle_visual_selection()
                 if len(self.items) == 0:
                     function_data = self.get_function_data()
-                    function_data["last_key"] = key
+                    restore_terminal_settings(tty_fd, self.saved_terminal_state)
                     return [], "", function_data
                 selected_indices = get_selected_indices(self.selections)
                 if not selected_indices and len(self.indexed_items):
@@ -2907,7 +2907,7 @@ class Picker:
                         if self.option_functions[index] != None:
                             options_sufficient, usrtxt = self.option_functions[index](
                                 stdscr=self.stdscr,
-                                refresh_screen_function=lambda: self.draw_screen(self.indexed_items, self.highlights),
+                                refresh_screen_function=lambda: self.draw_screen(),
                             )
                         else:
                             self.set_registers()
@@ -2923,7 +2923,7 @@ class Picker:
                     self.stdscr.clear()
                     self.stdscr.refresh()
                     function_data = self.get_function_data()
-                    function_data["last_key"] = key
+                    restore_terminal_settings(tty_fd, self.saved_terminal_state)
                     return selected_indices, usrtxt, function_data
             elif self.check_key("page_down", key, self.keys_dict):  # Next page
                 self.cursor_pos = min(len(self.indexed_items) - 1, self.cursor_pos+self.items_per_page)
@@ -2940,7 +2940,7 @@ class Picker:
                 self.stdscr.clear()
                 self.stdscr.refresh()
 
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.draw_screen()
 
             elif self.check_key("cycle_sort_method", key, self.keys_dict):
                 if self.sort_column == self.selected_column:
@@ -2968,7 +2968,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.draw_screen()
                     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):
@@ -3146,47 +3146,49 @@ class Picker:
 
             # elif self.check_key("increase_lines_per_page", key, self.keys_dict):
             #     self.items_per_page += 1
-            #     self.draw_screen(self.indexed_items, self.highlights)
+            #     self.draw_screen()
             # elif self.check_key("decrease_lines_per_page", key, self.keys_dict):
             #     if self.items_per_page > 1:
             #         self.items_per_page -= 1
-            #     self.draw_screen(self.indexed_items, self.highlights)
+            #     self.draw_screen()
             elif self.check_key("decrease_column_width", key, self.keys_dict):
                 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, max_total_width=2)
-                    self.draw_screen(self.indexed_items, self.highlights)
+                    self.draw_screen()
             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, max_total_width=w)
-                    self.draw_screen(self.indexed_items, self.highlights)
+                    self.draw_screen()
             elif self.check_key("visual_selection_toggle", key, self.keys_dict):
                 self.logger.info(f"key_function visual_selection_toggle")
                 self.handle_visual_selection()
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.draw_screen()
 
             elif self.check_key("visual_deselection_toggle", key, self.keys_dict):
                 self.logger.info(f"key_function visual_deselection_toggle")
                 self.handle_visual_selection(selecting=False)
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.draw_screen()
 
             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=self.rows_w, unicode_char_width=self.unicode_char_width)
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.stdscr.clear()
+                self.stdscr.refresh()
+                self.draw_screen()
 
 
             elif self.check_key("filter_input", key, self.keys_dict):
                 self.logger.info(f"key_function filter_input")
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.draw_screen()
                 usrtxt = f"{self.filter_query} " if self.filter_query else ""
-                field_end_f = lambda: self.stdscr.getmaxyx()[1]-38 if self.show_footer else lambda: self.stdscr.getmaxyx()[1]-3
-                if self.show_footer and self.footer.height >= 2: field_end_f = lambda: self.stdscr.getmaxyx()[1]-38
-                else: field_end_f = lambda: self.stdscr.getmaxyx()[1]-3
+                field_end_f = lambda: self.get_term_size()[1]-38 if self.show_footer else lambda: self.get_term_size()[1]-3
+                if self.show_footer and self.footer.height >= 2: field_end_f = lambda: self.get_term_size()[1]-38
+                else: field_end_f = lambda: self.get_term_size()[1]-3
                 self.set_registers()
                 words = self.get_word_list()
                 usrtxt, return_val = input_field(
@@ -3194,11 +3196,11 @@ class Picker:
                     usrtxt=usrtxt,
                     field_prefix=" Filter: ",
                     x=lambda:2,
-                    y=lambda: self.stdscr.getmaxyx()[0]-2,
+                    y=lambda: self.get_term_size()[0]-2,
                     # max_length=field_end,
                     max_length=field_end_f,
                     registers=self.registers,
-                    refresh_screen_function=lambda: self.draw_screen(self.indexed_items, self.highlights),
+                    refresh_screen_function=lambda: self.draw_screen(),
                     history=self.history_filter_and_search,
                     path_auto_complete=True,
                     formula_auto_complete=False,
@@ -3227,11 +3229,11 @@ class Picker:
 
             elif self.check_key("search_input", key, self.keys_dict):
                 self.logger.info(f"key_function search_input")
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.draw_screen()
                 usrtxt = f"{self.search_query} " if self.search_query else ""
-                field_end_f = lambda: self.stdscr.getmaxyx()[1]-38 if self.show_footer else lambda: self.stdscr.getmaxyx()[1]-3
-                if self.show_footer and self.footer.height >= 3: field_end_f = lambda: self.stdscr.getmaxyx()[1]-38
-                else: field_end_f = lambda: self.stdscr.getmaxyx()[1]-3
+                field_end_f = lambda: self.get_term_size()[1]-38 if self.show_footer else lambda: self.get_term_size()[1]-3
+                if self.show_footer and self.footer.height >= 3: field_end_f = lambda: self.get_term_size()[1]-38
+                else: field_end_f = lambda: self.get_term_size()[1]-3
                 self.set_registers()
                 words = self.get_word_list()
                 usrtxt, return_val = input_field(
@@ -3239,10 +3241,10 @@ class Picker:
                     usrtxt=usrtxt,
                     field_prefix=" Search: ",
                     x=lambda:2,
-                    y=lambda: self.stdscr.getmaxyx()[0]-3,
+                    y=lambda: self.get_term_size()[0]-3,
                     max_length=field_end_f,
                     registers=self.registers,
-                    refresh_screen_function=lambda: self.draw_screen(self.indexed_items, self.highlights),
+                    refresh_screen_function=lambda: self.draw_screen(),
                     history=self.history_filter_and_search,
                     path_auto_complete=True,
                     formula_auto_complete=False,
@@ -3327,7 +3329,6 @@ class Picker:
                         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
                 elif self.cancel_is_back:
                     function_data = self.get_function_data()
-                    function_data["last_key"] = key
                     return [], "escape", function_data
 
 
@@ -3336,14 +3337,14 @@ class Picker:
                 #     self.mode_index = 0
                 #     self.highlights = [highlight for highlight in self.highlights if "type" not in highlight or highlight["type"] != "search" ]
                 #     continue
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.draw_screen()
 
             elif self.check_key("opts_input", key, self.keys_dict):
                 self.logger.info(f"key_function opts_input")
                 usrtxt = f"{self.user_opts} " if self.user_opts else ""
-                field_end_f = lambda: self.stdscr.getmaxyx()[1]-38 if self.show_footer else lambda: self.stdscr.getmaxyx()[1]-3
-                if self.show_footer and self.footer.height >= 1: field_end_f = lambda: self.stdscr.getmaxyx()[1]-38
-                else: field_end_f = lambda: self.stdscr.getmaxyx()[1]-3
+                field_end_f = lambda: self.get_term_size()[1]-38 if self.show_footer else lambda: self.get_term_size()[1]-3
+                if self.show_footer and self.footer.height >= 1: field_end_f = lambda: self.get_term_size()[1]-38
+                else: field_end_f = lambda: self.get_term_size()[1]-3
                 self.set_registers()
                 words = self.get_word_list()
                 usrtxt, return_val = input_field(
@@ -3351,10 +3352,10 @@ class Picker:
                     usrtxt=usrtxt,
                     field_prefix=" Opts: ",
                     x=lambda:2,
-                    y=lambda: self.stdscr.getmaxyx()[0]-1,
+                    y=lambda: self.get_term_size()[0]-1,
                     max_length=field_end_f,
                     registers=self.registers,
-                    refresh_screen_function=lambda: self.draw_screen(self.indexed_items, self.highlights),
+                    refresh_screen_function=lambda: self.draw_screen(),
                     history=self.history_opts,
                     path_auto_complete=True,
                     formula_auto_complete=False,
@@ -3436,9 +3437,9 @@ class Picker:
                 self.logger.info(f"key_function pipe_input")
                 # usrtxt = "xargs -d '\n' -I{}  "
                 usrtxt = "xargs "
-                field_end_f = lambda: self.stdscr.getmaxyx()[1]-38 if self.show_footer else lambda: self.stdscr.getmaxyx()[1]-3
-                if self.show_footer and self.footer.height >= 2: field_end_f = lambda: self.stdscr.getmaxyx()[1]-38
-                else: field_end_f = lambda: self.stdscr.getmaxyx()[1]-3
+                field_end_f = lambda: self.get_term_size()[1]-38 if self.show_footer else lambda: self.get_term_size()[1]-3
+                if self.show_footer and self.footer.height >= 2: field_end_f = lambda: self.get_term_size()[1]-38
+                else: field_end_f = lambda: self.get_term_size()[1]-3
                 self.set_registers()
                 
                 # Get list of available shell commands
@@ -3454,11 +3455,11 @@ class Picker:
                     usrtxt=usrtxt,
                     field_prefix=" Command: ",
                     x=lambda:2,
-                    y=lambda: self.stdscr.getmaxyx()[0]-2,
+                    y=lambda: self.get_term_size()[0]-2,
                     literal=True,
                     max_length=field_end_f,
                     registers=self.registers,
-                    refresh_screen_function=lambda: self.draw_screen(self.indexed_items, self.highlights),
+                    refresh_screen_function=lambda: self.draw_screen(),
                     history=self.history_pipes,
                     path_auto_complete=True,
                     formula_auto_complete=False,
@@ -3548,9 +3549,9 @@ class Picker:
                 if len(self.indexed_items) > 0 and self.selected_column >=0 and self.editable_columns[self.selected_column]:
                     current_val = self.indexed_items[self.cursor_pos][1][self.selected_column]
                     usrtxt = f"{current_val}"
-                    field_end_f = lambda: self.stdscr.getmaxyx()[1]-38 if self.show_footer else lambda: self.stdscr.getmaxyx()[1]-3
-                    if self.show_footer and self.footer.height >= 2: field_end_f = lambda: self.stdscr.getmaxyx()[1]-38
-                    else: field_end_f = lambda: self.stdscr.getmaxyx()[1]-3
+                    field_end_f = lambda: self.get_term_size()[1]-38 if self.show_footer else lambda: self.get_term_size()[1]-3
+                    if self.show_footer and self.footer.height >= 2: field_end_f = lambda: self.get_term_size()[1]-38
+                    else: field_end_f = lambda: self.get_term_size()[1]-3
                     self.set_registers()
                     words = self.get_word_list()
                     usrtxt, return_val = input_field(
@@ -3558,10 +3559,10 @@ class Picker:
                         usrtxt=usrtxt,
                         field_prefix=" Edit value: ",
                         x=lambda:2,
-                        y=lambda: self.stdscr.getmaxyx()[0]-2,
+                        y=lambda: self.get_term_size()[0]-2,
                         max_length=field_end_f,
                         registers=self.registers,
-                        refresh_screen_function=lambda: self.draw_screen(self.indexed_items, self.highlights),
+                        refresh_screen_function=lambda: self.draw_screen(),
                         history = self.history_edits,
                         path_auto_complete=True,
                         formula_auto_complete=True,
@@ -3580,9 +3581,9 @@ class Picker:
                 if len(self.indexed_items) > 0 and self.selected_column >=0 and self.editable_columns[self.selected_column]:
                     current_val = self.indexed_items[self.cursor_pos][1][self.selected_column]
                     usrtxt = f"{current_val}"
-                    field_end_f = lambda: self.stdscr.getmaxyx()[1]-38 if self.show_footer else lambda: self.stdscr.getmaxyx()[1]-3
-                    if self.show_footer and self.footer.height >= 2: field_end_f = lambda: self.stdscr.getmaxyx()[1]-38
-                    else: field_end_f = lambda: self.stdscr.getmaxyx()[1]-3
+                    field_end_f = lambda: self.get_term_size()[1]-38 if self.show_footer else lambda: self.get_term_size()[1]-3
+                    if self.show_footer and self.footer.height >= 2: field_end_f = lambda: self.get_term_size()[1]-38
+                    else: field_end_f = lambda: self.get_term_size()[1]-3
                     self.set_registers()
                     words = self.get_word_list()
                     usrtxt, return_val = input_field(
@@ -3590,10 +3591,10 @@ class Picker:
                         usrtxt=usrtxt,
                         field_prefix=" Edit value: ",
                         x=lambda:2,
-                        y=lambda: self.stdscr.getmaxyx()[0]-2,
+                        y=lambda: self.get_term_size()[0]-2,
                         max_length=field_end_f,
                         registers=self.registers,
-                        refresh_screen_function=lambda: self.draw_screen(self.indexed_items, self.highlights),
+                        refresh_screen_function=lambda: self.draw_screen(),
                         history = self.history_edits,
                         path_auto_complete=True,
                         formula_auto_complete=True,
@@ -3642,11 +3643,11 @@ class Picker:
                 self.stdscr.clear()
                 self.stdscr.refresh()
                 self.initialise_variables()
-                self.draw_screen(self.indexed_items, self.highlights)
+                self.draw_screen()
 
 
 
-            self.draw_screen(self.indexed_items, self.highlights, clear=clear_screen)
+            self.draw_screen(clear=clear_screen)
 
 
 
@@ -3848,14 +3849,6 @@ def unrestrict_curses(stdscr: curses.window) -> None:
 def main() -> None:
     """ Main function when listpick is executed. Deals with command line arguments and starts a Picker. """
     args, function_data = parse_arguments()
-
-    try:
-        if function_data["items"] == []:
-            function_data["items"] = test_items
-            function_data["highlights"] = test_highlights
-            function_data["header"] = test_header
-    except:
-        pass
         
     # function_data["colour_theme_number"] = 3
     function_data["highlights"]  = [

listpick/pane/pane_utils.py

@@ -41,9 +41,9 @@ def get_graph_string(x_vals, y_vals, width=50, height=20, title=None, x_label=No
         fig.ylabel = y_label
     
     # Generate the ASCII art of the graph
-    ascii_art = str(fig.show())
+    graph_str = str(fig.show())
     
-    return ascii_art
+    return graph_str
 
 
 def get_file_attributes(filename):

listpick/ui/input_field.py

@@ -16,27 +16,9 @@ from datetime import datetime
 import logging
 
 logger = logging.getLogger('picker_log')
-import select
-import tty
 from listpick.utils.user_input import get_char, open_tty
 from listpick.utils import keycodes
 
-# def open_tty():
-#     """ Return a file descriptor for the tty that we are opening"""
-#     tty_fd = os.open('/dev/tty', os.O_RDONLY)
-#     tty.setraw(tty_fd)
-#     return tty_fd
-#
-# def get_char(tty_fd, timeout: float = 0.2) -> int:
-#     """ Get character from a tty_fd with a timeout. """
-#     rlist, _, _ = select.select([tty_fd], [], [], timeout)
-#     if rlist:
-#         # key = ord(tty_fd.read(1))
-#         key = ord(os.read(tty_fd, 1))
-#     else:
-#         key = -1
-#     return key
-    
 def input_field(
     stdscr: curses.window,
     usrtxt:str="",
@@ -126,7 +108,7 @@ def input_field(
     offscreen_x, offscreen_y = False, False
     orig_x, orig_y = x, y
 
-    tty_fd = open_tty()
+    tty_fd, saved_terminal_state = open_tty()
 
     # Input field loop
     while True:

listpick/utils/generate_data_multithreaded.py

@@ -191,6 +191,7 @@ def generate_picker_data(
 
     num_workers = os.cpu_count()
     if num_workers in [None, -1]: num_workers = 4
+    if num_workers == None or num_workers < 1: num_workers = 1
     completed_cells = set()
 
     for _ in range(num_workers):

listpick/utils/user_input.py

@@ -1,11 +1,17 @@
 from listpick.utils import keycodes
 import os, tty, select, curses
+import termios
 
 def open_tty():
     """ Return a file descriptor for the tty that we are opening"""
     tty_fd = os.open('/dev/tty', os.O_RDONLY)
+    old_terminal_settings = termios.tcgetattr(tty_fd)
     tty.setraw(tty_fd)
-    return tty_fd
+    return tty_fd, old_terminal_settings
+
+def restore_terminal_settings(tty_fd, old_settings):
+    """ Restore the terminal to its previous state """
+    termios.tcsetattr(tty_fd, termios.TCSADRAIN, old_settings)
 
 def get_char(tty_fd, timeout: float = 0.2, secondary: bool = False) -> int:
     """ Get character from a tty_fd with a timeout. """

{listpick-0.1.16.4.dist-info → listpick-0.1.16.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.16.4
+Version: 0.1.16.6
 Summary: Listpick is a powerful TUI data tool for creating TUI apps or viewing/comparing tabulated data.
 Home-page: https://github.com/grimandgreedy/listpick
 Author: Grim

{listpick-0.1.16.4.dist-info → listpick-0.1.16.6.dist-info}/RECORD

@@ -1,15 +1,16 @@
 listpick/__init__.py,sha256=ExXc97-bibodH--wlwpQivl0zCNR5D1hvpvrf7OBofU,154
 listpick/__main__.py,sha256=wkCjDdqw093W27yWwnlC3nG_sMRKaIad7hHHWy0RBgY,193
-listpick/listpick_app.py,sha256=MDErM54fA_qvgMbo-IGovnUoDliBbaMSEGbHno-zhHA,203676
+listpick/listpick_app.py,sha256=SenpQGK9E7bp21SLM2dMuWiTrhBoCGkeg8SRHPNGH-A,201481
 listpick/pane/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/pane/get_data.py,sha256=l12mHIb6qoZWIfW5zZZY8K8EqNcyIcRiHgtRaM2CVGs,2735
 listpick/pane/pane_functions.py,sha256=_dL9jHpd3sT0enL9H_bMcUsBlMELXdtP9dtKFSC2KPQ,5117
-listpick/pane/pane_utils.py,sha256=OEL4yBnBlIiHnT5bYtb3nQMn3WUR0vVH0gAGCtL1t0o,2539
+listpick/pane/pane_utils.py,sha256=cnuzBH52wdWoKrHR6iMBF4N-uhwpXYpHDnrglk21pqg,2539
 listpick/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/ui/build_help.py,sha256=IpN4tX4U8ET3icRoTlF389VqVjVcPAon617vgstlPAc,10750
+listpick/ui/draw_screen.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/ui/footer.py,sha256=NcdH1uO_ma91m0qCczyQZ3zGrexfkiEnwDf5E4tHSMk,15089
 listpick/ui/help_screen.py,sha256=zbfGIgb-IXtATpl4_Sx7nPbsnRXZ7eiMYlCKGS9EFmw,5608
-listpick/ui/input_field.py,sha256=ylf3fiLXdAD4pueHWfzIrlwaRb9f5zm8f1UGkEPBxgM,30539
+listpick/ui/input_field.py,sha256=scJjvmSS0QqeDbCky7_0Zgt35Aki7gezRJkrQROlLg4,30034
 listpick/ui/keys.py,sha256=1NCsOPFxhNuVPbO5vflcArNZ1jbBBerPQ3oZUAZDyPs,13682
 listpick/ui/picker_colours.py,sha256=FFsyny_q0mGO6u7B1n7anuReBtP7Jw6LrgX5ycN-MRM,13413
 listpick/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -18,7 +19,7 @@ listpick/utils/config.py,sha256=MEnAZg2Rhfl38XofEIN0uoVAOY7I0ftc79Evk3fOiVw,1654
 listpick/utils/dump.py,sha256=60YVIMNtBoYvWhmzfTJOsNGcetOvcCB3_T7yv-bYTPQ,3838
 listpick/utils/filtering.py,sha256=59_YIEYRV0ovnjF4iyuShq276FMAx5gBD9m3mE9IqJg,1237
 listpick/utils/generate_data.py,sha256=TCGwDrN49Xx33AdURpQRGi6Xi2uwjt96rEeWWYS8mFE,4649
-listpick/utils/generate_data_multithreaded.py,sha256=eWtv-gDdlTWwURKdg2cThrRI0I02JQNmQIr6q9GqtDc,6527
+listpick/utils/generate_data_multithreaded.py,sha256=9TF-Z1qF3GDNFbe5K9Gf6EUj0UpruZTdKWHxz6jgGHY,6590
 listpick/utils/graphing.py,sha256=ugjAH8js_iH7hulg4SySxb_W_f8B6GhTaceN5i7DID4,6954
 listpick/utils/keycodes.py,sha256=ZGkw1-4szxPnP81wj80r92L6_neIOlBBjQltEieCwnk,2696
 listpick/utils/options_selectors.py,sha256=fQqTCAqRsrMhZwXUtsPBm47svkaUaeJqWsMW7Q4JTYY,3083
@@ -28,11 +29,11 @@ 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=XBj7eGBDF15BRME-swnoXyOfZWxXCxrXp0pzsBfcJ5g,12224
-listpick/utils/user_input.py,sha256=oyJZPAwA7UGAclPhdPL44tKnPIVNHWhX-tZEnCdBKC0,4318
+listpick/utils/user_input.py,sha256=L3ylI7nnuFM_TP1XKwpiKpxUSkNb2W5cr7mJjTmv_6E,4582
 listpick/utils/utils.py,sha256=nsR6orCBQy3rTXrCweq8cV-RzRVU15v3J9NclPeAOJk,13741
-listpick-0.1.16.4.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
-listpick-0.1.16.4.dist-info/METADATA,sha256=VwWPk2nx7z_mnZJz8ips6nLYm0_YZcIxP6Y8KLegyIA,8128
-listpick-0.1.16.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-listpick-0.1.16.4.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
-listpick-0.1.16.4.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
-listpick-0.1.16.4.dist-info/RECORD,,
+listpick-0.1.16.6.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
+listpick-0.1.16.6.dist-info/METADATA,sha256=q67Zxlt_QP9xQwlQfG07KEBULpHt2r6E_U3xeTAjp5c,8128
+listpick-0.1.16.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+listpick-0.1.16.6.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
+listpick-0.1.16.6.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
+listpick-0.1.16.6.dist-info/RECORD,,