listpick 0.1.13.53__py3-none-any.whl → 0.1.13.55__py3-none-any.whl

listpick/lpapp2.py

@@ -982,6 +982,7 @@ class Picker:
             disp_string = f" {self.footer_string[:footer_string_width]:>{footer_string_width-2}} "
             self.stdscr.addstr(h - 1, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
             self.stdscr.addstr(h - 1, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))
+            self.stdscr.refresh()
         
         ## Display infobox
         if self.display_infobox:
@@ -1831,7 +1832,7 @@ class Picker:
 
     def get_word_list(self) -> list[str]:
         """ Get a list of all words used in any cell of the picker. Used for completion in search/filter input_field. """
-        self.logger.info(f"function: infobox()")
+        self.logger.info(f"function: get_word_list()")
         translator = str.maketrans('', '', string.punctuation)
         
         words = []

listpick/ui/footer.py

@@ -39,24 +39,39 @@ class StandardFooter(Footer):
         self.stdscr = stdscr
         self.colours_start = colours_start
         self.get_state = get_state_function
-
-        self.height = 2
-        try:
-            state = self.get_state()
-            if "footer_string" in state and state["footer_string"]: self.height = 3
-            else: self.height = 2
-        except:
-            logger.error("Error encountered when running StandardFooter.get_state")
+        self.height = 3
     def draw(self, h, w):
         state = self.get_state()
+
         # Fill background
-        if "footer_string" in state and state["footer_string"]: self.height = 3
-        else: self.height = 2
+        for i in range(3):
+            self.stdscr.addstr(h-3+i, 0, ' '*(w-1), curses.color_pair(self.colours_start+20))
 
