listpick 0.1.15.19__py3-none-any.whl → 0.1.16.17__py3-none-any.whl

listpick/pane/get_data.py

@@ -8,6 +8,8 @@ Author: GrimAndGreedy
 License: MIT
 """
 
+from listpick.pane.pane_utils import get_file_attributes
+
 def data_refresh_randint_by_row(data, state):
     """
     Add a random number to the data if row id is the same.
@@ -93,3 +95,21 @@ def get_dl(data, state):
         data[0].append(data[0][-1]+1)
         data[1].append(dl)
     return data
+
+
+def update_file_attributes(data, state):
+    """
+    Get file attributes
+
+    data[0]: ["size: {}", filetype: {}, last modified: {}]
+    ]
+    data[1]: id
+    """
+    if state["indexed_items"]:
+        # id = state["indexed_items"][state["cursor_pos"]][1][state["id_column"]]
+        id = state["indexed_items"][state["cursor_pos"]][1][0]
+    else:
+        return [[], -1]
+    return [get_file_attributes(id), id]
+    
+

listpick/pane/left_pane_functions.py

@@ -0,0 +1,198 @@
+#!/bin/python
+# -*- coding: utf-8 -*-
+"""
+pane_functions.py
+Functions which are run by a listpick Picker to display data in a pane.
+
+Author: GrimAndGreedy
+License: MIT
+"""
+
+import curses
+import os
+from listpick.pane.pane_utils import get_file_attributes, get_graph_string, escape_ansi
+from listpick.pane.get_data import update_file_attributes
+
+def left_start_pane(stdscr, x, y, w, h, state, row, cell, data: list = [], test: bool = False):
+    """
+    Display file attributes in right pane.
+    """
+    if test: return True
+
+    # Title
+    for i in range(h):
+        s = '*'*w
+        stdscr.addstr(y+i, x, s)
+
+
+    stdscr.addstr(y, x, "+")
+    stdscr.addstr(y+h-1, x, "+")
+    stdscr.addstr(y, x+w-1, "+")
+    stdscr.addstr(y+h-1, x+w-1, "+")
+
+
+    stdscr.addstr(y+1, x, f"{w},{h}")
+
+    return []
+
+
+def left_split_file_attributes(stdscr, x, y, w, h, state, row, cell, data: list = [], test: bool = False):
+    """
+    Display file attributes in right pane.
+    """
+    if test: return True
+
+    # Title
+    title = "File attributes"
+    if len(title) < w: title = f"{title:^{w}}"
+    stdscr.addstr(y, x,title[:w], curses.color_pair(state["colours_start"]+4) | curses.A_BOLD)
+
+    # Separator
+    for j in range(h):
+        stdscr.addstr(j+y, x+w-1, ' ', curses.color_pair(state["colours_start"]+16))
+
+    # Display pane count
+    pane_count = len(state["right_panes"])
+    pane_index = state["right_pane_index"]
+    if pane_count > 1:
+        s = f" {pane_index+1}/{pane_count} "
+        stdscr.addstr(y+h-1, x, s, curses.color_pair(state["colours_start"]+20))
+
+    # Filename/cursor cell value
+    stdscr.addstr(y+2, x+2, cell[:w-3])
+
+    attributes = get_file_attributes(cell)
+    for i, attr in enumerate(attributes):
+        stdscr.addstr(y+3+i, x+4, attr[:w-5])
+
+    return []
+
+
+def left_split_file_attributes_dynamic(stdscr, x, y, w, h, state, row, cell, data: list = [], test: bool = False):
+    """
+    Display file attributes in right pane.
+    """
+    if test: return True
+
+    # Title
+    title = "File attributes"
+    if len(title) < w: title = f"{title:^{w}}"
+    stdscr.addstr(y, x,title[:w], curses.color_pair(state["colours_start"]+4) | curses.A_BOLD)
+
+    # Separator
+    for j in range(h):
+        stdscr.addstr(j+y, x+w-1, ' ', curses.color_pair(state["colours_start"]+16))
+
+    # Display pane count
+    pane_count = len(state["right_panes"])
+    pane_index = state["right_pane_index"]
+    if pane_count > 1:
+        s = f" {pane_index+1}/{pane_count} "
+        stdscr.addstr(y+h-1, x, s, curses.color_pair(state["colours_start"]+20))
+
+    if len(state["indexed_items"]) == 0:
+        return []
+
+    # Filename/cursor cell value
+    stdscr.addstr(y+2, x+2, cell[:w-3])
+
+    # If the cursor-hovered file is different then reload the data
+    if data[1] != cell:
+        data[:] = update_file_attributes(data, state)
+
+    # attributes = get_file_attributes(cell)
+    if len(data)  == 0: return []
+    attributes = data[0]
+    for i, attr in enumerate(attributes):
+        stdscr.addstr(y+3+i, x+4, attr[:w-5])
+
+    return []
+
+def left_split_graph(stdscr, x, y, w, h, state, row, cell, data: list = [], test: bool = False):
+    """
+    Display a graph of the data in right pane.
+
+    data[0] = x_vals
+    data[1] = y_vals
+    data[2] = id
+    """
+    if test: return True
+
+    # Title
+    title = "Graph"
+    if len(title) < w: title = f"{title:^{w}}"
+    stdscr.addstr(y, x,title[:w], curses.color_pair(state["colours_start"]+4) | curses.A_BOLD)
+
+    # Separator
+    for j in range(h):
+        stdscr.addstr(j+y, x+w-1, ' ', curses.color_pair(state["colours_start"]+16))
+
+
+    # Display pane count
+    pane_count = len(state["right_panes"])
+    pane_index = state["right_pane_index"]
+    if pane_count > 1:
+        s = f" {pane_index+1}/{pane_count} "
+        stdscr.addstr(y+h-1, x, s, curses.color_pair(state["colours_start"]+20))
+
+    try:
+        import plotille as plt
+    except:
+        s = f"No module named 'plotille'"
+        stdscr.addstr(y+2, x+1, s[:w-2])
+        return None
+
+
+
+    # x_vals, y_vals = list(range(100)), [x**2 for x in range(100)]
+    if data in [[], {}, None]:
+        return None
+    x_vals, y_vals = data[0], data[1]
+    graph_str = get_graph_string(x_vals, y_vals, width=w-3-10, height=h-3)
+    for i, s in enumerate(graph_str.split("\n")):
+        s = escape_ansi(s)
+        stdscr.addstr(y+2+i, x+1, s[:w-2])
+
+    return []
+
+
+
+
+def left_split_display_list(stdscr, x, y, w, h, state, row, cell, data: list = [], test: bool = False):
+    """
+    data[0]:str = title
+    data[1]:list[str] = list of strings to display
+    """
+    if test: return True
+
+    # Title
+    title = data[0]
+    if len(title) < w: title = f"{title:^{w}}"
+    stdscr.addstr(y, x,title[:w], curses.color_pair(state["colours_start"]+4) | curses.A_BOLD)
+
+    # Separator
+    for j in range(h):
+        stdscr.addstr(j+y, x+w-1, ' ', curses.color_pair(state["colours_start"]+16))
+
+
+    # Display pane count
+    pane_count = len(state["right_panes"])
+    pane_index = state["right_pane_index"]
+    if pane_count > 1:
+        s = f" {pane_index+1}/{pane_count} "
+        stdscr.addstr(y+h-1, x, s, curses.color_pair(state["colours_start"]+20))
+
+    if data in [[], {}, None]:
+        return None
+
+    items = data[1]
+    number_to_display = min(len(items), h-3)
+    for i in range(number_to_display):
+        s = items[i]
+        stdscr.addstr(y+1+i, x+2, s[:w-2])
+
+    if number_to_display < len(items):
+        stdscr.addstr(y+1+number_to_display, x+2, f" ... {len(items)-number_to_display} more"[:w-2])
+
+
+    return []

