listpick 0.1.14.2__py3-none-any.whl → 0.1.14.3__py3-none-any.whl

listpick/listpick_app.py

@@ -716,6 +716,9 @@ class Picker:
             self.stdscr.erase()
 
         h, w = self.stdscr.getmaxyx()
+        # The height of the footer may need to be adjusted if the file changes.
+        self.footer.adjust_sizes(h,w)
+        self.calculate_section_sizes()
 
         # Test if the terminal is of a sufficient size to display the picker
         if not self.test_screen_size(): return None
@@ -742,7 +745,7 @@ class Picker:
         visible_columns_total_width = sum(visible_column_widths) + len(self.separator)*(len(visible_column_widths)-1)
 
         # Determine the number of items_per_page, top_size and bottom_size
-        self.calculate_section_sizes()
+        # self.calculate_section_sizes()
         
         # top_space = self.top_gap
 
@@ -1225,6 +1228,9 @@ class Picker:
             "top_gap",
             "unicode_char_width",
             "show_row_header",
+            "centre_in_terminal_vertical",
+            "centre_in_cols",
+            "centre_in_terminal",
         ]
 
         for var in variables:
@@ -1430,20 +1436,26 @@ class Picker:
                         self.auto_refresh = not self.auto_refresh
                     elif setting[1] == "h":
                         self.highlights_hide = not self.highlights_hide
+                elif setting.isnumeric():
+                    self.cursor_pos = max(0, min(int(setting), len(self.indexed_items)-1))
+                elif setting.startswith("col") and setting[3:].isnumeric():
+                    col = int(setting[3:])
+                    if 0 <= col < len(self.column_widths):
+                        self.selected_column = col
 
                 elif setting in ["nhl", "nohl", "nohighlights"]:
                     # highlights = [highlight for highlight in highlights if "type" not in highlight or highlight["type"] != "search" ]
                     
                     self.highlights_hide = not self.highlights_hide
-                # elif setting[0] == "s":
-                #     if 0 <= int(setting[1:]) < len(self.items[0]):
-                #         self.sort_column = int(setting[1:])
-                #         if len(self.indexed_items):
-                #             current_pos = 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 items based on new column
-                #         if len(self.indexed_items):
-                #             new_pos = [row[0] for row in self.indexed_items].index(current_pos)
-                #             self.cursor_pos = new_pos
+                elif setting.startswith("s") and setting[1:].isnumeric():
+                    if 0 <= int(setting[1:]) < len(self.items[0]):
+                        self.sort_column = int(setting[1:])
+                        if len(self.indexed_items):
+                            current_pos = 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 items based on new column
+                        if len(self.indexed_items):
+                            new_pos = [row[0] for row in self.indexed_items].index(current_pos)
+                            self.cursor_pos = new_pos
                 elif setting == "ct":
                     self.centre_in_terminal = not self.centre_in_terminal
                 elif setting == "cc":
@@ -1494,6 +1506,8 @@ 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.stdscr.refresh()
 
                 elif setting == "sheet_next":
                     self.command_stack.append(Command("setting", self.user_settings))
@@ -1504,7 +1518,6 @@ class Picker:
 
                 elif setting.startswith("ft"):
                     if len(setting) > 2 and setting[2:].isnumeric():
-                        
                         num = int(setting[2:])
                         self.footer_style = max(len(self.footer_options)-1, num)
                         self.footer = self.footer_options[self.footer_style]
