listpick 0.1.14.9__py3-none-any.whl → 0.1.14.11__py3-none-any.whl

listpick/listpick_app.py

@@ -188,7 +188,6 @@ class Picker:
         sheet_index = 0,
         sheet_states = [{}],
 
-        redraw_screen_accessory: Callable = lambda : None,
 
     ):
         self.stdscr = stdscr
@@ -338,7 +337,6 @@ class Picker:
         self.sheet_states = sheet_states
         self.sheets = sheets
 
-        self.redraw_screen_accessory = redraw_screen_accessory
         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
@@ -752,7 +750,6 @@ class Picker:
     def draw_screen_(self, indexed_items: list[Tuple[int, list[str]]], highlights: list[dict] = [{}], clear: bool = True) -> None:
         """ Draw Picker screen. """
 
-        self.redraw_screen_accessory()
         self.logger.debug("Draw screen.")
 
         if clear:
@@ -1242,7 +1239,6 @@ class Picker:
             "sheets":                           self.sheets,
             "sheet_name":                       self.sheet_name,
             "sheet_states":                     self.sheet_states,
-            "redraw_screen_accessory":          self.redraw_screen_accessory,
         }
         return function_data
 
@@ -1277,7 +1273,6 @@ class Picker:
             "centre_in_terminal_vertical",
             "centre_in_cols",
             "centre_in_terminal",
-            "redraw_screen_accessory",
         ]
 
         for var in variables:
@@ -1370,7 +1365,6 @@ class Picker:
             "cancel_is_back": True,
             "number_columns": False,
             "reset_colours": False,
-            "cell_cursor": False,
         }
         while True:
             h, w = stdscr.getmaxyx()
@@ -1390,7 +1384,7 @@ class Picker:
             if s:
                 return {x: options[x] for x in s}, o, f
             return {}, "", f
-
+            
 
 
     def notification(self, stdscr: curses.window, message: str="", title:str="Notification", colours_end: int=0, duration:int=4) -> None:
@@ -1401,12 +1395,7 @@ class Picker:
         message_width = notification_width-5
 
         if not message: message = "!!"
