listpick 0.1.13.50__tar.gz → 0.1.13.52__tar.gz

{listpick-0.1.13.50/src/listpick.egg-info → listpick-0.1.13.52}/PKG-INFO

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

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

@@ -260,7 +260,6 @@ class Picker:
         self.unicode_char_width = unicode_char_width
 
 
-
         self.colours_start = colours_start
         self.colours_end = colours_end
         self.reset_colours = reset_colours
@@ -314,8 +313,6 @@ class Picker:
         self.debug_level = debug_level
 
 
-
-
         self.initialise_picker_state(reset_colours=self.reset_colours)
 
 
@@ -387,7 +384,6 @@ class Picker:
     def initialise_picker_state(self, reset_colours=False) -> None:
         """ Initialise state variables for the picker. These are: debugging and colours. """
 
-
         if curses.has_colors() and self.colours != None:
             # raise Exception("Terminal does not support color")
             curses.start_color()
@@ -477,7 +473,6 @@ 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()
 
@@ -601,8 +596,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)
+        # if self.display_infobox:
+        #     self.infobox_picker = self.infobox(self.stdscr, self.infobox_items, self.infobox_title)
 
 
     def move_column(self, direction: int) -> None:
@@ -662,14 +657,14 @@ class Picker:
             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_wr(self, indexed_items: list[Tuple[int, list[str]]], highlights: list[dict] = [{}], clear: bool = True) -> None:
         """ Try-except wrapper for the draw_screen_() method to prevent crashes when rapidly resizing the terminal. """
         try:
-            self.draw_screen_(self.indexed_items, self.highlights, clear=clear)
+            self.draw_screen(self.indexed_items, self.highlights, clear=clear)
         except:
             self.logger.warning(f"draw_screen function error")
 
-    def draw_screen_(self, indexed_items: list[Tuple[int, list[str]]], highlights: list[dict] = [{}], clear: bool = True) -> None:
+    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.")
 
@@ -999,14 +994,17 @@ class Picker:
         
         ## Display infobox
         if self.display_infobox:
-            # 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(self.stdscr, message=self.infobox_items, title=self.infobox_title)
+            # 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 self.display_infobox:
+        #     # 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()
@@ -1019,7 +1017,50 @@ class Picker:
         #     pass
 
 
-    def infobox(self, stdscr: curses.window, message: list =[], title: str ="Infobox",  colours_end: int = 0, duration: int = 4):
+    # 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()")
+    #     h, w = stdscr.getmaxyx()
+    #     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)]
+    #     else:
+    #         submenu_items = message
+    #
+    #     notification_remap_keys = { 
+    #         curses.KEY_RESIZE: curses.KEY_F5,
+    #         27: ord('q')
+    #     }
+    #     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 = self.stdscr.derwin(notification_height, notification_width, 3, w - (notification_width+4))
+    #     infobox_data = {
+    #         "items": submenu_items,
+    #         "colours": notification_colours,
+    #         "colours_start": self.notification_colours_start,
+    #         "disabled_keys": [ord('z'), ord('c')],
+    #         "show_footer": False,
+    #         "top_gap": 0,
+    #         "key_remappings": notification_remap_keys,
+    #         "display_only": True,
+    #         "hidden_columns": [],
+    #         "title": title,
+    #         "reset_colours": False,
+    #     }
+    #     submenu_win.noutrefresh()
+    #     OptionPicker = Picker(submenu_win, **infobox_data)
+    #     return OptionPicker
+
+
+    def infobox(self, stdscr: curses.window, message: str ="", title: str ="Infobox",  colours_end: int = 0, duration: int = 4) -> curses.window:
         """ Display non-interactive infobox window. """
 
         self.logger.info(f"function: infobox()")
@@ -1027,7 +1068,6 @@ 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)]
@@ -1040,27 +1080,29 @@ 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()
+        while True:
+            h, w = stdscr.getmaxyx()
 
-        submenu_win = self.stdscr.derwin(notification_height, notification_width, 3, w - (notification_width+4))
-        infobox_data = {
-            "items": submenu_items,
-            "colours": notification_colours,
-            "colours_start": self.notification_colours_start,
-            "disabled_keys": [ord('z'), ord('c')],
-            "show_footer": False,
-            "top_gap": 0,
-            "key_remappings": notification_remap_keys,
-            "display_only": True,
-            "hidden_columns": [],
-            "title": title,
-            "reset_colours": False,
-        }
-        submenu_win.noutrefresh()
-        OptionPicker = Picker(submenu_win, **infobox_data)
-        return OptionPicker
+            submenu_win = curses.newwin(notification_height, notification_width, 3, w - (notification_width+4))
+            infobox_data = {
+                "items": submenu_items,
+                "colours": notification_colours,
+                "colours_start": self.notification_colours_start,
+                "disabled_keys": [ord('z'), ord('c')],
+                "show_footer": False,
+                "top_gap": 0,
+                "key_remappings": notification_remap_keys,
+                "display_only": True,
+                "hidden_columns": [],
+                "title": title,
+                "reset_colours": False,
+            }
+
+            OptionPicker = Picker(submenu_win, **infobox_data)
+            s, o, f = OptionPicker.run()
+            if o != "refresh": break
 
+        return submenu_win
 
     def get_function_data(self) -> dict:
         self.logger.debug(f"function: get_function_data()")
@@ -1201,6 +1243,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)
 
 
     def choose_option(
@@ -1713,6 +1756,7 @@ class Picker:
                     return None
 
         except:
+            self.draw_screen(self.indexed_items, self.highlights)
             self.notification(self.stdscr, message="Error pasting data.")
             return None
         if type(pasta) == type([]) and len(pasta) > 0 and type(pasta[0]) == type([]):
@@ -1985,6 +2029,7 @@ class Picker:
                         initial_time = time.time()
 
                         self.draw_screen(self.indexed_items, self.highlights, clear=False)
+                        
                         self.refreshing_data = False
                         self.data_ready = False
 
@@ -2175,6 +2220,7 @@ 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
@@ -2193,7 +2239,6 @@ class Picker:
                         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()
@@ -2347,7 +2392,6 @@ 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)
-
                 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
@@ -2362,7 +2406,7 @@ 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):
@@ -2370,7 +2414,6 @@ class Picker:
                     if row_width-self.leftmost_char >= w-self.startx:
                         self.leftmost_char = self.leftmost_char+5
 
-
             elif self.check_key("scroll_left", key, self.keys_dict):
                 self.logger.info(f"key_function scroll_left")
                 self.leftmost_char = max(self.leftmost_char-5, 0)