listpick 0.1.13.24__tar.gz → 0.1.13.26__tar.gz

{listpick-0.1.13.24 → listpick-0.1.13.26}/CHANGELOG.md

@@ -26,6 +26,7 @@
  - 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.
  - Fixed 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.
 
 ## [0.1.13] 2025-07-28
  - Cell-based picker is now supported.

{listpick-0.1.13.24/src/listpick.egg-info → listpick-0.1.13.26}/PKG-INFO

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

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

@@ -324,6 +324,7 @@ class Picker:
         # self.footer = CompactFooter(self.stdscr, colours_start, self.get_function_data)
 
 
+
     def calculate_section_sizes(self):
         """
         Calculte the following for the Picker:
@@ -598,6 +599,8 @@ class Picker:
             else:
                 self.cursor_pos = 0
         
+        if self.display_infobox:
+            self.infobox_picker = self.infobox(self.stdscr, self.infobox_items, self.infobox_title)
 
 
     def move_column(self, direction: int) -> None:
@@ -891,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)
@@ -987,15 +990,24 @@ class Picker:
         
         ## Display infobox
         if self.display_infobox:
-            self.infobox(self.stdscr, message=self.infobox_items, title=self.infobox_title)
+            # self.stdscr.refresh()
+            # self.infobox(self.stdscr, message=self.infobox_items, title=self.infobox_title)
+            
+            infobox_width, infobox_height = w//2, 3*h//5
+            infobox_x, infobox_y = w - (infobox_width + 4), 3
+            self.infobox_picker.stdscr.mvwin(infobox_y, infobox_x)
+            self.infobox_picker.stdscr.resize(infobox_height, infobox_width)
+            self.infobox_picker.run()
+            self.infobox_picker.stdscr.noutrefresh()
+        else:
+            self.stdscr.noutrefresh()
 
-        # if not self.display_only:
-        #     self.stdscr.refresh()
-            # self.stdscr.timeout(2000)  # timeout is set to 50 in order to get the infobox to be displayed so here we reset it to 2000
 
+        if not self.display_only:
+            curses.doupdate()
 
 
-    def infobox(self, stdscr: curses.window, message: str ="", title: str ="Infobox",  colours_end: int = 0, duration: int = 4) -> curses.window:
+    def infobox(self, stdscr: curses.window, message: list =[], title: str ="Infobox",  colours_end: int = 0, duration: int = 4):
         """ Display non-interactive infobox window. """
 
         self.logger.info(f"function: infobox()")
@@ -1003,6 +1015,7 @@ class Picker:
         notification_width, notification_height = w//2, 3*h//5
         message_width = notification_width-5
 
+        notification_x, notification_y = w-(notification_width+4), 3
         if not message: message = "!!"
         if isinstance(message, str):
             submenu_items = ["  "+message[i*message_width:(i+1)*message_width] for i in range(len(message)//message_width+1)]
@@ -1018,10 +1031,7 @@ class Picker:
         # while True:
         h, w = stdscr.getmaxyx()
 
-        # submenu_win = curses.newwin(notification_height, notification_width, 3, w - (notification_width+4))
-        submenu_win = self.stdscr.subpad(notification_height, notification_width, 3, w - (notification_width+4))
-        submenu_win.erase()
-        # submenu_win.untouchwin()
+        submenu_win = self.stdscr.derwin(notification_height, notification_width, 3, w - (notification_width+4))
         infobox_data = {
             "items": submenu_items,
             "colours": notification_colours,
@@ -1035,12 +1045,9 @@ class Picker:
             "title": title,
             "reset_colours": False,
         }
-
-        # for i in range(3, 3+notification_height):
-        #     self.stdscr.addstr(i, w - (notification_width+4), ' '*notification_width, curses.color_pair(4))
+        submenu_win.noutrefresh()
         OptionPicker = Picker(submenu_win, **infobox_data)
-        s, o, f = OptionPicker.run()
-        submenu_win.refresh()
+        return OptionPicker
 
 
     def get_function_data(self) -> dict:
@@ -1488,6 +1495,10 @@ 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)
 
@@ -1498,6 +1509,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:
@@ -1526,9 +1538,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
@@ -1550,10 +1571,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
@@ -1912,7 +1942,7 @@ class Picker:
         # curses.curs_set(0)
         # stdscr.nodelay(1)  # Non-blocking input
         # stdscr.timeout(2000)  # Set a timeout for getch() to ensure it does not block indefinitely
-        self.stdscr.timeout(max(min(2000, int(self.timer*1000)//2, int(self.footer_timer*1000))//2, 20))  # Set a timeout for getch() to ensure it does not block indefinitely
+        # self.stdscr.timeout(max(min(2000, int(self.timer*1000)//2, int(self.footer_timer*1000))//2, 20))  # Set a timeout for getch() to ensure it does not block indefinitely
         
         if self.clear_on_start:
             self.stdscr.clear()
@@ -1929,8 +1959,6 @@ class Picker:
         self.draw_screen(self.indexed_items, self.highlights)
 
         if self.display_only:
-            # self.stdscr.refresh()
-            # function_data = self.get_function_data()
             return [], "", {}
 
         # Main loop
@@ -1958,8 +1986,8 @@ 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).")
-                self.stdscr.addstr(0,w-3,"  ", curses.color_pair(self.colours_start+21) | curses.A_BOLD)
-                self.stdscr.refresh()
+                # 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:
                     self.refreshing_data = True
 
@@ -2136,11 +2164,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]
+                        # 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()

{listpick-0.1.13.24 → listpick-0.1.13.26/src/listpick.egg-info}/PKG-INFO

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