listpick/pane/pane_functions.py

@@ -11,15 +11,14 @@ License: MIT
 import curses
 import os
 from listpick.pane.pane_utils import get_file_attributes, get_graph_string, escape_ansi
+from listpick.pane.get_data import update_file_attributes
 
-def right_split_file_attributes(stdscr, x, y, w, h, state, row, cell, past_data: list = [], data: list = [], test: bool = False):
+def right_split_file_attributes(stdscr, x, y, w, h, state, row, cell, data: list = [], test: bool = False):
     """
     Display file attributes in right pane.
     """
     if test: return True
 
-    os.chdir(os.path.expanduser("~/Downloads/new"))
-
     # Title
     title = "File attributes"
     if len(title) < w: title = f"{title:^{w}}"
@@ -45,7 +44,48 @@ def right_split_file_attributes(stdscr, x, y, w, h, state, row, cell, past_data:
 
     return []
 
-def right_split_graph(stdscr, x, y, w, h, state, row, cell, past_data: list = [], data: list = [], test: bool = False):
+
+def right_split_file_attributes_dynamic(stdscr, x, y, w, h, state, row, cell, data: list = [], test: bool = False):
+    """
+    Display file attributes in right pane.
+    """
+    if test: return True
+
+    # Title
+    title = "File attributes"
+    if len(title) < w: title = f"{title:^{w}}"
+    stdscr.addstr(y, x,title[:w], curses.color_pair(state["colours_start"]+4) | curses.A_BOLD)
+
+    # Separator
+    for j in range(h):
+        stdscr.addstr(j+y, x, ' ', curses.color_pair(state["colours_start"]+16))
+
+    # Display pane count
+    pane_count = len(state["right_panes"])
+    pane_index = state["right_pane_index"]
+    if pane_count > 1:
+        s = f" {pane_index+1}/{pane_count} "
+        stdscr.addstr(y+h-1, x+w-len(s)-1, s, curses.color_pair(state["colours_start"]+20))
+
+    if len(state["indexed_items"]) == 0:
+        return []
+
+    # Filename/cursor cell value
+    stdscr.addstr(y+2, x+2, cell[:w-3])
+
+    # If the cursor-hovered file is different then reload the data
+    if data[1] != cell:
+        data[:] = update_file_attributes(data, state)
+
+    # attributes = get_file_attributes(cell)
+    if len(data)  == 0: return []
+    attributes = data[0]
+    for i, attr in enumerate(attributes):
+        stdscr.addstr(y+3+i, x+4, attr[:w-5])
+
+    return []
+
+def right_split_graph(stdscr, x, y, w, h, state, row, cell, data: list = [], test: bool = False):
     """
     Display a graph of the data in right pane.
 
@@ -95,7 +135,7 @@ def right_split_graph(stdscr, x, y, w, h, state, row, cell, past_data: list = []
 
 
 
-def right_split_display_list(stdscr, x, y, w, h, state, row, cell, past_data: list = [], data: list = [], test: bool = False):
+def right_split_display_list(stdscr, x, y, w, h, state, row, cell, data: list = [], test: bool = False):
     """
     data[0]:str = title
     data[1]:list[str] = list of strings to display

listpick/pane/pane_functions_1.py

@@ -0,0 +1,175 @@
+#!/bin/python
+# -*- coding: utf-8 -*-
+"""
+pane_functions.py
+Functions which are run by a listpick Picker to display data in a pane.
+
+Author: GrimAndGreedy
+License: MIT
+"""
+
+import curses
+import os
+from listpick.pane.pane_utils import get_file_attributes, get_graph_string, escape_ansi
+from listpick.pane.get_data import update_file_attributes
+
+def right_split_file_attributes(stdscr, x, y, w, h, state, row, cell, data: list = [], test: bool = False):
+    """
+    Display file attributes in right pane.
+    """
+    if test: return True
+
+    # Title
+    title = "File attributes"
+    if len(title) < w: title = f"{title:^{w}}"
+    stdscr.addstr(y, x,title[:w], curses.color_pair(state["colours_start"]+4) | curses.A_BOLD)
+
+    # Separator
+    for j in range(h):
+        stdscr.addstr(j+y, x, ' ', curses.color_pair(state["colours_start"]+16))
+
+    # Display pane count
+    pane_count = len(state["right_panes"])
+    pane_index = state["right_pane_index"]
+    if pane_count > 1:
+        s = f" {pane_index+1}/{pane_count} "
+        stdscr.addstr(y+h-1, x+w-len(s)-1, s, curses.color_pair(state["colours_start"]+20))
+
+    # Filename/cursor cell value
+    stdscr.addstr(y+2, x+2, cell[:w-3])
+
+    attributes = get_file_attributes(cell)
+    for i, attr in enumerate(attributes):
+        stdscr.addstr(y+3+i, x+4, attr[:w-5])
+
+    return []
+
+
+def right_split_file_attributes_dynamic(stdscr, x, y, w, h, state, row, cell, data: list = [], test: bool = False):
+    """
+    Display file attributes in right pane.
+    """
+    if test: return True
+
+    # Title
+    title = "File attributes"
+    if len(title) < w: title = f"{title:^{w}}"
+    stdscr.addstr(y, x,title[:w], curses.color_pair(state["colours_start"]+4) | curses.A_BOLD)
+
+    # Separator
+    for j in range(h):
+        stdscr.addstr(j+y, x, ' ', curses.color_pair(state["colours_start"]+16))
+
+    # Display pane count
+    pane_count = len(state["right_panes"])
+    pane_index = state["right_pane_index"]
+    if pane_count > 1:
+        s = f" {pane_index+1}/{pane_count} "
+        stdscr.addstr(y+h-1, x+w-len(s)-1, s, curses.color_pair(state["colours_start"]+20))
+
+    if len(state["indexed_items"]) == 0:
+        return []
+
+    # Filename/cursor cell value
+    stdscr.addstr(y+2, x+2, cell[:w-3])
+
+    # If the cursor-hovered file is different then reload the data
+    if data[1] != cell:
+        data[:] = update_file_attributes(data, state)
+
+    # attributes = get_file_attributes(cell)
+    if len(data)  == 0: return []
+    attributes = data[0]
+    for i, attr in enumerate(attributes):
+        stdscr.addstr(y+3+i, x+4, attr[:w-5])
+
+    return []
+
+def right_split_graph(stdscr, x, y, w, h, state, row, cell, data: list = [], test: bool = False):
+    """
+    Display a graph of the data in right pane.
+
+    data[0] = x_vals
+    data[1] = y_vals
+    data[2] = id
+    """
+    if test: return True
+
+    # Title
+    title = "Graph"
+    if len(title) < w: title = f"{title:^{w}}"
+    stdscr.addstr(y, x,title[:w], curses.color_pair(state["colours_start"]+4) | curses.A_BOLD)
+
+    # Separator
+    for j in range(h):
+        stdscr.addstr(j+y, x, ' ', curses.color_pair(state["colours_start"]+16))
+
+
+    # Display pane count
+    pane_count = len(state["right_panes"])
+    pane_index = state["right_pane_index"]
+    if pane_count > 1:
+        s = f" {pane_index+1}/{pane_count} "
+        stdscr.addstr(y+h-1, x+w-len(s)-1, s, curses.color_pair(state["colours_start"]+20))
+
+    try:
+        import plotille as plt
+    except:
+        s = f"No module named 'plotille'"
+        stdscr.addstr(y+2, x+2, s[:w-2])
+        return None
+
+
+
+    # x_vals, y_vals = list(range(100)), [x**2 for x in range(100)]
+    if data in [[], {}, None]:
+        return None
+    x_vals, y_vals = data[0], data[1]
+    graph_str = get_graph_string(x_vals, y_vals, width=w-3-10, height=h-3)
+    for i, s in enumerate(graph_str.split("\n")):
+        s = escape_ansi(s)
+        stdscr.addstr(y+2+i, x+2, s[:w-2])
+
+    return []
+
+
+
+
+def right_split_display_list(stdscr, x, y, w, h, state, row, cell, data: list = [], test: bool = False):
+    """
+    data[0]:str = title
+    data[1]:list[str] = list of strings to display
+    """
+    if test: return True
+
+    # Title
+    title = data[0]
+    if len(title) < w: title = f"{title:^{w}}"
+    stdscr.addstr(y, x,title[:w], curses.color_pair(state["colours_start"]+4) | curses.A_BOLD)
+
+    # Separator
+    for j in range(h):
+        stdscr.addstr(j+y, x, ' ', curses.color_pair(state["colours_start"]+16))
+
+
+    # Display pane count
+    pane_count = len(state["right_panes"])
+    pane_index = state["right_pane_index"]
+    if pane_count > 1:
+        s = f" {pane_index+1}/{pane_count} "
+        stdscr.addstr(y+h-1, x+w-len(s)-1, s, curses.color_pair(state["colours_start"]+20))
+
+    if data in [[], {}, None]:
+        return None
+
+    items = data[1]
+    number_to_display = min(len(items), h-3)
+    for i in range(number_to_display):
+        s = items[i]
+        stdscr.addstr(y+1+i, x+2, s[:w-2])
+
+    if number_to_display < len(items):
+        stdscr.addstr(y+1+number_to_display, x+2, f" ... {len(items)-number_to_display} more"[:w-2])
+
+
+    return []

listpick/pane/pane_utils.py

@@ -41,9 +41,9 @@ def get_graph_string(x_vals, y_vals, width=50, height=20, title=None, x_label=No
         fig.ylabel = y_label
     
     # Generate the ASCII art of the graph
-    ascii_art = str(fig.show())
+    graph_str = str(fig.show())
     
-    return ascii_art
+    return graph_str
 
 
 def get_file_attributes(filename):
@@ -83,6 +83,6 @@ def get_file_attributes(filename):
         return attributes
     
     except Exception as e:
-        print(f"An error occurred: {e}")
+        # print(f"An error occurred: {e}")
         return []
 

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)")
@@ -68,7 +68,7 @@ def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
 
     ## Key descriptions
     help_descriptions = {
-        "refresh":                          "Refresh the screen.",
+        "refresh":                          "Refresh data.",
         "help":                             "Open help.",
         "exit":                             "Exit picker instance.",
         "full_exit":                        "Immediate exit to terminal.",
@@ -117,9 +117,10 @@ def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
         "col_select_next":                  "Select next column.",
         "col_select_prev":                  "Select previous column.",
         "col_hide":                         "Hide column.",
-        "edit":                             "Edit cell.",
-        "edit_picker":                      "Edit cell from options dialogue.",
-        "edit_ipython":                     "Edit current data with ipython.",
+        "edit":                             "Edit (editable) cell.",
+        "edit_nvim":                        "Edit (editable) cell(s) in nvim.",
+        "edit_picker":                      "Edit (editable) cell from options dialogue.",
+        "edit_ipython":                     "Drop to ipython shell with environment as `self`",
         "copy":                             "Copy selections.",
         "paste":                            "Paste into picker.",
         "save":                             "Save selections.",
@@ -131,8 +132,8 @@ def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
         "undo":                             "Undo.",
         "scroll_right":                     "Scroll right (5 chars).",
         "scroll_left":                      "Scroll left (5 chars).",
-        "scroll_right_25":                     "Scroll right (25 chars).",
-        "scroll_left_25":                      "Scroll left (25 chars).",
+        "scroll_right_25":                  "Scroll right (25 chars).",
+        "scroll_left_25":                   "Scroll left (25 chars).",
         "scroll_far_right":                 "Scroll to the end of the column set.",
         "scroll_far_left":                  "Scroll to the left home.",
         "add_column_before":                "Insert column before cursor.",
@@ -145,17 +146,19 @@ def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
         "sheet_next":                       "Go to the next sheet.",
         "sheet_prev":                       "Go to the previous sheet.",
         "toggle_right_pane":                "Toggle the right pane",
-        "cycle_right_pane":                 "Cycle through right panes",
+        "cycle_right_pane":                 "Cycle through right pane views",
+        "toggle_left_pane":                 "Toggle the left pane",
+        "cycle_left_pane":                  "Cycle through left pane views",
     }
     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_right_25", "scroll_left_25", "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", "toggle_right_pane", "cycle_right_pane"],
+        "UI:": [ "toggle_footer", "redraw_screen", "decrease_lines_per_page", "increase_lines_per_page", "increase_column_width", "decrease_column_width", "notification_toggle", "toggle_right_pane", "cycle_right_pane", "toggle_left_pane", "cycle_left_pane"],
         "Sort:": [ "cycle_sort_method", "cycle_sort_method_reverse", "cycle_sort_order", ] ,
-        "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", "search_input", "continue_search_forward", "continue_search_backward", ] ,
+        "Data manipulation:": [ "delete", "delete_column", "edit", "edit_nvim", "edit_picker", "edit_ipython", "add_column_before", "add_column_after", "add_row_before", "add_row_after"],
+        "Filter and search:": [ "filter_input", "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" ],
+        "Options and modes:": [ "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" ],
         "Misc:": [ "redo", "undo", "refresh", "help", "exit", "full_exit", "move_column_left", "move_column_right" ],
     }
