listpick 0.1.14.12__tar.gz → 0.1.14.14__tar.gz

{listpick-0.1.14.12 → listpick-0.1.14.14}/CHANGELOG.md

@@ -18,6 +18,7 @@ Note that the changes between 0.1.11.0 and 1.1.12.0 are listed under 0.1.11
    - Fixed highlighted cell not being aligned in the way that we expect.
    - Fixed search query covering last row of data.
    - Discovered missing keys from colour_theme 0 which caused menus not to be displayed.
+   - Setting colour_theme_number in the config now works.
  - Create ~/.config/listpick directory for storing input history if it doesn't already exist.
  - Added error checking when opening files.
  - Added --headerless flag to prevent interpreting the first line of the input as the header.

{listpick-0.1.14.12/src/listpick.egg-info → listpick-0.1.14.14}/PKG-INFO

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

@@ -22,6 +22,7 @@ ASAP
 >   - [x] Alt+KEY
 >   - [x] Arrow keys
 > - [x] Add new keycodes to build_help().
+> - [ ] Search count is off
 
 
 

{listpick-0.1.14.12 → listpick-0.1.14.14}/setup.py

@@ -16,7 +16,7 @@ with open("README.md", "r", encoding = "utf-8") as fh:
 
 setuptools.setup(
     name = "listpick",
-    version = "0.1.14.12",
+    version = "0.1.14.14",
     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.14.12 → listpick-0.1.14.14}/src/listpick/listpick_app.py

@@ -365,6 +365,12 @@ class Picker:
             self.logger.error(f"get_config({path}) load error. {e}")
             return False
 
+        if "general" in config:
+            if "colour_theme_number" in config["general"] and config["general"]["colour_theme_number"] != self.colour_theme_number:
+                global COLOURS_SET 
+                COLOURS_SET = False
+                self.colours_end = set_colours(pick=config["general"]["colour_theme_number"], start=1)
+
         self.logger.info(f"function: set_config()")
         if "general" in config:
             for key, val in config["general"].items():
@@ -373,10 +379,9 @@ class Picker:
                     setattr(self, key, val)
                 except Exception as e:
                     self.logger.error(f"set_config: key={key}, val={val}. {e}")
+                    
         return True
 
-
-
     def get_config(self, path: str ="~/.config/listpick/config.toml") -> dict:
         """ Get config from file. """
         self.logger.info(f"function: get_config()")
@@ -3182,11 +3187,18 @@ class Picker:
                 if return_val:
                     selected_indices = get_selected_indices(self.selections)
                     self.history_pipes.append(usrtxt)
+
                     if not selected_indices:
-                        selected_indices = [self.indexed_items[self.cursor_pos][0]]
+                        if len(self.indexed_items):
+                            pos = self.indexed_items[self.cursor_pos][0]
+                            if " " in self.items[pos][self.selected_column]:
+                                full_values = [repr(self.items[pos][self.selected_column])]
+                            else:
+                                full_values = [self.items[pos][self.selected_column]]
 
-                    # full_values = [format_row_full(self.items[i], self.hidden_columns) for i in selected_indices]  # Use format_row_full for full data
-                    if self.cell_cursor:
+                        else:
+                            return None
+                    elif self.cell_cursor:
                         
                         full_values = []
                         for row in self.selected_cells_by_row.keys():
@@ -3199,11 +3211,16 @@ class Picker:
                                 selected_cell_row_str += "\t"
                             full_values.append(selected_cell_row_str.strip())
 
-
-                        # full_values = ["\t".join([repr(self.items[key][cell]) for cell in self.selected_cells_by_row[key]]) for key in self.selected_cells_by_row.keys()]
-                        # full_values = ["\t".join([self.items[key][cell] for cell in self.selected_cells_by_row[key]]) for key in self.selected_cells_by_row.keys()]
                     else:
-                        full_values = [self.items[i][self.selected_column] for i in selected_indices]
+                        full_values = []
+                        for i in selected_indices:
+                            selected_cell_row_str = ""
+                            if " " in self.items[i][self.selected_column]:
+                                selected_cell_row_str += repr(self.items[i][self.selected_column])
+                            else:
+                                selected_cell_row_str += str(self.items[i][self.selected_column])
+                            full_values.append(selected_cell_row_str)
+
                     if full_values:
                         # command = usrtxt.split()
                         command = usrtxt

{listpick-0.1.14.12 → listpick-0.1.14.14}/src/listpick/ui/build_help.py

@@ -124,7 +124,7 @@ def build_help_rows(keys_dict: dict, debug: bool = False) -> list[list[str]]:
         "paste":                            "Paste into picker.",
         "save":                             "Save selections.",
         "load":                             "Load from file.",
-        "open":                             "Open from file.",
+        "open":                             "Attempt to open file with selected cell value(s).",
         "toggle_footer":                    "Toggle footer.",
         "notification_toggle":              "Toggle empty notification.",
         "redo":                             "Redo.",

{listpick-0.1.14.12 → listpick-0.1.14.14}/src/listpick/ui/picker_colours.py

@@ -25,9 +25,9 @@ def get_colours(pick:int=0) -> Dict[str, int]:
         'normal_fg': 253,
         'unselected_bg': 232,
         'unselected_fg': 253,
-        'cursor_bg': 25,
+        'cursor_bg': 21,
         'cursor_fg': 253,
-        'selected_bg': 135,
+        'selected_bg': 54,
         'selected_fg': 253,
         'header_bg': 253,
         'header_fg': 232,
@@ -65,7 +65,7 @@ def get_colours(pick:int=0) -> Dict[str, int]:
         '40pc_fg': 166,
         'footer_string_bg': 28,
         'footer_string_fg': 253,
-        'selected_cell_bg': 237,
+        'selected_cell_bg': 54,
         'selected_cell_fg': 253,
         'deselecting_cell_bg': 162,
         'deselecting_cell_fg': 253,
@@ -288,9 +288,6 @@ def get_colours(pick:int=0) -> Dict[str, int]:
         colour["paused_bg"] = colour["background"]
         colour["paused_bg"] = colour["background"]
         # colour["search_bg"] = colour["background"]
-    # tmp = colours[0]
-    # colours[0] = colours[2]
-    # colours[2] = tmp
     if pick > len(colours) - 1:
         return colours[0]
     return colours[pick]
@@ -363,3 +360,26 @@ def get_theme_count() -> int:
             break
         col_list.append(x)
     return i
+
+def check_for_missing_keys():
+    """ Check if any of the colour_dicts have missing keys--i.e., if their keys are incongruous. """
+    ref = 0
+    count = get_theme_count()
+
+    colours = [get_colours(i) for i in range(count)]
+
+    diffs = []
+    for i in range(count):
+        print(f"{i}")
+        for j in range(count):
+            diff = set(colours[i].keys()) - set(colours[j].keys())
+            print(f"    colours[{i}] - colours[{j}] = {diff}")
+            if diff:
+                diffs.append(f"    colours[{i}] - colours[{j}] = {diff}")
+
+    if diffs:
+        print("*"*80)
+        print("*"*80)
+        for d in diffs:
+            print(d)
+

{listpick-0.1.14.12 → listpick-0.1.14.14/src/listpick.egg-info}/PKG-INFO

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