listpick 0.1.16.13__py3-none-any.whl → 0.1.16.15__py3-none-any.whl

listpick/listpick_app.py

@@ -24,7 +24,6 @@ import logging
 import copy
 import tempfile
 import queue
-from listpick.utils.generate_data_utils import ProcessSafePriorityQueue
 
 from listpick.pane.pane_utils import get_file_attributes
 from listpick.pane.left_pane_functions import *
@@ -163,6 +162,7 @@ class Picker:
         reset_colours: bool = True,
         key_remappings: dict = {},
         keys_dict:dict = picker_keys,
+        macros: list = [],
         display_infobox : bool = False,
         infobox_items: list[list[str]] = [],
         infobox_title: str = "",
@@ -316,6 +316,7 @@ class Picker:
         self.reset_colours = reset_colours
         self.key_remappings = key_remappings
         self.keys_dict = keys_dict
+        self.macros = macros
         self.display_infobox = display_infobox
         self.infobox_items = infobox_items
         self.infobox_title = infobox_title
@@ -1129,7 +1130,6 @@ class Picker:
                 cell_value = truncate_to_display_width(cell_value, min(cell_width, cell_max_width), self.centre_in_cols, self.unicode_char_width)
                 if wcswidth(cell_value) + cell_pos > self.term_w:
                     cell_value = truncate_to_display_width(cell_value, self.term_w-cell_pos-10, self.centre_in_cols, self.unicode_char_width)
-
                 self.stdscr.addstr(y, cell_pos, cell_value, colour)
 
             # Part of the cell is on screen
@@ -1148,6 +1148,7 @@ class Picker:
                 pass
 
 
