listpick 0.1.13.26__tar.gz → 0.1.13.28__tar.gz

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

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

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

@@ -318,6 +318,7 @@ class Picker:
 
 
         # Note: We have to set the footer after initialising the picker state so that the footer can use the get_function_data method
+        self.get_function_data()
         self.footer_options = [StandardFooter(self.stdscr, colours_start, self.get_function_data), CompactFooter(self.stdscr, colours_start, self.get_function_data), NoFooter(self.stdscr, colours_start, self.get_function_data)]
         self.footer = self.footer_options[self.footer_style]
 
@@ -661,6 +662,12 @@ class Picker:
         self.stdscr.refresh()
 
     def draw_screen(self, indexed_items: list[Tuple[int, list[str]]], highlights: list[dict] = [{}], clear: bool = True) -> None:
+        try:
+            self.draw_screen(self.indexed_items, self.highlights)
+        except:
+            self.logger.warning(f"draw_screen function error")
+            pass
+    def draw_screen2(self, indexed_items: list[Tuple[int, list[str]]], highlights: list[dict] = [{}], clear: bool = True) -> None:
         """ Draw Picker screen. """
         self.logger.debug("Draw screen.")
 
@@ -1188,7 +1195,6 @@ 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)
 
 
     def choose_option(
@@ -1486,7 +1492,6 @@ 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)
 
     def select_all(self) -> None:
         """ Select all in indexed_items. """
@@ -1498,10 +1503,6 @@ class Picker:
         for row in range(len(self.indexed_items)):
             self.selected_cells_by_row[row] = list(range(len(self.indexed_items[row][1])))
 
-
-
-        self.draw_screen(self.indexed_items, self.highlights)
-
     def deselect_all(self) -> None:
         """ Deselect all items in indexed_items. """
         self.logger.info(f"function: deselect_all()")
@@ -1510,7 +1511,6 @@ 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)
 
     def handle_visual_selection(self, selecting:bool = True) -> None:
         """ Toggle visual selection or deselection. """
@@ -1554,8 +1554,6 @@ class Picker:
             self.end_selection = -1
             self.is_selecting = False
 
-            self.draw_screen(self.indexed_items, self.highlights)
-
         elif self.is_deselecting:
             self.end_selection = self.indexed_items[self.cursor_pos][0]
             self.end_selection = self.cursor_pos
@@ -1587,7 +1585,6 @@ class Picker:
             self.start_selection = -1
             self.end_selection = -1
             self.is_deselecting = False
-            self.draw_screen(self.indexed_items, self.highlights)
 
     def cursor_down(self, count=1) -> bool:
         """ Move cursor down. """
@@ -1979,7 +1976,10 @@ class Picker:
 
                         initial_time = time.time()
 
-                        self.draw_screen(self.indexed_items, self.highlights, clear=False)
+                        try:
+                            self.draw_screen(self.indexed_items, self.highlights, clear=False)
+                        except:
+                            pass
 
                         self.refreshing_data = False
                         self.data_ready = False
@@ -2015,7 +2015,6 @@ class Picker:
                 self.logger.debug(f"footer_string_auto_refresh")
                 self.footer_string = self.footer_string_refresh_function()
                 initial_time_footer = time.time()
-                self.draw_screen(self.indexed_items, self.highlights)
 
             if self.check_key("help", key, self.keys_dict):
                 self.logger.info(f"key_function help")
@@ -2474,34 +2473,28 @@ class Picker:
                 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)
             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)
             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)
 
             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)
 
             elif key == curses.KEY_RESIZE:  # Terminal resize signal
 
                 self.calculate_section_sizes()
                 self.column_widths = get_column_widths(self.items, header=self.header, max_column_width=self.max_column_width, number_columns=self.number_columns, max_total_width=w)
 
-                self.draw_screen(self.indexed_items, self.highlights)
 
 
             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)
                 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
@@ -2546,7 +2539,6 @@ 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)
                 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
@@ -2654,7 +2646,6 @@ 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)
 
             elif self.check_key("opts_input", key, self.keys_dict):
                 self.logger.info(f"key_function opts_input")
@@ -2893,7 +2884,7 @@ class Picker:
                 self.stdscr.clear()
                 self.stdscr.refresh()
                 self.initialise_variables()
-                self.draw_screen(self.indexed_items, self.highlights)
+                # self.draw_screen(self.indexed_items, self.highlights)
 
 
 
@@ -3165,6 +3156,7 @@ def main() -> None:
     function_data["display_infobox"] = True
     function_data["infobox_items"] = [["1"], ["2"], ["3"]]
     function_data["infobox_title"] = "Title"
+    function_data["footer_string"] = "Title"
 
 
     # function_data["debug"] = True

{listpick-0.1.13.26 → listpick-0.1.13.28}/src/listpick/ui/footer.py

@@ -50,6 +50,9 @@ 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))
 
@@ -63,19 +66,14 @@ 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)

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

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