@@ -170,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 = []
@@ -205,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/footer.py

@@ -160,7 +160,7 @@ class StandardFooter(Footer):
         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"{state['footer_string'][:footer_string_width]}"
             disp_string = f" {disp_string:>{footer_string_width-2}} "
             self.stdscr.addstr(self.footer_string_y, w-footer_string_width-1, " "*footer_string_width, curses.color_pair(self.colours_start+24))
             self.stdscr.addstr(self.footer_string_y, w-footer_string_width-1, f"{disp_string}", curses.color_pair(self.colours_start+24))
@@ -259,7 +259,7 @@ class CompactFooter(Footer):
         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"{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))
@@ -318,7 +318,7 @@ class NoFooter(Footer):
 
         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"{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/ui/input_field.py

@@ -16,27 +16,9 @@ from datetime import datetime
 import logging
 
 logger = logging.getLogger('picker_log')
-import select
-import tty
 from listpick.utils.user_input import get_char, open_tty
 from listpick.utils import keycodes
 
-# def open_tty():
-#     """ Return a file descriptor for the tty that we are opening"""
-#     tty_fd = os.open('/dev/tty', os.O_RDONLY)
-#     tty.setraw(tty_fd)
-#     return tty_fd
-#
-# def get_char(tty_fd, timeout: float = 0.2) -> int:
-#     """ Get character from a tty_fd with a timeout. """
-#     rlist, _, _ = select.select([tty_fd], [], [], timeout)
-#     if rlist:
-#         # key = ord(tty_fd.read(1))
-#         key = ord(os.read(tty_fd, 1))
-#     else:
-#         key = -1
-#     return key
-    
 def input_field(
     stdscr: curses.window,
     usrtxt:str="",
@@ -126,7 +108,7 @@ def input_field(
     offscreen_x, offscreen_y = False, False
     orig_x, orig_y = x, y
 
-    tty_fd = open_tty()
+    tty_fd, saved_terminal_state = open_tty()
 
     # Input field loop
     while True:
@@ -211,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]