-        if type(message) == type(""):
-            mw = message_width
-            submenu_items = [[message[i*mw:(i+1)*mw]] for i in range(len(message)//mw+1)]
-        elif type(message) != type([]):
-            submenu_items = [["  !!"]]
-
+        submenu_items = ["  "+message[i*message_width:(i+1)*message_width] for i in range(len(message)//message_width+1)]
 
         notification_remap_keys = { 
             curses.KEY_RESIZE: curses.KEY_F5,
@@ -1416,12 +1405,6 @@ class Picker:
             h, w = stdscr.getmaxyx()
 
             submenu_win = curses.newwin(notification_height, notification_width, 3, w - (notification_width+4))
-            # submenu_win = self.stdscr.subwin(notification_height, notification_width, 3, w - (notification_width+4))
-            def update_after_resize():
-                h, w = self.stdscr.getmaxyx()
-                submenu_win.mvwin(3, w - (notification_width+4))
-                self.draw_screen(self.indexed_items, self.highlights)
-                
             notification_data = {
                 "items": submenu_items,
                 "title": title,
@@ -1438,19 +1421,9 @@ class Picker:
                 "cancel_is_back": True,
                 "reset_colours": False,
 
-                "loaded_files": [],
-                "loaded_file_states": [],
-                "loaded_file": "",
-                "loaded_file_index": 0,
-                "cell_cursor": False,
-                # "redraw_screen_accessory": lambda : self.draw_screen(self.indexed_items, self.highlights),
-                "redraw_screen_accessory": update_after_resize,
-                "get_new_data": False,
-                # "key_remappings": notification_remap_keys,
             }
             OptionPicker = Picker(submenu_win, **notification_data)
             s, o, f = OptionPicker.run()
-            os.system(f"notify-send resizing")
 
             if o != "refresh": break
             submenu_win.clear()
@@ -1459,7 +1432,6 @@ class Picker:
             stdscr.clear()
             stdscr.refresh()
             self.draw_screen(self.indexed_items, self.highlights)
-
         # set_colours(colours=get_colours(0))
 
     def toggle_column_visibility(self, col_index:int) -> None:
@@ -2248,6 +2220,13 @@ class Picker:
         # Open tty to accept input
         tty_fd = open_tty()
 
+        h, w = self.stdscr.getmaxyx()
+        def terminal_resized(old_w, old_h) -> bool:
+            w, h = os.get_terminal_size()
+            if old_h != h or old_w != w: return True
+            else: return False
+
+        COLS, LINES = os.get_terminal_size()
         # Main loop
         while True:
             # key = self.stdscr.getch()
@@ -2255,7 +2234,14 @@ class Picker:
             key = get_char(tty_fd, timeout=0.2)
             if key != -1:
                 self.logger.info(f"key={key}")
+
+            self.term_resize_event = terminal_resized(COLS, LINES)
+            COLS, LINES = os.get_terminal_size()
+            if self.term_resize_event: 
+                key = curses.KEY_RESIZE
+
             h, w = self.stdscr.getmaxyx()
+
             if key in self.disabled_keys: continue
             clear_screen=True
 
@@ -3110,7 +3096,7 @@ class Picker:
                 self.logger.info(f"key_function opts_select")
                 s, o, f = self.choose_option(self.stdscr, self.options_list)
                 if self.user_opts.strip(): self.user_opts += " "
-                self.user_opts += " ".join([x for x in s.values()])
+                self.user_opts += " ".join([x[0] for x in s.values()])
             elif self.check_key("notification_toggle", key, self.keys_dict):
                 self.logger.info(f"key_function notification_toggle")
                 self.notification(self.stdscr, colours_end=self.colours_end)

listpick/ui/build_help.py

@@ -7,16 +7,18 @@ Author: GrimAndGreedy
 License: MIT
 """
 
-from listpick.ui.keys import picker_keys
+from listpick.ui.keys import picker_keys, notification_keys
 import curses
 import logging
+from listpick.utils import keycodes
 
 logger = logging.getLogger('picker_log')
 
-def build_help_rows(keys_dict: dict) -> list[list[str]]:
+def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
     """ Build help rows based on the keys_dict. """
 
     logger.info(f"function: build_help_rows() (build_help.py)")
+
     ## Key names
     special_keys = {
 
@@ -35,16 +37,35 @@ def build_help_rows(keys_dict: dict) -> list[list[str]]:
             ord('\n'): "\n",
             curses.KEY_DC: "Delete",
             383: "Shift+Delete",
+            ord("\t"): "Tab",
+            curses.KEY_BACKSPACE: "Backspace",
+            keycodes.META_BS: "Alt+Backspace",
     }
 
     # Ctrl + [a-z]
     for i in range(26):
         special_keys[i+1] = f"Ctrl+{chr(ord('a')+i)}"
+        if i == 8:
+            special_keys[i+1] = f"Tab/Ctrl+{chr(ord('a')+i)}"
+
 
     # F1-F12
     for i in range(12):
         special_keys[curses.KEY_F1+i] = f"F{i+1}"
 
+    # Alt+[a-z]
+    for i in range(26):
+        special_keys[keycodes.META_a +i] = f"Alt+{chr(ord('a')+i)}"
+
+    # Alt+[A-Z]
+    for i in range(26):
+        special_keys[keycodes.META_A +i] = f"Alt+{chr(ord('A')+i)}"
+
+    # Alt+[0-9]
+    for i in range(10):
+        special_keys[keycodes.META_0] = f"Alt+{i}"
+
+
     ## Key descriptions
     help_descriptions = {
         "refresh":                          "Refresh the screen.",
@@ -119,14 +140,16 @@ def build_help_rows(keys_dict: dict) -> list[list[str]]:
         "info":                             "Display info screen.",
         "file_next":                        "Go to the next open file.",
         "file_prev":                        "Go to the previous open file.",
+        "sheet_next":                       "Go to the next sheet.",
+        "sheet_prev":                       "Go to the previous sheet.",
     }
     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" ],
         "Sort:": [ "cycle_sort_method", "cycle_sort_method_reverse", "cycle_sort_order", ] ,
-        "Data manipulation:": [ "delete", "delete_column", "edit", "edit_picker", "edit_ipython", "add_column", "add_row" ],
-        "Filter and sort:": [ "filter_input", "search_input", "continue_search_forward", "continue_search_backward", ] ,
+        "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", "x", "search_input", "continue_search_forward", "continue_search_backward", ] ,
         "Settings:": [ "settings_input", "settings_options" ],
         "Cancel:": [ "opts_input", "opts_select", "mode_next", "mode_prev", "pipe_input", "reset_opts", "col_select", "col_select_next", "col_select_prev", "col_hide" ],
         "Save, load, copy and paste:": [ "save", "load", "open", "copy", "paste" ],
@@ -148,36 +171,48 @@ def build_help_rows(keys_dict: dict) -> list[list[str]]:
         section_rows = []
         
         for operation in section_operations:
-            try:
-                keys = [chr(int(key)) if key not in special_keys else special_keys[key] for key in keys_dict[operation]]
+            keys = []
+            if operation in keys_dict:
+                for key in keys_dict[operation]:
+                    if key in special_keys:
+                        keys.append(special_keys[key])
+                    else:
+                        try:
+                            keys.append(chr(int(key)))
+                        except Exception as e:
+                            keys.append(f"keycode={key}")
+                            if debug: print(f"Error chr({key}): {e}")
+            else:
+                if debug: print(f"Note that {operation} is not in the keys_dict")
+                continue
+
+
+
+            if operation in help_descriptions:
                 description = help_descriptions[operation]
-                row = [f"    {str(keys)[1:-1]}", description]
-                section_rows.append(row)
-            except:
-                pass
+            else:
+                if debug: print(f"Operation={operation} has no description.")
+                description = "..."
+
+            row = [f"    {str(keys)[1:-1]}", description]
+            section_rows.append(row)
         if section_rows:
             items.append([section_name, ""])
             items += section_rows
             items.append(["",""])
 
-    # [[key_name, key_function_description], ...]
-    # for val, keys in keys_dict.items():
-    #     try: 
-    #         row = [[chr(int(key)) if key not in special_keys else special_keys[key] for key in keys], help_descriptions[val]]
-    #         items.append(row)
-    #     except:
-    #         pass
-
     return items
 
 if __name__ == "__main__":
-    from listpick.listpick_app import Picker, start_curses, close_curses
-    items = build_help_rows(picker_keys)
-    stdscr = start_curses()
-    x = Picker(
-        stdscr,
-        items=items
-    )
-    x.run()
-
-    close_curses(stdscr)
+    items = build_help_rows(picker_keys, debug=True)
+    items = build_help_rows(notification_keys, debug=True)
+
+    # from listpick.listpick_app import Picker, start_curses, close_curses
+    # stdscr = start_curses()
+    # x = Picker(
+    #     stdscr,
+    #     items=items
+    # )
+    # x.run()
+    #
+    # close_curses(stdscr)

listpick/ui/footer.py

@@ -85,6 +85,9 @@ class StandardFooter(Footer):
             self.sheets_y -= 1
 
             self.files_y = h-1
+        if state["search_query"] and self.height < 3:
+            self.height = 3
+
 
     def draw(self, h, w):
         state = self.get_state()

{listpick-0.1.14.9.dist-info → listpick-0.1.14.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.14.9
+Version: 0.1.14.11
 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.9.dist-info → listpick-0.1.14.11.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=9urXL8NUghj8tdbUCLxCa48nrgzeW4B41lv0_b_LRAw,187823
+listpick/listpick_app.py,sha256=C17ql0WrRDuNhJs8EitiwR86dxM4uSsy8jof0nBtLU4,187002
 listpick/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-listpick/ui/build_help.py,sha256=8QtsRosIE2IMagRc_remzmwSWpCurFgLenLL7w1ly94,8949
-listpick/ui/footer.py,sha256=ZM5OWCxOZqy5RG6tFTe1ipvu9PRu6Gh3JCA8KXBR_Wc,15004
+listpick/ui/build_help.py,sha256=3cgthxOOBl9evsgea5gVtIacuwbL68_FmtyWyJK6Re8,10142
+listpick/ui/footer.py,sha256=9oJm95pOCxMEoS7Y-77G3D3dPGK4NnsqPMEAtaOpJco,15087
 listpick/ui/help_screen.py,sha256=zbfGIgb-IXtATpl4_Sx7nPbsnRXZ7eiMYlCKGS9EFmw,5608
 listpick/ui/input_field.py,sha256=ylf3fiLXdAD4pueHWfzIrlwaRb9f5zm8f1UGkEPBxgM,30539
 listpick/ui/keys.py,sha256=7ZhJfsSatpk-jwfXj_FvzgQsQdUoF7JkD5Mniu9XZ0o,13328
@@ -25,9 +25,9 @@ listpick/utils/sorting.py,sha256=WZZiVlVA3Zkcpwji3U5SNFlQ14zVEk3cZJtQirBkecQ,532
 listpick/utils/table_to_list_of_lists.py,sha256=XBj7eGBDF15BRME-swnoXyOfZWxXCxrXp0pzsBfcJ5g,12224
 listpick/utils/user_input.py,sha256=oyJZPAwA7UGAclPhdPL44tKnPIVNHWhX-tZEnCdBKC0,4318
 listpick/utils/utils.py,sha256=McOl9uT3jh7l4TIWeSd8ZGjK_e7r0YZF0Gl20yI6fl0,13873
-listpick-0.1.14.9.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
-listpick-0.1.14.9.dist-info/METADATA,sha256=kgR_E4Y4IFLqmrx8nDzgLOvHqW41BPWYuAv_BX8j0bU,8090
-listpick-0.1.14.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-listpick-0.1.14.9.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
-listpick-0.1.14.9.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
-listpick-0.1.14.9.dist-info/RECORD,,
+listpick-0.1.14.11.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
+listpick-0.1.14.11.dist-info/METADATA,sha256=WOGtBxUJ_yXOIssu5d6EiT6NQVOga-EuXFBsmYY9Y9I,8091
+listpick-0.1.14.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+listpick-0.1.14.11.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
+listpick-0.1.14.11.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
+listpick-0.1.14.11.dist-info/RECORD,,