@@ -2254,12 +2267,12 @@ class Picker:
                 version = metadata.version('listpick')
 
                 info_items = [
-                    ["    Listpick info:", "-*"*30],
+                    ["  Listpick info", "-*"*30],
                     ["",""],
                     ["listpick version", f"{version}"],
 
                     ["",""],
-                    ["    Global:", "-*"*30],
+                    ["  Global", "-*"*30],
                     ["",""],
                     ["current_file", self.loaded_file],
                     ["loaded_files", repr(self.loaded_files)],
@@ -2272,11 +2285,12 @@ class Picker:
                     ["debug level", f"{repr(self.debug_level)}"],
 
                     ["",""],
-                    ["    Current File:", "-*"*30],
+                    ["  Current File", "-*"*30],
                     ["",""],
-                    ["row/row count", f"{self.cursor_pos}/{len(self.indexed_items)}"],
-                    ["total rows", f"{len(self.items)}"],
-                    ["selections", f"{self.selected_cells_by_row}"],
+                    # ["row/row count", f"{self.cursor_pos}/{len(self.indexed_items)}"],
+                    ["Current row", f"{self.cursor_pos}/{len(self.indexed_items)}"],
+                    ["Total rows", f"{len(self.items)}"],
+                    ["Selection count", f"{self.selected_cells_by_row}"],
                     ["current_sheet", self.sheet_name],
                     ["sheets", repr(self.sheets)],
                     ["current column/column_count", f"{self.selected_column}/{len(self.column_widths)}"],
@@ -2287,7 +2301,7 @@ class Picker:
                     ["id_column", f"{self.id_column}"],
 
                     ["",""],
-                    ["    Display options:", "-*"*30],
+                    ["  Display options", "-*"*30],
                     ["",""],
                     ["show_header", str(self.show_header)],
                     ["show_footer", repr(self.show_footer)],
@@ -2319,11 +2333,18 @@ class Picker:
                 data["sheet_states"] = f"[...] length = {len(data['sheet_states'])}"
                 info_items += [
                     ["",""],
-                    ["    get_function_data():", "-*"*30],
+                    ["  get_function_data()", "-*"*30],
                     ["",""],
                     ["show_header", str(self.show_header)],
                 ]
                 info_items += [[key, repr(value)] for key, value in data.items()]
+
+
+                for row in info_items:
+                    if row[1] == "-*"*30:
+                        continue
+                    row[0] = "      " + row[0]
+
                 info_header = ["Option", "Value"]
                 info_data = {
                     "items": info_items,
@@ -2427,12 +2448,13 @@ class Picker:
                     options += [["sheet_next", "Go to the next sheet."]]
                     options += [["sheet_prev", "Go to the previous sheet."]]
                     options += [["unicode", "Toggle b/w using len and wcwidth to calculate char width."]]
-                    options += [[f"s{i}", f"Select col. {i}"] for i in range(len(self.items[0]))]
-                    options += [[f"!{i}", f"Toggle col. {i}"] for i in range(len(self.items[0]))]
                     options += [["ara", "Add empty row after cursor."]]
                     options += [["arb", "Add empty row before the cursor."]]
                     options += [["aca", "Add empty column after the selected column."]]
                     options += [["acb", "Add empty column before the selected column."]]
+                    options += [[f"col{i}", f"Select column {i}"] for i in range(len(self.items[0]))]
+                    options += [[f"s{i}", f"Sort by column {i}"] for i in range(len(self.items[0]))]
+                    options += [[f"!{i}", f"Toggle visibility of column {i}"] for i in range(len(self.items[0]))]
 
 
                 settings_options_header = ["Key", "Setting"]

listpick/ui/footer.py

@@ -47,42 +47,51 @@ class StandardFooter(Footer):
             else: self.height = 2
         except:
             logger.error("Error encountered when running StandardFooter.get_state")
-    def draw(self, h, w):
-        state = self.get_state()
-        # Fill background
 
+        self.footer_string_y = 0
+        self.picker_info_y = 1
+        self.sort_info_y = 2
+        self.sheets_y = 3
+        self.files_y = 4
+    def adjust_sizes(self, h, w):
+        state = self.get_state()
 
-        sheets_y=-1
+        self.sheets_y=-1
         if state["footer_string"]:
-
-        
-            footer_string_y = h-1
-            picker_info_y = h-3
-            sort_info_y = h-2
+            self.footer_string_y = h-1
+            self.picker_info_y = h-3
+            self.sort_info_y = h-2
             
             self.height = 3
 
         else:
-            picker_info_y = h-2
-            sort_info_y = h-1
-            footer_string_y = -1
+            self.picker_info_y = h-2
+            self.sort_info_y = h-1
+            self.footer_string_y = -1
             self.height = 2
 
         if len(state["sheets"]) > 1:
             self.height += 1
-            picker_info_y -= 1
-            sort_info_y -= 1
-            footer_string_y -= 1
-            sheets_y = h-1
+            self.picker_info_y -= 1
+            self.sort_info_y -= 1
+            self.footer_string_y -= 1
+            self.sheets_y = h-1
 
         if len(state["loaded_files"]) > 1 and state["loaded_file"] in state["loaded_files"]:
             self.height += 1
-            picker_info_y -= 1
-            sort_info_y -= 1
-            footer_string_y -= 1
-            sheets_y -= 1
+            self.picker_info_y -= 1
+            self.sort_info_y -= 1
+            self.footer_string_y -= 1
+            self.sheets_y -= 1
+
+            self.files_y = h-1
+
+    def draw(self, h, w):
+        state = self.get_state()
+        # Fill background
+
+        self.adjust_sizes(h, w)
 
-            files_y = h-1
 
 
         for i in range(self.height):
@@ -101,18 +110,18 @@ class StandardFooter(Footer):
             current_file_x = sum((len(x) for x in files[:idx])) + idx*len(sep)
             current_file_str = state["loaded_file"].split("/")[-1]
             current_file_x_end = current_file_x + len(current_file_str) + 2
-            self.stdscr.addstr(files_y, 0, ' '*(w-1), curses.color_pair(self.colours_start+4))
+            self.stdscr.addstr(self.files_y, 0, ' '*(w-1), curses.color_pair(self.colours_start+4))
             if current_file_x_end < w:
 
-                self.stdscr.addstr(files_y, 0, f" {files_str}", curses.color_pair(self.colours_start+4))
+                self.stdscr.addstr(self.files_y, 0, f" {files_str}", curses.color_pair(self.colours_start+4))
 
-                self.stdscr.addstr(files_y, current_file_x, f" {current_file_str}{sep[0]}", curses.color_pair(self.colours_start+4) | curses.A_REVERSE)
+                self.stdscr.addstr(self.files_y, current_file_x, f" {current_file_str}{sep[0]}", curses.color_pair(self.colours_start+4) | curses.A_REVERSE)
             else:
                 files_str = sep.join(files)
                 files_str = files_str[current_file_x_end-w:current_file_x_end][:w-2]
-                self.stdscr.addstr(files_y, 0, f" {files_str}", curses.color_pair(self.colours_start+4))
+                self.stdscr.addstr(self.files_y, 0, f" {files_str}", curses.color_pair(self.colours_start+4))
 
-                self.stdscr.addstr(files_y, w - (len(current_file_str)+3), f" {current_file_str}{sep[0]}", curses.color_pair(self.colours_start+4) | curses.A_REVERSE)
+                self.stdscr.addstr(self.files_y, w - (len(current_file_str)+3), f" {current_file_str}{sep[0]}", curses.color_pair(self.colours_start+4) | curses.A_REVERSE)
 
         if len(state["sheets"]) > 1:
 
@@ -127,18 +136,18 @@ class StandardFooter(Footer):
             current_sheet_x = sum((len(x) for x in sheets[:idx])) + idx*len(sep)
             current_sheet_str = state["sheet_name"].split("/")[-1]
             current_sheet_x_end = current_sheet_x + len(current_sheet_str) + 2
-            self.stdscr.addstr(sheets_y, 0, ' '*(w-1), curses.color_pair(self.colours_start+4))
+            self.stdscr.addstr(self.sheets_y, 0, ' '*(w-1), curses.color_pair(self.colours_start+4))
             if current_sheet_x_end < w:
 
-                self.stdscr.addstr(sheets_y, 0, f" {sheets_str}", curses.color_pair(self.colours_start+4))
+                self.stdscr.addstr(self.sheets_y, 0, f" {sheets_str}", curses.color_pair(self.colours_start+4))
 
-                self.stdscr.addstr(sheets_y, current_sheet_x, f" {current_sheet_str}{sep[0]}", curses.color_pair(self.colours_start+4) | curses.A_REVERSE)
+                self.stdscr.addstr(self.sheets_y, current_sheet_x, f" {current_sheet_str}{sep[0]}", curses.color_pair(self.colours_start+4) | curses.A_REVERSE)
             else:
                 sheets_str = sep.join(sheets)
                 sheets_str = sheets_str[current_sheet_x_end-w:current_sheet_x_end][:w-2]
-                self.stdscr.addstr(sheets_y, 0, f" {sheets_str}", curses.color_pair(self.colours_start+4))
+                self.stdscr.addstr(self.sheets_y, 0, f" {sheets_str}", curses.color_pair(self.colours_start+4))
 
-                self.stdscr.addstr(sheets_y, w - (len(current_sheet_str)+3), f" {current_sheet_str}{sep[0]}", curses.color_pair(self.colours_start+4) | curses.A_REVERSE)
+                self.stdscr.addstr(self.sheets_y, w - (len(current_sheet_str)+3), f" {current_sheet_str}{sep[0]}", curses.color_pair(self.colours_start+4) | curses.A_REVERSE)
                 
 
 
@@ -148,8 +157,8 @@ class StandardFooter(Footer):
 
             disp_string = f"{state["footer_string"][:footer_string_width]}"
             disp_string = f" {disp_string:>{footer_string_width-2}} "
-            self.stdscr.addstr(footer_string_y, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
-            self.stdscr.addstr(footer_string_y, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))
+            self.stdscr.addstr(self.footer_string_y, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
+            self.stdscr.addstr(self.footer_string_y, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))
 
         
 
@@ -177,7 +186,7 @@ class StandardFooter(Footer):
 
         # Maximum chars that should be displayed
         max_chars = min(len(cursor_disp_str)+2, w)
-        self.stdscr.addstr(picker_info_y, w-max_chars, f"{cursor_disp_str:>{max_chars-2}} ", curses.color_pair(self.colours_start+20))
+        self.stdscr.addstr(self.picker_info_y, w-max_chars, f"{cursor_disp_str:>{max_chars-2}} ", curses.color_pair(self.colours_start+20))
 
 
         # Sort info
@@ -187,7 +196,7 @@ class StandardFooter(Footer):
         sort_order_info = "▼" if state["sort_reverse"][state['sort_column']] else "▲"
         sort_disp_str = f" Sort: ({sort_column_info}, {sort_method_info}, {sort_order_info}) "
         max_chars = min(len(sort_disp_str)+2, w)
-        self.stdscr.addstr(sort_info_y, w-max_chars, f"{sort_disp_str:>{max_chars-1}}", curses.color_pair(self.colours_start+20))
+        self.stdscr.addstr(self.sort_info_y, w-max_chars, f"{sort_disp_str:>{max_chars-1}}", curses.color_pair(self.colours_start+20))
 
         self.stdscr.refresh()
 
@@ -205,6 +214,9 @@ class CompactFooter(Footer):
         self.get_state = get_state_function
         self.height = 1
 
+    def adjust_sizes(self, h, w):
+        pass
+
     def draw(self, h, w):
         state = self.get_state()
 
@@ -268,6 +280,10 @@ class NoFooter(Footer):
         self.colours_start = colours_start
         self.get_state = get_state_function
         self.height = 0
+
+    def adjust_sizes(self, h, w):
+        pass
+
     def draw(self, h, w):
         state = self.get_state()
 

{listpick-0.1.14.2.dist-info → listpick-0.1.14.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.14.2
+Version: 0.1.14.3
 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.14.2.dist-info → listpick-0.1.14.3.dist-info}/RECORD

@@ -1,9 +1,9 @@
 listpick/__init__.py,sha256=ExXc97-bibodH--wlwpQivl0zCNR5D1hvpvrf7OBofU,154
 listpick/__main__.py,sha256=wkCjDdqw093W27yWwnlC3nG_sMRKaIad7hHHWy0RBgY,193
-listpick/listpick_app.py,sha256=lnMa_G6HAWP8hHVhlOiBDvRc7Y38oqTM88ijhtVrlfU,182457
+listpick/listpick_app.py,sha256=APXKgeGp2bDDyXaFUr7HmswokpO6H6g8xt9KdMhM5jc,183558
 listpick/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/ui/build_help.py,sha256=8QtsRosIE2IMagRc_remzmwSWpCurFgLenLL7w1ly94,8949
-listpick/ui/footer.py,sha256=85sVZ6zvzZXSc0TwgvCHGuzGElp6KwUVzwzF5VQwLyY,14219
+listpick/ui/footer.py,sha256=eaGCJlUMuOyoVfBxbqDFBxF7b3w_FMUuzFO1_xWz7xY,14702
 listpick/ui/help_screen.py,sha256=zbfGIgb-IXtATpl4_Sx7nPbsnRXZ7eiMYlCKGS9EFmw,5608
 listpick/ui/input_field.py,sha256=eyoWHoApdZybjfXcp7Eth7xwb-C-856ZVnq5j_Q3Ojs,30412
 listpick/ui/keys.py,sha256=944-no3lspUzC3oWt96Q_mY33fIrKOharXPskAMou2I,13162
@@ -23,9 +23,9 @@ listpick/utils/searching.py,sha256=Xk5UIqamNHL2L90z3ACB_Giqdpi9iRKoAJ6pKaqaD7Q,3
 listpick/utils/sorting.py,sha256=WZZiVlVA3Zkcpwji3U5SNFlQ14zVEk3cZJtQirBkecQ,5329
 listpick/utils/table_to_list_of_lists.py,sha256=Ox_4OWtZcFp5XWcItlMqE6_Q27YiJz7M9w23Y9vfzYQ,7604
 listpick/utils/utils.py,sha256=McOl9uT3jh7l4TIWeSd8ZGjK_e7r0YZF0Gl20yI6fl0,13873
-listpick-0.1.14.2.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
-listpick-0.1.14.2.dist-info/METADATA,sha256=9tz_0_1IWeRlbFjqChK-Ls-pmm1e_MhsQeRzn57aftE,8090
-listpick-0.1.14.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-listpick-0.1.14.2.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
-listpick-0.1.14.2.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
-listpick-0.1.14.2.dist-info/RECORD,,
+listpick-0.1.14.3.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
+listpick-0.1.14.3.dist-info/METADATA,sha256=aCfS3JHtI7fj15zC7bn1iv1PHtAhpx-eP3bkMUZQWfU,8090
+listpick-0.1.14.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+listpick-0.1.14.3.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
+listpick-0.1.14.3.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
+listpick-0.1.14.3.dist-info/RECORD,,