listpick 0.1.15.7__tar.gz → 0.1.15.8__tar.gz

{listpick-0.1.15.7 → listpick-0.1.15.8}/CHANGELOG.md

@@ -1,6 +1,9 @@
 # CHANGELOG.md
 Note that the changes between 0.1.11.0 and 1.1.12.0 are listed under 0.1.11
 
+## [0.1.15.7] 2025-07-29
+ - We can now have multiple right panes which can be cycled through by pressing ".
+
 ## [0.1.15.7] 2025-07-28
  - Fixed header column alignment problems which popped up with some datasets.
 

{listpick-0.1.15.7/src/listpick.egg-info → listpick-0.1.15.8}/PKG-INFO

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

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

@@ -23,6 +23,7 @@ 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
 from listpick.utils.options_selectors import default_option_input, output_file_option_selector, default_option_selector
 from listpick.utils.table_to_list_of_lists import *
@@ -191,16 +192,8 @@ class Picker:
         sheet_states: list = [{}],
 
         split_right: bool = False,
-        split_right_proportion: float = 1/2,
-        split_right_function: Callable = lambda stdscr, x, y, w, h, state, row, cell, data, test: False,
-        split_right_auto_refresh: bool = False,
-        split_right_refresh_data: Callable = lambda old_data, arg_dict: [],
-        split_right_refresh_data_timer: float = 1.0,
-        split_right_data: list = [],
-        
-
-
-
+        right_panes: list = [],
+        right_pane_index: int = 0,
     ):
         self.stdscr = stdscr
         self.items = items
@@ -350,13 +343,8 @@ class Picker:
         self.sheets = sheets
 
         self.split_right = split_right
-        self.split_right_proportion = split_right_proportion
-        self.split_right_function = split_right_function
-        self.split_right_auto_refresh = split_right_auto_refresh
-        self.split_right_refresh_data = split_right_refresh_data
-        self.split_right_refresh_data_timer = split_right_refresh_data_timer
-        self.split_right_data = split_right_data
-
+        self.right_panes = right_panes
+        self.right_pane_index = right_pane_index
         self.initialise_picker_state(reset_colours=self.reset_colours)
 
         # Note: We have to set the footer after initialising the picker state so that the footer can use the get_function_data method
@@ -426,8 +414,9 @@ class Picker:
         ## self.top_space
         h, w = self.stdscr.getmaxyx()
         self.term_h, self.term_w = self.stdscr.getmaxyx()
-        if self.split_right and self.split_right_function(self.stdscr, 0,0,0,0,{},[],[],"",test=True):
-            self.rows_w, self.rows_h = int(self.term_w*self.split_right_proportion), self.term_h
+        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
 
@@ -787,8 +776,9 @@ class Picker:
 
         h, w = self.stdscr.getmaxyx()
         self.term_h, self.term_w = self.stdscr.getmaxyx()
-        if self.split_right and self.split_right_function(self.stdscr, 0,0,0,0,{},[],[],"",test=True):
-            self.rows_w, self.rows_h = int(self.term_w*self.split_right_proportion), self.term_h
+        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
 
@@ -1189,8 +1179,10 @@ class Picker:
             self.stdscr.addstr(self.term_h - 1, self.term_w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
             self.stdscr.addstr(self.term_h - 1, self.term_w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))
 
-        if self.split_right and self.split_right_function(self.stdscr, 0,0,0,0,{},[],[],"",test=True):
-            self.split_right_function(
+        if self.split_right and len(self.right_panes):
+            draw_pane = self.right_panes[self.right_pane_index]["display"]
+            data = self.right_panes[self.right_pane_index]["data"]
+            draw_pane(
                 self.stdscr, 
                 x = self.rows_w,
                 y = self.top_space - int(bool(self.show_header and self.header)),
@@ -1199,7 +1191,7 @@ class Picker:
                 state = self.get_function_data(),
                 row = self.indexed_items[self.cursor_pos] if self.indexed_items else [],
                 cell = self.indexed_items[self.cursor_pos][1][self.selected_column] if self.indexed_items else "",
-                data=self.split_right_data,
+                data=data,
             )
         
         self.stdscr.refresh()
@@ -1363,12 +1355,9 @@ class Picker:
             "sheet_name":                       self.sheet_name,
             "sheet_states":                     self.sheet_states,
             "split_right":                      self.split_right,
-            "split_right_proportion":           self.split_right_proportion,
-            "split_right_function":             self.split_right_function,
-            "split_right_auto_refresh":         self.split_right_auto_refresh,
-            "split_right_refresh_data_timer":   self.split_right_refresh_data_timer,
-            "split_right_refresh_data":         self.split_right_refresh_data,
-            "split_right_data":                 self.split_right_data,
+            "right_panes":                      self.right_panes,
+            "right_pane_index":                 self.right_pane_index,
+
         }
         return function_data
 
