listpick 0.1.14.1__tar.gz → 0.1.14.2__tar.gz

{listpick-0.1.14.1 → listpick-0.1.14.2}/CHANGELOG.md

@@ -3,6 +3,8 @@ Note that the changes between 0.1.11.0 and 1.1.12.0 are listed under 0.1.11
 
 ## [0.1.15] 2025-??-??
  - Added info screen to display all information on the running Picker.
+ - Added keys for file_next and file_prev
+ - Added __sizeof__() function for the Picker class.
 
 ## [0.1.14] 2025-08-20
  - Fixed bug when cells are centred vertically.

{listpick-0.1.14.1/src/listpick.egg-info → listpick-0.1.14.2}/PKG-INFO

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

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

@@ -1489,46 +1489,18 @@ class Picker:
                 elif setting == "unicode":
                     self.unicode_char_width = not self.unicode_char_width
                 elif setting == "file_next":
-                    if len(self.loaded_files) > 1:
-                        self.command_stack.append(Command("setting", self.user_settings))
-                        # Cache file state
-                        self.loaded_file_states[self.loaded_file_index] = self.get_function_data()
-
-                        self.loaded_file_index = (self.loaded_file_index + 1) % len(self.loaded_files)
-                        self.loaded_file = self.loaded_files[self.loaded_file_index]
-
-                        # If we already have a loaded state for this file
-                        if self.loaded_file_states[self.loaded_file_index]:
-                            self.set_function_data(self.loaded_file_states[self.loaded_file_index])
-                        else:
-                            self.set_function_data({}, reset_absent_variables=True)
-                            self.load_file(self.loaded_file)
+                    self.command_stack.append(Command("setting", self.user_settings))
+                    self.switch_file(increment=1)
+                elif setting == "file_prev":
+                    self.command_stack.append(Command("setting", self.user_settings))
+                    self.switch_file(increment=-1)
 
                 elif setting == "sheet_next":
-                    if not os.path.exists(self.loaded_file):
-                        self.notification(self.stdscr, message=f"File {repr(self.loaded_file)} not found.")
-                        return None
-                    if len(self.sheets) > 1:
-                        self.command_stack.append(Command("setting", self.user_settings))
-
-                        # Cache sheet state
-                        self.sheet_states[self.sheet_index] = self.get_function_data()
-                        self.sheet_index = (self.sheet_index + 1) % len(self.sheets)
-                        self.sheet_name = self.sheets[self.sheet_index]
-
-                        # If we already have a loaded state for this file
-                        if self.sheet_states[self.sheet_index]:
-                            self.set_function_data(self.sheet_states[self.sheet_index])
-                        else:
-                            function_data = {
-                                "sheet_index": self.sheet_index,
-                                "sheet_name":  self.sheet_name,
-                                "sheet_states":self.sheet_states,
-                                "sheets":       self.sheets,
-                            }
-                            self.set_function_data(function_data, reset_absent_variables=True)
-                            self.load_sheet(self.loaded_file, sheet_number=self.sheet_index)
-
+                    self.command_stack.append(Command("setting", self.user_settings))
+                    self.switch_sheet(increment=1)
+                elif setting == "sheet_prev":
+                    self.command_stack.append(Command("setting", self.user_settings))
+                    self.switch_sheet(increment=-1)
 
                 elif setting.startswith("ft"):
                     if len(setting) > 2 and setting[2:].isnumeric():
@@ -2099,7 +2071,50 @@ class Picker:
 
             self.initialise_variables()
 
+    def switch_file(self, increment=1) -> None:
+        """ Go to the next file. """
+        if len(self.loaded_files) <= 1:
+            return None
+
+        # Cache file state
+        self.loaded_file_states[self.loaded_file_index] = self.get_function_data()
+
+        self.loaded_file_index = (self.loaded_file_index + increment) % len(self.loaded_files)
+        self.loaded_file = self.loaded_files[self.loaded_file_index]
+
+        # If we already have a loaded state for this file
+        if self.loaded_file_states[self.loaded_file_index]:
+            self.set_function_data(self.loaded_file_states[self.loaded_file_index])
+        else:
+            self.set_function_data({}, reset_absent_variables=True)
+            self.load_file(self.loaded_file)
+
+
+    def switch_sheet(self, increment=1) -> None:
+        if not os.path.exists(self.loaded_file):
+            self.notification(self.stdscr, message=f"File {repr(self.loaded_file)} not found.")
+            return None
+        if len(self.sheets) <= 1:
+            return None
+
+        # Cache sheet state
+        self.sheet_states[self.sheet_index] = self.get_function_data()
 
