listpick 0.1.16.3__py3-none-any.whl → 0.1.16.4__py3-none-any.whl

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/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/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.3.dist-info → listpick-0.1.16.4.dist-info}/METADATA

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

@@ -17,8 +17,8 @@ listpick/utils/clipboard_operations.py,sha256=ORdNm2kgGbfs51xJSvgJPERgoSmBgT11ax
 listpick/utils/config.py,sha256=MEnAZg2Rhfl38XofEIN0uoVAOY7I0ftc79Evk3fOiVw,1654
 listpick/utils/dump.py,sha256=60YVIMNtBoYvWhmzfTJOsNGcetOvcCB3_T7yv-bYTPQ,3838
 listpick/utils/filtering.py,sha256=59_YIEYRV0ovnjF4iyuShq276FMAx5gBD9m3mE9IqJg,1237
-listpick/utils/generate_data.py,sha256=YxkAPDkQnkeBmxQq8K7n6so-OUKC8DCPZqoqixYO2jw,4438
-listpick/utils/generate_data_multithreaded.py,sha256=AvAeejmDujwTAueLnl9giC2NKxhrOmk1IILVQgE5M-g,6305
+listpick/utils/generate_data.py,sha256=TCGwDrN49Xx33AdURpQRGi6Xi2uwjt96rEeWWYS8mFE,4649
+listpick/utils/generate_data_multithreaded.py,sha256=eWtv-gDdlTWwURKdg2cThrRI0I02JQNmQIr6q9GqtDc,6527
 listpick/utils/graphing.py,sha256=ugjAH8js_iH7hulg4SySxb_W_f8B6GhTaceN5i7DID4,6954
 listpick/utils/keycodes.py,sha256=ZGkw1-4szxPnP81wj80r92L6_neIOlBBjQltEieCwnk,2696
 listpick/utils/options_selectors.py,sha256=fQqTCAqRsrMhZwXUtsPBm47svkaUaeJqWsMW7Q4JTYY,3083
@@ -29,10 +29,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=oyJZPAwA7UGAclPhdPL44tKnPIVNHWhX-tZEnCdBKC0,4318
-listpick/utils/utils.py,sha256=QptLnqT15Z3G7xoq-6Q8e4-aZRFClTdb3h0l42di11s,13810
-listpick-0.1.16.3.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
-listpick-0.1.16.3.dist-info/METADATA,sha256=8HD-1Fi-J4ZjWaMRNveU7xUjzepKEUXsXAB_mpl7RQI,8128
-listpick-0.1.16.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-listpick-0.1.16.3.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
-listpick-0.1.16.3.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
-listpick-0.1.16.3.dist-info/RECORD,,
+listpick/utils/utils.py,sha256=nsR6orCBQy3rTXrCweq8cV-RzRVU15v3J9NclPeAOJk,13741
+listpick-0.1.16.4.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
+listpick-0.1.16.4.dist-info/METADATA,sha256=VwWPk2nx7z_mnZJz8ips6nLYm0_YZcIxP6Y8KLegyIA,8128
+listpick-0.1.16.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+listpick-0.1.16.4.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
+listpick-0.1.16.4.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
+listpick-0.1.16.4.dist-info/RECORD,,