+
         def sort_highlights(highlights):
             """ 
             Sort highlights into lists based on their display level.
@@ -1585,6 +1586,7 @@ class Picker:
             "id_column":                                self.id_column,
             "startup_notification":                     self.startup_notification,
             "keys_dict":                                self.keys_dict,
+            "macros":                                   self.macros,
             "cancel_is_back":                           self.cancel_is_back,
             "paginate":                                 self.paginate,
             "leftmost_char":                            self.leftmost_char,
@@ -2287,6 +2289,19 @@ class Picker:
             return True
         return False
 
+    def check_and_run_macro(self, key: int) -> bool:
+        macro_match = False
+        for macro in self.macros:
+            try:
+                if key in macro["keys"]:
+                    macro_match = True
+                    macro["function"](self)
+                    break
+            except:
+                pass
+        return macro_match
+
+
     def copy_dialogue(self) -> None:
         """ Display dialogue to select how rows/cells should be copied. """
         self.logger.info(f"function: copy_dialogue()")
@@ -2874,6 +2889,7 @@ class Picker:
                         self.refreshing_data = False
                         self.data_ready = False
 
+
             elif self.check_key("refresh", key, self.keys_dict) or self.remapped_key(key, curses.KEY_F5, self.key_remappings) or (self.auto_refresh and (time.time() - self.initial_time) >= self.timer):
                 self.logger.debug(f"Get new data (refresh).")
                 try:
@@ -2928,7 +2944,7 @@ class Picker:
                 self.stdscr.refresh()
                 help_data = {
                     # "items": help_lines,
-                    "items": build_help_rows(self.keys_dict),
+                    "items": build_help_rows(self.keys_dict, self.macros),
                     "title": f"{self.title} Help",
                     "colours_start": self.help_colours_start,
                     "colours": help_colours,
@@ -2952,6 +2968,10 @@ class Picker:
                 s, o, f = OptionPicker.run()
                 self.draw_screen()
 
+            if self.check_and_run_macro(key):
+                self.draw_screen()
+                continue
+
             if self.check_key("info", key, self.keys_dict):
                 self.logger.info(f"key_function help")
                 self.stdscr.clear()
@@ -3139,29 +3159,29 @@ class Picker:
 
             elif self.check_key("settings_options", key, self.keys_dict):
                 options = []
+                options += [["cv", "Centre rows vertically"]]
+                options += [["pc", "Pin cursor to row index during data refresh."]]
+                options += [["ct", "Centre column-set in terminal"]]
+                options += [["cc", "Centre values in cells"]]
+                options += [["!r", "Toggle auto-refresh"]]
+                options += [["th", "Cycle between themes. (accepts th#)"]]
+                options += [["colsel", "Toggle columns."]]
+                options += [["nohl", "Toggle highlights"]]
+                options += [["footer", "Toggle footer"]]
+                options += [["header", "Toggle header"]]
+                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 += [["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."]]
                 if len(self.items) > 0:
-                    options += [["cv", "Centre rows vertically"]]
-                    options += [["pc", "Pin cursor to row index during data refresh."]]
-                    options += [["ct", "Centre column-set in terminal"]]
-                    options += [["cc", "Centre values in cells"]]
-                    options += [["!r", "Toggle auto-refresh"]]
-                    options += [["th", "Cycle between themes. (accepts th#)"]]
-                    options += [["colsel", "Toggle columns."]]
-                    options += [["nohl", "Toggle highlights"]]
-                    options += [["footer", "Toggle footer"]]
-                    options += [["header", "Toggle header"]]
-                    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 += [["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]))]
@@ -3843,7 +3863,7 @@ class Picker:
                     field_prefix=" Command: ",
                     x=lambda:2,
                     y=lambda: self.get_term_size()[0]-2,
-                    literal=True,
+                    literal=False,
                     max_length=field_end_f,
                     registers=self.registers,
                     refresh_screen_function=lambda: self.draw_screen(),
@@ -4575,6 +4595,13 @@ def main() -> None:
             "refresh_time": 1,
         },
     ]
+    function_data["macros"] = [
+        # {
+        #     "keys": [ord('z')],
+        #     "description": "Display message via dbus.",
+        #     "function": lambda picker_obj: os.system("notify-send 'zkey pressed'")
+        # },
+    ]
     # function_data["require_option"] = [True for _ in function_data["items"]]
 
     stdscr = start_curses()

listpick/ui/build_help.py

@@ -14,7 +14,7 @@ from listpick.utils import keycodes
 
 logger = logging.getLogger('picker_log')
 
-def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
+def build_help_rows(keys_dict: dict, macros: list, debug: bool = False) -> list[list[str]]:
     """ Build help rows based on the keys_dict. """
 
     logger.info(f"function: build_help_rows() (build_help.py)")
@@ -173,6 +173,8 @@ def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
         if not found:
             sections["Misc:"].append(key)
 
+    
+
     items = []
     for section_name, section_operations in sections.items():
         section_rows = []
@@ -208,6 +210,26 @@ def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
             items += section_rows
             items.append(["",""])
 
+    if macros:
+        items.append([f"  Macros:", ""])
+        for macro in macros:
+            keys = []
+            for key in macro["keys"]:
+                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}")
+
+            row = [f"    {str(keys)[1:-1]}", macro["description"]]
+            items.append(row)
+        items.append(["",""])
+
+
+
     if debug:
         for operation in keys_dict:
             if operation not in help_descriptions:

listpick/ui/input_field.py

@@ -193,7 +193,6 @@ def input_field(
             match_word, left_ptr, right_ptr = get_partially_complete_word(usrtxt, cursor, [" ", "/", "="])
 
             if match_word in completions:
-                # os.system(f"notify-send '{completions[0]}'")
                 index = completions.index(match_word)
                 if index == len(completions) - 1: index = -1
                 completions_disp_str = str(completions[index:])[:max_field_length]

listpick/ui/keys.py

@@ -52,7 +52,7 @@ picker_keys = {
     "continue_search_backward":         [ord('N')],
     "cancel":                           [27], # Escape key
     "opts_input":                       [keycodes.META_o],
-    "opts_select":                      [ord('o')],
+    # "opts_select":                      [ord('+')],
     "mode_next":                        [9], # Tab key
     "mode_prev":                        [353], # Shift+Tab key
     "pipe_input":                       [ord('|')],
@@ -69,7 +69,7 @@ picker_keys = {
     "paste":                             [ord('p')],
     "save":                             [19, ord('D')],  # Ctrl+s
     "load":                             [15], # Ctrl+o
-    "open":                             [ord('O')], 
+    # "open":                             [ord('O')], 
     "toggle_footer":                    [ord('_')], 
     "notification_toggle":              [ord('z')],
     "redo":                             [ord('.')],
@@ -238,8 +238,8 @@ edit_menu_keys = {
     "continue_search_forward":          [ord('n'), ord('i')],
     "continue_search_backward":         [ord('N'), ord('I')],
     "cancel":                           [27], # Escape key
-    "opts_input":                       [ord(':')],
-    "opts_select":                      [ord('o')],
+    "opts_input":                       [keycodes.META_o],
+    # "opts_select":                      [ord('+')],
     "mode_next":                        [9], # Tab key
     "mode_prev":                        [353], # Shift+Tab key
     "pipe_input":                       [ord('|')],
@@ -254,7 +254,7 @@ edit_menu_keys = {
     "copy":                             [ord('y')],
     "save":                             [19, ord('D')],  # Ctrl+s
     "load":                             [ord('L'), 15], # Ctrl+o
-    "open":                             [ord('O')], 
+    # "open":                             [ord('O')], 
     "toggle_footer":                    [ord('_')], 
     "visual_selection_toggle":          [ord('v')],
     "visual_deselection_toggle":        [ord('V')],

listpick/utils/utils.py

@@ -103,7 +103,12 @@ def format_row(row: list[str], hidden_columns: list, column_widths: list[int], s
 
 def get_column_widths(items: list[list[str]], header: list[str]=[], max_column_width:int=70, number_columns:bool=True, max_total_width=-1, separator = "    ", unicode_char_width: bool = True) -> list[int]:
     """ Calculate maximum width of each column with clipping. """
-    if len(items) == 0: return [0]
+    if len(items) == 0 and len(header) == 0: return [0]
+    elif len(items) == 0:
+        header_widths = [wcswidth(f"{i}. {str(h)}") if number_columns else wcswidth(str(h)) for i, h in enumerate(header)]
+        col_widths =  [min(max_column_width, header_widths[i]) for i in range(len(header))]
+        return col_widths
+
     assert len(items) > 0
     widths = [max(wcswidth(str(row[i])) for row in items) for i in range(len(items[0]))]
     # widths = [max(len(str(row[i])) for row in items) for i in range(len(items[0]))]

{listpick-0.1.16.13.dist-info → listpick-0.1.16.15.dist-info}/METADATA

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

@@ -1,6 +1,6 @@
 listpick/__init__.py,sha256=ExXc97-bibodH--wlwpQivl0zCNR5D1hvpvrf7OBofU,154
 listpick/__main__.py,sha256=wkCjDdqw093W27yWwnlC3nG_sMRKaIad7hHHWy0RBgY,193
-listpick/listpick_app.py,sha256=IECGLycdZb7YDXapnxHzj8wlaVHJJEKZk3m5I675UaM,222093
+listpick/listpick_app.py,sha256=gBHESxkUbEy1-PuFlFW9dem1-dWyazC4LDCUsTQz0fI,222772
 listpick/pane/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/pane/get_data.py,sha256=l12mHIb6qoZWIfW5zZZY8K8EqNcyIcRiHgtRaM2CVGs,2735
 listpick/pane/left_pane_functions.py,sha256=SVIW4Ef8uNPBQRk4hL67mEFL3pfgChSFZSMRz06CVzw,5543
@@ -8,12 +8,12 @@ listpick/pane/pane_functions.py,sha256=_dL9jHpd3sT0enL9H_bMcUsBlMELXdtP9dtKFSC2K
 listpick/pane/pane_functions_1.py,sha256=_dL9jHpd3sT0enL9H_bMcUsBlMELXdtP9dtKFSC2KPQ,5117
 listpick/pane/pane_utils.py,sha256=cnuzBH52wdWoKrHR6iMBF4N-uhwpXYpHDnrglk21pqg,2539
 listpick/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-listpick/ui/build_help.py,sha256=WVxrMaZ94oY32ijb4A3NdxQYDySF_FvygYuqiTHNIsk,11072
+listpick/ui/build_help.py,sha256=wSGeE3tUVWP7D709mb1cDyRU2M0QKVg0mRyTFmcR3fo,11720
 listpick/ui/draw_screen.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/ui/footer.py,sha256=NcdH1uO_ma91m0qCczyQZ3zGrexfkiEnwDf5E4tHSMk,15089
 listpick/ui/help_screen.py,sha256=zbfGIgb-IXtATpl4_Sx7nPbsnRXZ7eiMYlCKGS9EFmw,5608
-listpick/ui/input_field.py,sha256=scJjvmSS0QqeDbCky7_0Zgt35Aki7gezRJkrQROlLg4,30034
-listpick/ui/keys.py,sha256=PN19jCQeXJCdmaP_FT--3TKFZ_8Iv71Pa_yGFp6H3FA,14062
+listpick/ui/input_field.py,sha256=1GUuzMl7P-uw5ijYUOQONMhAzAKoYXRax0-332OroLE,29971
+listpick/ui/keys.py,sha256=7QpG8xEp7kBH9tObTzL-Cmw7i5HTvN6amA3Dd4FmMpE,14077
 listpick/ui/picker_colours.py,sha256=PYWtJEbBCsiM-Gbm83vJiFoIwfKuJuP4SGKxpozszKY,15159
 listpick/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/utils/clipboard_operations.py,sha256=ORdNm2kgGbfs51xJSvgJPERgoSmBgT11axuMkvSoP9A,3133
@@ -34,10 +34,10 @@ listpick/utils/searching.py,sha256=Xk5UIqamNHL2L90z3ACB_Giqdpi9iRKoAJ6pKaqaD7Q,3
 listpick/utils/sorting.py,sha256=WZZiVlVA3Zkcpwji3U5SNFlQ14zVEk3cZJtQirBkecQ,5329
 listpick/utils/table_to_list_of_lists.py,sha256=XBj7eGBDF15BRME-swnoXyOfZWxXCxrXp0pzsBfcJ5g,12224
 listpick/utils/user_input.py,sha256=L3ylI7nnuFM_TP1XKwpiKpxUSkNb2W5cr7mJjTmv_6E,4582
-listpick/utils/utils.py,sha256=jML0lWl1xxrN7olSBiXUWR2ZdcJMrb5FFcweEz7kDiA,13667
-listpick-0.1.16.13.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
-listpick-0.1.16.13.dist-info/METADATA,sha256=6S2mKlbYNClwZJQ-Zz9M3VW6MLe3ZoySrNieroiyKC0,7144
-listpick-0.1.16.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-listpick-0.1.16.13.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
-listpick-0.1.16.13.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
-listpick-0.1.16.13.dist-info/RECORD,,
+listpick/utils/utils.py,sha256=gwonigqPd8nSQBvN6lLDB68kwUzXqWALesZBja-cehU,13956
+listpick-0.1.16.15.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
+listpick-0.1.16.15.dist-info/METADATA,sha256=hR5NhX2q8BTGDj-P0r8gaD0Hh75ZtuddbFRAv34HZjI,7144
+listpick-0.1.16.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+listpick-0.1.16.15.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
+listpick-0.1.16.15.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
+listpick-0.1.16.15.dist-info/RECORD,,