@@ -1404,8 +1393,6 @@ class Picker:
             "centre_in_cols",
             "centre_in_terminal",
             "split_right",
-            "split_right_proportion",
-            "split_right_function",
         ]
 
         for var in variables:
@@ -1499,6 +1486,7 @@ class Picker:
             "number_columns": False,
             "reset_colours": False,
             "split_right": False,
+            "cell_cursor": False,
         }
         while True:
             h, w = stdscr.getmaxyx()
@@ -1530,6 +1518,8 @@ class Picker:
 
         if not message: message = "!!"
         submenu_items = ["  "+message[i*message_width:(i+1)*message_width] for i in range(len(message)//message_width+1)]
+        for i in range(len(submenu_items)):
+            submenu_items[i] = f"{submenu_items[i]:^{message_width}}"
 
         notification_remap_keys = { 
             curses.KEY_RESIZE: curses.KEY_F5,
@@ -1555,6 +1545,7 @@ class Picker:
                 "cancel_is_back": True,
                 "reset_colours": False,
                 "split_right": False,
+                "cell_cursor": False,
 
             }
             OptionPicker = Picker(submenu_win, **notification_data)
@@ -1695,6 +1686,9 @@ class Picker:
                 elif setting == "pane":
                     self.toggle_right_pane()
 
+                elif setting == "pane_cycle":
+                    self.cycle_right_pane()
+
                 elif setting.startswith("cwd="):
                     os.chdir(os.path.expandvars(os.path.expanduser(setting[len("cwd="):])))
                 elif setting.startswith("hl"):
@@ -2313,10 +2307,16 @@ class Picker:
             self.load_sheet(self.loaded_file, sheet_number=self.sheet_index)
 
     def toggle_right_pane(self):
-        if self.split_right_function(self.stdscr, 0,0,0,0,{},[],[],"",test=True):
+        if len(self.right_panes):
             self.split_right = not self.split_right
+            if self.right_panes[self.right_pane_index]["data"] in [[], None, {}]:
+                self.right_panes[self.right_pane_index]["data"] = self.right_panes[self.right_pane_index]["get_data"](self.right_panes[self.right_pane_index]["data"], self.get_function_data())
 
 
+    def cycle_right_pane(self, increment=1):
+        if len(self.right_panes) > 1:
+            self.right_pane_index = (self.right_pane_index+1)%len(self.right_panes)
+
     def run(self) -> Tuple[list[int], str, dict]:
         """ Run the picker. """
         self.logger.info(f"function: run()")
@@ -2330,7 +2330,7 @@ class Picker:
 
         initial_time = time.time()
         initial_time_footer = time.time()-self.footer_timer
-        initial_split_time = time.time()-self.split_right_refresh_data_timer
+        initial_split_time = time.time()-200
 
         if self.startup_notification:
             self.notification(self.stdscr, message=self.startup_notification)
@@ -2366,8 +2366,9 @@ class Picker:
 
         h, w = self.stdscr.getmaxyx()
         self.term_h, self.term_w = self.stdscr.getmaxyx()
-        if self.split_right and self.split_right_function(self.stdscr, 0,0,0,0,{},[],[],"",test=True):
-            self.rows_w, self.rows_h = int(self.term_w*self.split_right_proportion), self.term_h
+        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:
@@ -2391,8 +2392,10 @@ class Picker:
 
             h, w = self.stdscr.getmaxyx()
             self.term_h, self.term_w = self.stdscr.getmaxyx()
-            if self.split_right and self.split_right_function(self.stdscr, 0,0,0,0,{},[],[],"",test=True):
-                self.rows_w, self.rows_h = int(self.term_w*self.split_right_proportion), self.term_h
+
+            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
 
@@ -2447,8 +2450,10 @@ class Picker:
                 initial_time_footer = time.time()
                 self.draw_screen(self.indexed_items, self.highlights)
 
-            if self.split_right and self.split_right_auto_refresh and ((time.time() - initial_split_time) > self.split_right_refresh_data_timer):
-                self.split_right_data = self.split_right_refresh_data(self.split_right_data, self.get_function_data())
+            if self.split_right and len(self.right_panes) and self.right_panes[self.right_pane_index]["auto_refresh"] and ((time.time() - initial_split_time) > self.right_panes[self.right_pane_index]["refresh_time"]):
+                get_data = self.right_panes[self.right_pane_index]["get_data"]
+                data = self.right_panes[self.right_pane_index]["data"]
+                self.right_panes[self.right_pane_index]["data"] = get_data(data, self.get_function_data())
                 initial_split_time = time.time()
 
             if self.check_key("help", key, self.keys_dict):
@@ -3316,6 +3321,9 @@ class Picker:
             elif self.check_key("toggle_right_pane", key, self.keys_dict):
                 self.toggle_right_pane()
 
+            elif self.check_key("cycle_right_pane", key, self.keys_dict):
+                self.cycle_right_pane()
+
             elif self.check_key("pipe_input", key, self.keys_dict):
                 self.logger.info(f"key_function pipe_input")
                 # usrtxt = "xargs -d '\n' -I{}  "
@@ -3839,20 +3847,54 @@ def main() -> None:
     # function_data["debug"] = True
     # function_data["debug_level"] = 1
 
-
-    # function_data["split_right"] = True
-    # function_data["split_right_proportion"] = 2/3
-    # function_data["split_right_refresh_data"] = data_refresh_randint_title
-    # function_data["split_right_function"] = right_split_display_list
-    # function_data["split_right_data"] = ["Files", [str(x) for x in range(100)]]
-
-
-    # function_data["split_right_refresh_data"] = get_dl
-
-
-    # function_data["split_right_function"] = right_split_file_attributes
-    # function_data["split_right_auto_refresh"] = True
-    # function_data["split_right_function"] = right_split_graph
+    function_data["split_right"] = False
+    function_data["right_panes"] = [
+        # Graph or random numbers generated each second
+        {
+            "proportion": 2/3,
+            "auto_refresh": True,
+            "get_data": data_refresh_randint,
+            "display": right_split_graph,
+            "data": [],
+            "refresh_time": 1.0,
+        },
+        # list of numbers
+        {
+            "proportion": 2/3,
+            "auto_refresh": False,
+            "get_data": data_refresh_randint_title,
+            "display": right_split_display_list,
+            "data": ["Files", [str(x) for x in range(100)]],
+            "refresh_time": 1.0,
+        },
+        # File attribures
+        {
+            "proportion": 2/3,
+            "auto_refresh": False,
+            "get_data": lambda data, state: [],
+            "display": right_split_file_attributes,
+            "data": ["Files", [str(x) for x in range(100)]],
+            "refresh_time": 1.0,
+        },
+        # List of random numbers generated each second
+        {
+            "proportion": 1/2,
+            "auto_refresh": True,
+            "get_data": data_refresh_randint_title,
+            "display": right_split_display_list,
+            "data": ["Files", []],
+            "refresh_time": 0.1,
+        },
+        # Nopane
+        {
+            "proportion": 1/3,
+            "auto_refresh": False,
+            "get_data": lambda data, state: [],
+            "display": lambda scr, x, y, w, h, state, row, cell, data: [],
+            "data": ["Files", []],
+            "refresh_time": 0.1,
+        },
+    ]
 
     stdscr = start_curses()
     try:

{listpick-0.1.15.7 → listpick-0.1.15.8}/src/listpick/pane/pane_functions.py

@@ -29,6 +29,12 @@ def right_split_file_attributes(stdscr, x, y, w, h, state, row, cell, past_data:
     for j in range(h):
         stdscr.addstr(j+y, x, ' ', curses.color_pair(state["colours_start"]+16))
 
+    # Display pane count
+    pane_count = len(state["right_panes"])
+    pane_index = state["right_pane_index"]
+    if pane_count > 1:
+        s = f" {pane_index+1}/{pane_count} "
+        stdscr.addstr(y+h-1, x+w-len(s)-1, s, curses.color_pair(state["colours_start"]+20))
 
     # Filename/cursor cell value
     stdscr.addstr(y+2, x+2, cell[:w-3])
@@ -58,6 +64,14 @@ def right_split_graph(stdscr, x, y, w, h, state, row, cell, past_data: list = []
     for j in range(h):
         stdscr.addstr(j+y, x, ' ', curses.color_pair(state["colours_start"]+16))
 
+
+    # Display pane count
+    pane_count = len(state["right_panes"])
+    pane_index = state["right_pane_index"]
+    if pane_count > 1:
+        s = f" {pane_index+1}/{pane_count} "
+        stdscr.addstr(y+h-1, x+w-len(s)-1, s, curses.color_pair(state["colours_start"]+20))
+
     try:
         import plotille as plt
     except:
@@ -66,6 +80,7 @@ def right_split_graph(stdscr, x, y, w, h, state, row, cell, past_data: list = []
         return None
 
 
+
     # x_vals, y_vals = list(range(100)), [x**2 for x in range(100)]
     if data in [[], {}, None]:
         return None
@@ -96,6 +111,14 @@ def right_split_display_list(stdscr, x, y, w, h, state, row, cell, past_data: li
     for j in range(h):
         stdscr.addstr(j+y, x, ' ', curses.color_pair(state["colours_start"]+16))
 
+
+    # Display pane count
+    pane_count = len(state["right_panes"])
+    pane_index = state["right_pane_index"]
+    if pane_count > 1:
+        s = f" {pane_index+1}/{pane_count} "
+        stdscr.addstr(y+h-1, x+w-len(s)-1, s, curses.color_pair(state["colours_start"]+20))
+
     if data in [[], {}, None]:
         return None
 

{listpick-0.1.15.7 → listpick-0.1.15.8}/src/listpick/ui/build_help.py

@@ -143,11 +143,12 @@ def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
         "sheet_next":                       "Go to the next sheet.",
         "sheet_prev":                       "Go to the previous sheet.",
         "toggle_right_pane":                "Toggle the right pane",
+        "cycle_right_pane":                 "Cycle through right panes",
     }
     sections = {
         "Navigation:": [ "cursor_down", "cursor_up", "half_page_up", "half_page_down", "page_up", "page_down", "cursor_bottom", "cursor_top", "five_up", "five_down", "scroll_right", "scroll_left", "scroll_far_right", "scroll_far_left" ],
         "Selection:": [ "toggle_select", "select_all", "select_none", "visual_selection_toggle", "visual_deselection_toggle", "enter" ],
-        "UI:": [ "toggle_footer", "redraw_screen", "decrease_lines_per_page", "increase_lines_per_page", "increase_column_width", "decrease_column_width", "notification_toggle", "toggle_right_pane"],
+        "UI:": [ "toggle_footer", "redraw_screen", "decrease_lines_per_page", "increase_lines_per_page", "increase_column_width", "decrease_column_width", "notification_toggle", "toggle_right_pane", "cycle_right_pane"],
         "Sort:": [ "cycle_sort_method", "cycle_sort_method_reverse", "cycle_sort_order", ] ,
         "Data manipulation:": [ "delete", "delete_column", "edit", "edit_picker", "edit_ipython", "add_column_before", "add_column_after", "add_row_before", "add_row_after"],
         "Filter and sort:": [ "filter_input", "search_input", "continue_search_forward", "continue_search_backward", ] ,

{listpick-0.1.15.7 → listpick-0.1.15.8}/src/listpick/ui/keys.py

@@ -87,6 +87,7 @@ picker_keys = {
     # "sheet_next":                           [],
     # "sheet_prev":                           [],
     "toggle_right_pane":                             [ord("'")], 
+    "cycle_right_pane":                             [ord('"')], 
 }
 
 

{listpick-0.1.15.7 → listpick-0.1.15.8}/src/listpick/ui/picker_colours.py

@@ -340,7 +340,7 @@ def get_notification_colours(pick:int=0) -> Dict[str, int]:
     else:
         colours['background'] = 237
         colours['unselected_bg'] = 237
-        colours['cursor_bg'] = 237
+        colours['cursor_bg'] = 238
         colours['selected_bg'] = 237
 
     return colours

{listpick-0.1.15.7 → listpick-0.1.15.8/src/listpick.egg-info}/PKG-INFO

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