-        for i in range(self.height):
-            self.stdscr.addstr(h-self.height+i, 0, ' '*(w-1), curses.color_pair(self.colours_start+20))
+        if state["filter_query"]:
+            self.stdscr.addstr(h - 2, 2, f" Filter: {state['filter_query']} "[:w-40], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
+        if state["search_query"]:
+            self.stdscr.addstr(h - 3, 2, f" Search: {state['search_query']} [{state['search_index']}/{state['search_count']}] "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
+        if state["user_opts"]:
+            self.stdscr.addstr(h - 1, 2, f" Opts: {state['user_opts']} "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
+
+        # Sort info
+        sort_column_info = f"{state['sort_column'] if state['sort_column'] is not None else 'None'}"
+        sort_method_info = f"{state['SORT_METHODS'][state['columns_sort_method'][state['sort_column']]]}" if state['sort_column'] is not None else "NA"
+        sort_order_info = "Desc." if state["sort_reverse"] else "Asc."
+        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}) "
+        self.stdscr.addstr(h - 2, w-35, f"{sort_disp_str:>34}", curses.color_pair(self.colours_start+20))
 
         if state["footer_string"]:
+            # footer_string_width = min(w-1, max(len(state["footer_string"]), 50))
+            # disp_string = f"{state['footer_string'][:footer_string_width]:>{footer_string_width-1}} "
+            # self.stdscr.addstr(h - 1, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
+            # self.stdscr.addstr(h - 1, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))
+
+            # disp_string = f"{footer_string:>{footer_string_width-1}} "
+            # self.stdscr.addstr(h - 1, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
+            # self.stdscr.addstr(h - 1, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))
+
             footer_string_width = min(w-1, len(state["footer_string"])+2)
 
             disp_string = f"{state["footer_string"][:footer_string_width]}"
@@ -64,46 +79,20 @@ class StandardFooter(Footer):
             self.stdscr.addstr(h - 1, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
             self.stdscr.addstr(h - 1, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))
         
-            picker_info_y = h-3
-            sort_info_y = h-2
+
         else:
-            picker_info_y = h-2
-            sort_info_y = h-1
-            select_mode = "C"
-            if state["is_selecting"]: select_mode = "VS"
-            elif state["is_deselecting"]: select_mode = "VDS"
-            if state["pin_cursor"]: select_mode = f"{select_mode} "
+            select_mode = "Cursor"
+            if state["is_selecting"]: select_mode = "Visual Selection"
+            elif state["is_deselecting"]: select_mode = "Visual deselection"
             self.stdscr.addstr(h - 1, w-35, f"{select_mode:>33} ", curses.color_pair(self.colours_start+20))
 
-        if state["filter_query"]:
-            self.stdscr.addstr(h - 2, 2, f" Filter: {state['filter_query']} "[:w-40], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
-        if state["search_query"]:
-            self.stdscr.addstr(h - 3, 2, f" Search: {state['search_query']} [{state['search_index']}/{state['search_count']}] "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
-        if state["user_opts"]:
-            self.stdscr.addstr(h - 1, 2, f" Opts: {state['user_opts']} "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
-
-
-
-        select_mode = "C"
-        if state["is_selecting"]: select_mode = "VS"
-        elif state["is_deselecting"]: select_mode = "VDS"
-        if state["pin_cursor"]: select_mode = f"{select_mode} "
         # Cursor & selection info
         selected_count = sum(state["selections"].values())
         if state["paginate"]:
-            cursor_disp_str = f" [{selected_count}] {state['cursor_pos']+1}/{len(state['indexed_items'])}  Page {state['cursor_pos']//state['items_per_page']}/{len(state['indexed_items'])}"
+            cursor_disp_str = f" {state['cursor_pos']+1}/{len(state['indexed_items'])}  Page {state['cursor_pos']//state['items_per_page']}/{len(state['indexed_items'])}  Selected {selected_count}"
         else:
-            cursor_disp_str = f" [{selected_count}] {state['cursor_pos']+1}/{len(state['indexed_items'])} | {select_mode}"
-        self.stdscr.addstr(picker_info_y, w-35, f"{cursor_disp_str:>33} ", curses.color_pair(self.colours_start+20))
-
-
-        # Sort info
-        sort_column_info = f"{state['sort_column'] if state['sort_column'] is not None else 'None'}"
-        sort_method_info = f"{state['SORT_METHODS'][state['columns_sort_method'][state['sort_column']]]}" if state['sort_column'] is not None else "NA"
-        sort_order_info = "Desc." if state["sort_reverse"] else "Asc."
-        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}) "
-        self.stdscr.addstr(sort_info_y, w-35, f"{sort_disp_str:>34}", curses.color_pair(self.colours_start+20))
+            cursor_disp_str = f" {state['cursor_pos']+1}/{len(state['indexed_items'])}  |  Selected {selected_count}"
+        self.stdscr.addstr(h - 3, w-35, f"{cursor_disp_str:>33} ", curses.color_pair(self.colours_start+20))
 
         self.stdscr.refresh()
 

listpick/ui/footer_1.py

@@ -0,0 +1,213 @@
+"""
+footer.py
+Lines to be displayed on the help screen.
+
+Author: GrimAndGreedy
+License: MIT
+"""
+
+import curses
+import logging
+
+logger = logging.getLogger('picker_log')
+
+class Footer:
+    def __init__(self, stdscr, colours_start, get_state_function):
+        """
+        stdscr: curses screen object
+        colours_start: base colour pair index
+        get_state_callback: function that returns a dict with all required data for rendering
+        """
+        self.stdscr = stdscr
+        self.colours_start = colours_start
+        self.get_state = get_state_function
+        self.height = 0
+
+    def draw(self, h, w):
+        """
+        Draw the footer. Must be implemented by subclasses.
+        """
+        raise NotImplementedError
+
+class StandardFooter(Footer):
+    def __init__(self, stdscr, colours_start, get_state_function):
+        """
+        stdscr: curses screen object
+        colours_start: base colour pair index
+        get_state_callback: function that returns a dict with all required data for rendering
+        """
+        self.stdscr = stdscr
+        self.colours_start = colours_start
+        self.get_state = get_state_function
+
+        self.height = 2
+        try:
+            state = self.get_state()
+            if "footer_string" in state and state["footer_string"]: self.height = 3
+            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
+        if "footer_string" in state and state["footer_string"]: self.height = 3
+        else: self.height = 2
+
+        for i in range(self.height):
+            self.stdscr.addstr(h-self.height+i, 0, ' '*(w-1), curses.color_pair(self.colours_start+20))
+
+        if state["footer_string"]:
+            footer_string_width = min(w-1, len(state["footer_string"])+2)
+
+            disp_string = f"{state["footer_string"][:footer_string_width]}"
+            disp_string = f" {disp_string:>{footer_string_width-2}} "
+            self.stdscr.addstr(h - 1, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
+            self.stdscr.addstr(h - 1, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))
+        
+            picker_info_y = h-3
+            sort_info_y = h-2
+        else:
+            picker_info_y = h-2
+            sort_info_y = h-1
+            select_mode = "C"
+            if state["is_selecting"]: select_mode = "VS"
+            elif state["is_deselecting"]: select_mode = "VDS"
+            if state["pin_cursor"]: select_mode = f"{select_mode} "
+            self.stdscr.addstr(h - 1, w-35, f"{select_mode:>33} ", curses.color_pair(self.colours_start+20))
+
+        if state["filter_query"]:
+            self.stdscr.addstr(h - 2, 2, f" Filter: {state['filter_query']} "[:w-40], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
+        if state["search_query"]:
+            self.stdscr.addstr(h - 3, 2, f" Search: {state['search_query']} [{state['search_index']}/{state['search_count']}] "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
+        if state["user_opts"]:
+            self.stdscr.addstr(h - 1, 2, f" Opts: {state['user_opts']} "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
+
+
+
+        select_mode = "C"
+        if state["is_selecting"]: select_mode = "VS"
+        elif state["is_deselecting"]: select_mode = "VDS"
+        if state["pin_cursor"]: select_mode = f"{select_mode} "
+        # Cursor & selection info
+        selected_count = sum(state["selections"].values())
+        if state["paginate"]:
+            cursor_disp_str = f" [{selected_count}] {state['cursor_pos']+1}/{len(state['indexed_items'])}  Page {state['cursor_pos']//state['items_per_page']}/{len(state['indexed_items'])}"
+        else:
+            cursor_disp_str = f" [{selected_count}] {state['cursor_pos']+1}/{len(state['indexed_items'])} | {select_mode}"
+        self.stdscr.addstr(picker_info_y, w-35, f"{cursor_disp_str:>33} ", curses.color_pair(self.colours_start+20))
+
+
+        # Sort info
+        sort_column_info = f"{state['sort_column'] if state['sort_column'] is not None else 'None'}"
+        sort_method_info = f"{state['SORT_METHODS'][state['columns_sort_method'][state['sort_column']]]}" if state['sort_column'] is not None else "NA"
+        sort_order_info = "Desc." if state["sort_reverse"] else "Asc."
+        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}) "
+        self.stdscr.addstr(sort_info_y, w-35, f"{sort_disp_str:>34}", curses.color_pair(self.colours_start+20))
+
+        # self.stdscr.refresh()
+
+
+
+class CompactFooter(Footer):
+    def __init__(self, stdscr, colours_start, get_state_function):
+        """
+        stdscr: curses screen object
+        colours_start: base colour pair index
+        get_state_callback: function that returns a dict with all required data for rendering
+        """
+        self.stdscr = stdscr
+        self.colours_start = colours_start
+        self.get_state = get_state_function
+        self.height = 1
+
+    def draw(self, h, w):
+        state = self.get_state()
+
+        # Fill background
+        if state["search_query"]: self.height = 3
+        elif state["filter_query"]: self.height = 2
+        elif state["user_opts"]: self.height = 1
+        elif state["footer_string"]: self.height = 2
+        else: self.height = 1
+        for i in range(self.height):
+            self.stdscr.addstr(h-(i+1), 0, ' '*(w-1), curses.color_pair(self.colours_start+20))
+
+        if state["user_opts"]:
+            self.stdscr.addstr(h - 1, 2, f" Opts: {state['user_opts']} "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
+        if state["filter_query"]:
+            self.stdscr.addstr(h - 2, 2, f" Filter: {state['filter_query']} "[:w-40], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
+        if state["search_query"]:
+            self.stdscr.addstr(h - 3, 2, f" Search: {state['search_query']} [{state['search_index']}/{state['search_count']}] "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
+
+        right_width = 40
+        # Sort info
+        sort_column_info = f"{state['sort_column'] if state['sort_column'] is not None else 'None'}"
+        sort_method_info = f"{state['SORT_METHODS'][state['columns_sort_method'][state['sort_column']]]}" if state['sort_column'] is not None else "NA"
+        sort_order_info = "Desc." if state["sort_reverse"][state['sort_column']] else "Asc."
+        sort_order_info = "▼" if state["sort_reverse"][state['sort_column']] else "▲"
+        sort_disp_str = f" ({sort_column_info}, {sort_method_info}, {sort_order_info}) "
+        # self.stdscr.addstr(h - 2, w-right_width, f"{sort_disp_str:>{right_width-1}}", curses.color_pair(self.colours_start+20))
+
+        if state["footer_string"]:
+            footer_string_width = min(w-1, len(state["footer_string"])+2)
+
+            disp_string = f"{state["footer_string"][:footer_string_width]}"
+            disp_string = f" {disp_string:>{footer_string_width-2}} "
+            self.stdscr.addstr(h - 1, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
+            self.stdscr.addstr(h - 1, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))
+            selected_count = sum(state["selections"].values())
+            if state["paginate"]:
+                cursor_disp_str = f" {state['cursor_pos']+1}/{len(state['indexed_items'])}  Page {state['cursor_pos']//state['items_per_page']}/{len(state['indexed_items'])}  Selected {selected_count}"
+            else:
+                cursor_disp_str = f"{sort_disp_str} [{selected_count}] {state['cursor_pos']+1}/{len(state['indexed_items'])}"
+            self.stdscr.addstr(h-2, w-right_width, f"{cursor_disp_str:>{right_width-2}}"[:right_width-1], curses.color_pair(self.colours_start+20))
+        else:
+            # Cursor & selection info
+            selected_count = sum(state["selections"].values())
+            if state["paginate"]:
+                cursor_disp_str = f" {state['cursor_pos']+1}/{len(state['indexed_items'])}  Page {state['cursor_pos']//state['items_per_page']}/{len(state['indexed_items'])}  Selected {selected_count}"
+            else:
+                cursor_disp_str = f"{sort_disp_str} [{selected_count}] {state['cursor_pos']+1}/{len(state['indexed_items'])}"
+            self.stdscr.addstr(h - 1, w-right_width, f"{cursor_disp_str:>{right_width-2}}"[:right_width-1], curses.color_pair(self.colours_start+20))
+
+        self.stdscr.refresh()
+
+class NoFooter(Footer):
+    def __init__(self, stdscr, colours_start, get_state_function):
+        """
+        stdscr: curses screen object
+        colours_start: base colour pair index
+        get_state_callback: function that returns a dict with all required data for rendering
+        """
+        self.stdscr = stdscr
+        self.colours_start = colours_start
+        self.get_state = get_state_function
+        self.height = 0
+    def draw(self, h, w):
+        state = self.get_state()
+
+        if state["search_query"]: self.height = 3
+        elif state["filter_query"]: self.height = 2
+        elif state["user_opts"]: self.height = 1
+        elif state["footer_string"]: self.height = 1
+        else: self.height = 0
+
+        for i in range(self.height):
+            self.stdscr.addstr(h-(i+1), 0, ' '*(w-1), curses.color_pair(self.colours_start+20))
+
+        if state["user_opts"]:
+            self.stdscr.addstr(h - 1, 2, f" Opts: {state['user_opts']} "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
+        if state["filter_query"]:
+            self.stdscr.addstr(h - 2, 2, f" Filter: {state['filter_query']} "[:w-40], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
+        if state["search_query"]:
+            self.stdscr.addstr(h - 3, 2, f" Search: {state['search_query']} [{state['search_index']}/{state['search_count']}] "[:w-3], curses.color_pair(self.colours_start+20) | curses.A_BOLD)
+            self.height = 3
+
+
+        if state["footer_string"]:
+            footer_string_width = min(w-1, len(state["footer_string"])+2)
+            disp_string = f"{state["footer_string"][:footer_string_width]}"
+            disp_string = f" {disp_string:>{footer_string_width-2}} "
+            self.stdscr.addstr(h - 1, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
+            self.stdscr.addstr(h - 1, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))

{listpick-0.1.13.53.dist-info → listpick-0.1.13.55.dist-info}/METADATA

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

@@ -1,10 +1,12 @@
 listpick/__init__.py,sha256=ExXc97-bibodH--wlwpQivl0zCNR5D1hvpvrf7OBofU,154
 listpick/__main__.py,sha256=wkCjDdqw093W27yWwnlC3nG_sMRKaIad7hHHWy0RBgY,193
-listpick/listpick_app.py,sha256=2IsS_RDJuGQkdYUwMU6bikLFmX6BjpEEx_jH-Ibzn34,166649
-listpick/lpapp2.py,sha256=kBfQ-GUmPpfLAGs0y2yukJ7RWRkYQ6dGJNC52yqSrz8,162336
+listpick/listpick_app.py,sha256=6KULvZKkHpI8y0Z48Qo5_hrKfd1S3khdScLLJtlPIjI,166651
+listpick/listpick_app_1.py,sha256=6KULvZKkHpI8y0Z48Qo5_hrKfd1S3khdScLLJtlPIjI,166651
+listpick/lpapp2.py,sha256=x26FOsUPgwjiAecF8gGE8GbfCQF6eJGgf4hccqSZIBU,162376
 listpick/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/ui/build_help.py,sha256=_rVKKrX3HfFJtw-pyeNb2lQWbml4-AAw8sZIUYGn97Y,8731
-listpick/ui/footer.py,sha256=4PO7gS-NSk6zfc2DAwSFPU6Ch_HYfu0L_57u93zfyjk,10711
+listpick/ui/footer.py,sha256=Mpn0gFAnX_Ely-Jl5KPP6sdZRnk8makt8EVBh9wdr4Y,10710
+listpick/ui/footer_1.py,sha256=po8abQfaVNoWxYJCw8fENENIdOvNmLIZYfuqTwagz00,10713
 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=TzaadgBP_rC7jbp--RFJZDOkHd0EB4K1wToDTiVs6CI,13029
@@ -24,9 +26,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=T-i-nV1p6g8UagdgUPKrhIGpKY_YXZDxf4xZzcPepNA,7635
 listpick/utils/utils.py,sha256=bEE7-g3cyZd4QFHOxo4P6lXmuo0NwHTS_ovFC92po5w,13826
-listpick-0.1.13.53.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
-listpick-0.1.13.53.dist-info/METADATA,sha256=FGzwiD0KGQYItplYcU0EIeavgNDpoOnx_rQ_5PTO6Qk,7988
-listpick-0.1.13.53.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-listpick-0.1.13.53.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
-listpick-0.1.13.53.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
-listpick-0.1.13.53.dist-info/RECORD,,
+listpick-0.1.13.55.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
+listpick-0.1.13.55.dist-info/METADATA,sha256=tfHsx31zDd3hpMCp1sGgTnVci5PrrOegqUVfswqPJoo,7988
+listpick-0.1.13.55.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+listpick-0.1.13.55.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
+listpick-0.1.13.55.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
+listpick-0.1.13.55.dist-info/RECORD,,