listpick 0.1.16.1__tar.gz → 0.1.16.4__tar.gz

{listpick-0.1.16.1 → listpick-0.1.16.4}/CHANGELOG.md

@@ -1,6 +1,15 @@
 # CHANGELOG.md
 Note that the changes between 0.1.11.0 and 1.1.12.0 are listed under 0.1.11
 
+## [0.1.16.4] 2025-09-09
+ - Commands passed to generate_picker_data can now use multiple {} and each will be replaced by the filename
+   - E.g., `[[ -f {} ]] && du -h {}`
+ - Improved the handling of filenames when opening files and generating column-data for files.
+ - Hide header in notifications.
+
+## [0.1.16.2] 2025-09-07
+ - Fixed some f-strings with nested quotes.
+
 ## [0.1.16.1] 2025-09-07
  - Massive improvements to Picker data generation.
    - Data generation is now multithreaded.

{listpick-0.1.16.1/src/listpick.egg-info → listpick-0.1.16.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.16.1
+Version: 0.1.16.4
 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.1 → listpick-0.1.16.4}/TODO.md

@@ -34,6 +34,12 @@
 >   - [ ] The selected column can be a hidden column
 >   - [ ] Hide all columns and toggle cell cursor mode. >> Hangs
 >   - [ ] Toggle last visible column in cell cursor mode. >> Hangs
+> - [ ] Data generation
+>   - [ ] Changing directories in lpfman before all cells have loaded throws errors as threads try to operate on files that aren't in the new directory
+>     - [ ] Need to terminate threads when Picker.run() exits.
+>   - [ ] Keep track of running threads and tasks to do.
+>   - [ ] Go to a loading directory > filter > move down the entries. We are brought back to the top. 
+>     - [ ] Probably due to calling Picker.initialise_variables() when we get new data.
 
 
 

{listpick-0.1.16.1 → listpick-0.1.16.4}/setup.py

@@ -16,7 +16,7 @@ with open("README.md", "r", encoding = "utf-8") as fh:
 
 setuptools.setup(
     name = "listpick",
-    version = "0.1.16.1",
+    version = "0.1.16.4",
     author = "Grim",
     author_email = "grimandgreedy@protonmail.com",
     description = "Listpick is a powerful TUI data tool for creating TUI apps or viewing/comparing tabulated data.",

{listpick-0.1.16.1 → listpick-0.1.16.4}/src/listpick/listpick_app.py

@@ -1616,6 +1616,7 @@ class Picker:
                 "split_right": False,
                 "cell_cursor": False,
                 "crosshair_cursor": False,
+                "show_header": False,
 
             }
             OptionPicker = Picker(submenu_win, **notification_data)

{listpick-0.1.16.1 → listpick-0.1.16.4}/src/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-0.1.16.1 → listpick-0.1.16.4}/src/listpick/utils/generate_data.py

@@ -16,6 +16,7 @@ import logging
 
 logger = logging.getLogger('picker_log')
 import concurrent.futures
+import re
 
 def generate_columns(funcs: list, files: list) -> list[list[str]]:
     """
@@ -79,7 +80,7 @@ def command_to_func(command: str) -> Callable:
     """
     logger.info("function: command_to_func (generate_data.py)")
     
-    func = lambda arg: subprocess.run(command.format(repr(arg)), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.decode("utf-8")
+    func = lambda arg: subprocess.run(replace_braces(command, repr(arg)), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.decode("utf-8").strip()
     return func
 
 def load_environment(envs:dict):
@@ -91,6 +92,12 @@ def load_environment(envs:dict):
     if "cwd" in envs:
         os.chdir(os.path.expandvars(os.path.expanduser(envs["cwd"])))
 
+def replace_braces(text, s):
+    text = re.sub(r'\{\{(.*?)\}\}', r'@@\1@@', text)
+    text = re.sub(r'\{\}', s, text)
+    text = re.sub(r'@@(.*?)@@', r'{{\1}}', text)
+    return text
+
 
 def read_toml(file_path) -> Tuple[dict, list, list]:
     """

{listpick-0.1.16.1 → listpick-0.1.16.4}/src/listpick/utils/generate_data_multithreaded.py

@@ -25,6 +25,8 @@ import logging
 import threading
 from queue import PriorityQueue
 import time
+import re
+import shlex
 
 logger = logging.getLogger('picker_log')
 
@@ -84,7 +86,7 @@ def command_to_func(command: str) -> Callable:
     """
     logger.info("function: command_to_func (generate_data.py)")
     
-    func = lambda arg: subprocess.run(command.format(repr(arg)), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.decode("utf-8").strip()
+    func = lambda arg: subprocess.run(replace_braces(command, arg), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).stdout.decode("utf-8").strip()
     return func
 
 def load_environment(envs:dict):
@@ -96,6 +98,11 @@ def load_environment(envs:dict):
     if "cwd" in envs:
         os.chdir(os.path.expandvars(os.path.expanduser(envs["cwd"])))
 
+def replace_braces(text, s):
+    text = re.sub(r'\{\{(.*?)\}\}', r'@@\1@@', text)
+    text = re.sub(r'\{\}', shlex.quote(s), text)
+    text = re.sub(r'@@(.*?)@@', r'{{\1}}', text)
+    return text
 
 def read_toml(file_path) -> Tuple[dict, list, list]:
     """

{listpick-0.1.16.1 → listpick-0.1.16.4}/src/listpick/utils/utils.py

@@ -14,6 +14,7 @@ import tempfile
 import os
 from typing import Tuple, Dict
 import logging
+import shlex
 
 logger = logging.getLogger('picker_log')
 
@@ -290,9 +291,7 @@ def openFiles(files: list[str]) -> str:
                 apps[app] = [t]
 
         return apps
-    for i in range(len(files)):
-        if ' ' in files[i] and files[i][0] not in ["'", '"']:
-            files[i] = repr(files[i])
+    files = [shlex.quote(file) for file in files]
 
     types = get_mime_types(files)
     apps = get_applications(types.keys())

{listpick-0.1.16.1 → listpick-0.1.16.4/src/listpick.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.16.1
+Version: 0.1.16.4
 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