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

listpick/ui/footer.py

@@ -39,39 +39,21 @@ class StandardFooter(Footer):
         self.stdscr = stdscr
         self.colours_start = colours_start
         self.get_state = get_state_function
-        self.height = 3
+
+        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
-        for i in range(3):
-            self.stdscr.addstr(h-3+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))
+        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, 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]}"
@@ -79,20 +61,51 @@ 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
+            self.height = 3
 
         else:
-            select_mode = "Cursor"
-            if state["is_selecting"]: select_mode = "Visual Selection"
-            elif state["is_deselecting"]: select_mode = "Visual deselection"
+            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))
+            self.height = 2
+
+
+        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" {state['cursor_pos']+1}/{len(state['indexed_items'])}  Page {state['cursor_pos']//state['items_per_page']}/{len(state['indexed_items'])}  Selected {selected_count}"
+            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" {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))
+            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()
 

listpick/utils/utils.py

@@ -36,7 +36,7 @@ def clip_left(text, n):
         width += char_width
     return text  # If the total width is less than n, return the full string
 
-def truncate_to_display_width(text: str, max_column_width: int, centre=False, unicode_char_width:bool = True) -> str:
+def truncate_to_display_width(text: str, max_column_width: int, centre=False) -> str:
     """ 
     Truncate and/or pad text to max_column_width using wcwidth to ensure visual width is correct 
         with foreign character sets. 
@@ -46,36 +46,19 @@ def truncate_to_display_width(text: str, max_column_width: int, centre=False, un
 
     """
     # logger.debug("function: truncate_to_display_width (utils.py)")
-    if unicode_char_width:
-        result = ''
-        width = 0
-
-
-        for char in text:
-            w = wcwidth(char)
-            if w < 0:
-                continue
-            if width + w > max_column_width:
-                break
-            result += char
-            width += w
-
-        # test_str = text[:max_column_width]
-        # while True:
-        #     width = wcswidth(test_str)
-        #     if width  < max_column_width or width == 0:
-        #         break
-        #     test_str = test_str[:-1]
-        # result = test_str
-    
-
-        # Pad if it's shorter
-        # padding = max_column_width - wcswidth(result)
-        # return result + ' ' * padding
-    else:
-        result = text[:max_column_width]
-        width = len(result)
-    padding = max_column_width - width
+    result = ''
+    width = 0
+    for char in text:
+        w = wcwidth(char)
+        if w < 0:
+            continue
+        if width + w > max_column_width:
+            break
+        result += char
+        width += w
+    # Pad if it's shorter
+    padding = max_column_width - wcswidth(result)
+    # return result + ' ' * padding
     if centre:
         result = ' '*(padding//2) + result + ' '*(padding//2 + padding%2)
     else:
@@ -100,7 +83,7 @@ def format_full_row(row:str) -> str:
     return '\t'.join(row)
 
 
-def format_row(row: list[str], hidden_columns: list, column_widths: list[int], separator: str, centre:bool=False, unicode_char_width:bool = True) -> str:
+def format_row(row: list[str], hidden_columns: list, column_widths: list[int], separator: str, centre:bool=False) -> str:
     """ Format list of strings as a single string. Requires separator string and the maximum width of the columns. """
     row_str = ""
     for i, cell in enumerate(row):
@@ -108,22 +91,20 @@ def format_row(row: list[str], hidden_columns: list, column_widths: list[int], s
         # if is_formula_cell(cell):
         #     cell = evaluate_cell(cell)
         
-        val = truncate_to_display_width(str(cell), column_widths[i], centre, unicode_char_width)
+        val = truncate_to_display_width(str(cell), column_widths[i], centre)
         row_str += val + separator
     return row_str
+    # return row_str.strip()
 
-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]:
+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 = "    ") -> list[int]:
     """ Calculate maximum width of each column with clipping. """
     if len(items) == 0: return [0]
     assert len(items) > 0
-
-    if unicode_char_width:
-        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]))]
-        if header:
-            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, max(widths[i], header_widths[i])) for i in range(len(header))]
-
+    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]))]
+    if header:
+        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, max(widths[i], header_widths[i])) for i in range(len(header))]
         # actual_max_widths = [max(header_widths[i], widths[i]) for i in range(len(widths))]
         #
         # if sum(col_widths) + len(separator)*(len(col_widths)-1) < max_total_width:
@@ -143,15 +124,8 @@ def get_column_widths(items: list[list[str]], header: list[str]=[], max_column_w
         #     else:
         #         # Maximise balance.....
         #         pass
-        else:
-            col_widths = [min(max_column_width, width) for width in widths]
     else:
-        widths = [max(len(str(row[i])) for row in items) for i in range(len(items[0]))]
-        if header:
-            header_widths = [len(f"{i}. {str(h)}") if number_columns else len(str(h)) for i, h in enumerate(header)]
-            col_widths =  [min(max_column_width, max(widths[i], header_widths[i])) for i in range(len(header))]
-        else:
-            col_widths = [min(max_column_width, width) for width in widths]
+        col_widths = [min(max_column_width, width) for width in widths]
     return col_widths
 
 def get_mode_widths(item_list: list[str]) -> list[int]:

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

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

@@ -1,12 +1,9 @@
 listpick/__init__.py,sha256=ExXc97-bibodH--wlwpQivl0zCNR5D1hvpvrf7OBofU,154
 listpick/__main__.py,sha256=wkCjDdqw093W27yWwnlC3nG_sMRKaIad7hHHWy0RBgY,193
-listpick/listpick_app.py,sha256=6KULvZKkHpI8y0Z48Qo5_hrKfd1S3khdScLLJtlPIjI,166651
-listpick/listpick_app_1.py,sha256=6KULvZKkHpI8y0Z48Qo5_hrKfd1S3khdScLLJtlPIjI,166651
-listpick/lpapp2.py,sha256=x26FOsUPgwjiAecF8gGE8GbfCQF6eJGgf4hccqSZIBU,162376
+listpick/listpick_app.py,sha256=DcijE4rOpAcEF1JE9H6G0iUbDgpYQO5QaSkf2VavfL4,161560
 listpick/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/ui/build_help.py,sha256=_rVKKrX3HfFJtw-pyeNb2lQWbml4-AAw8sZIUYGn97Y,8731
-listpick/ui/footer.py,sha256=Mpn0gFAnX_Ely-Jl5KPP6sdZRnk8makt8EVBh9wdr4Y,10710
-listpick/ui/footer_1.py,sha256=po8abQfaVNoWxYJCw8fENENIdOvNmLIZYfuqTwagz00,10713
+listpick/ui/footer.py,sha256=s1L68MNmhWwbWRy0mn0ChmnE_dMQBAzNlTv917pyHE0,10673
 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
@@ -25,10 +22,10 @@ listpick/utils/search_and_filter_utils.py,sha256=XxGfkyDVXO9OAKcftPat8IReMTFIuTH
 listpick/utils/searching.py,sha256=Xk5UIqamNHL2L90z3ACB_Giqdpi9iRKoAJ6pKaqaD7Q,3093
 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.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,,
+listpick/utils/utils.py,sha256=8nsjjTDQH13tHTU93YcKklLQ_uuMAz-rbDTmao83T4Q,12783
+listpick-0.1.13.56.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
+listpick-0.1.13.56.dist-info/METADATA,sha256=mCnB_Vdd2nwucGm7IdpyuwFJ37RIA0kjEq9kBn6voxI,7988
+listpick-0.1.13.56.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+listpick-0.1.13.56.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
+listpick-0.1.13.56.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
+listpick-0.1.13.56.dist-info/RECORD,,