+        self.sheet_index = (self.sheet_index + increment) % len(self.sheets)
+        self.sheet_name = self.sheets[self.sheet_index]
+
+        # If we already have a loaded state for this file
+        if self.sheet_states[self.sheet_index]:
+            self.set_function_data(self.sheet_states[self.sheet_index])
+        else:
+            function_data = {
+                "sheet_index": self.sheet_index,
+                "sheet_name":  self.sheet_name,
+                "sheet_states":self.sheet_states,
+                "sheets":       self.sheets,
+            }
+            self.set_function_data(function_data, reset_absent_variables=True)
+            self.load_sheet(self.loaded_file, sheet_number=self.sheet_index)
 
 
 
@@ -2293,13 +2308,15 @@ class Picker:
                 ]
                 
                 data = self.get_function_data()
-                del data["indexed_items"]
-                del data["selections"]
-                del data["selected_cells_by_row"]
-                del data["cell_selections"]
-                del data["items"]
-                del data["require_option"]
-                del data["option_functions"]
+                data["indexed_items"] = f"[...] length = {len(data['indexed_items'])}"
+                data["selections"] = f"[...] length = {len(data['selections'])}"
+                data["selected_cells_by_row"] = f"[...] length = {len(data['selected_cells_by_row'])}"
+                data["cell_selections"] = f"[...] length = {len(data['cell_selections'])}"
+                data["items"] = f"[...] length = {len(data['items'])}"
+                data["require_option"] = f"[...] length = {len(data['require_option'])}"
+                data["option_functions"] = f"[...] length = {len(data['option_functions'])}"
+                data["loaded_file_states"] = f"[...] length = {len(data['loaded_file_states'])}"
+                data["sheet_states"] = f"[...] length = {len(data['sheet_states'])}"
                 info_items += [
                     ["",""],
                     ["    get_function_data():", "-*"*30],
@@ -2405,6 +2422,10 @@ class Picker:
                     options += [["rh", "Toggle row header"]]
                     options += [["modes", "Toggle modes"]]
                     options += [["ft", "Cycle through footer styles (accepts ft#)"]]
+                    options += [["file_next", "Go to the next open file."]]
+                    options += [["file_prev", "Go to the previous open file."]]
+                    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]))]
@@ -3031,14 +3052,10 @@ class Picker:
                             # Re-sort self.items after applying filter
                             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 self.items based on new column
             elif self.check_key("file_next", key, self.keys_dict):
-                if len(self.loaded_files):
-                    self.loaded_file_index = (self.loaded_file_index + 1) % len(self.loaded_files)
-                    self.loaded_file = self.loaded_files[self.loaded_file_index]
+                self.switch_file(increment=1)
 
             elif self.check_key("file_prev", key, self.keys_dict):
-                if len(self.loaded_files):
-                    self.loaded_file_index = (self.loaded_file_index - 1) % len(self.loaded_files)
-                    self.loaded_file = self.loaded_files[self.loaded_file_index]
+                self.switch_file(increment=-1)
 
             elif self.check_key("pipe_input", key, self.keys_dict):
                 self.logger.info(f"key_function pipe_input")

{listpick-0.1.14.1 → listpick-0.1.14.2}/src/listpick/ui/build_help.py

@@ -116,6 +116,9 @@ def build_help_rows(keys_dict: dict) -> list[list[str]]:
         "add_row_before":                   "Insert row before cursor.",
         "add_column_after":                 "Insert column after cursor.",
         "add_row_after":                    "Insert row after cursor.",
+        "info":                             "Display info screen.",
+        "file_next":                        "Go to the next open file.",
+        "file_prev":                        "Go to the previous open file.",
     }
     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" ],

{listpick-0.1.14.1 → listpick-0.1.14.2}/src/listpick/ui/keys.py

@@ -15,8 +15,8 @@ picker_keys = {
     "help":                             [ord('?')],
     "exit":                             [ord('q')],
     "full_exit":                        [3], # Ctrl+c
-    "move_column_left":                 [ord('{')],
-    "move_column_right":                [ord('}')],
+    # "move_column_left":                 [ord('{')],
+    # "move_column_right":                [ord('}')],
     "cursor_down":                      [ord('j'), curses.KEY_DOWN],
     "cursor_up":                        [ord('k'), curses.KEY_UP],
     "half_page_up":                     [ord('u')],
@@ -81,6 +81,8 @@ picker_keys = {
     # "add_row_before":                          [ord('=')],
     "add_row_after":                          [ord('=')],
     "info":                             [ord('i')], 
+    "file_next":                             [ord('}')], 
+    "file_prev":                             [ord('{')], 
 }
 
 

{listpick-0.1.14.1 → listpick-0.1.14.2/src/listpick.egg-info}/PKG-INFO

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