listpick 0.1.14.11__tar.gz → 0.1.14.13__tar.gz

{listpick-0.1.14.11 → listpick-0.1.14.13}/CHANGELOG.md

@@ -17,12 +17,14 @@ Note that the changes between 0.1.11.0 and 1.1.12.0 are listed under 0.1.11
    - Fixed crash when loading non-existent config file.
    - 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.
  - Fixed special keys not working:
-   - arrow keys (main picker)
-   - meta+key (input_field)
+   - arrow keys (main picker, input_field)
+   - meta+key (input_field, main picker)
  - Added column number to footer
  - Improved splitting of whitespace separated data passed on stdin.
  - Ensured that main picker elements resize if the terminal is resized when other dialogues are in focus: notifications, options, settings.

{listpick-0.1.14.11/src/listpick.egg-info → listpick-0.1.14.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.14.11
+Version: 0.1.14.13
 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.11 → listpick-0.1.14.13}/setup.py

@@ -16,7 +16,7 @@ with open("README.md", "r", encoding = "utf-8") as fh:
 
 setuptools.setup(
     name = "listpick",
-    version = "0.1.14.11",
+    version = "0.1.14.13",
     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.11 → listpick-0.1.14.13}/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()")
@@ -451,7 +456,7 @@ class Picker:
             if reset_colours:
                 global COLOURS_SET
                 COLOURS_SET = False
-                colours_end = set_colours(pick=self.colour_theme_number, start=self.colours_start)
+                self.colours_end = set_colours(pick=self.colour_theme_number, start=self.colours_start)
             if curses.COLORS >= 255 and curses.COLOR_PAIRS >= 150:
                 self.colours_start = self.colours_start
                 self.notification_colours_start = self.colours_start+50
@@ -3182,11 +3187,17 @@ 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):
+                            if " " in self.items[self.cursor_pos][self.selected_column]:
+                                full_values = [repr(self.items[self.cursor_pos][self.selected_column])]
+                            else:
+                                full_values = [self.items[self.cursor_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 +3210,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
@@ -3447,7 +3463,7 @@ def set_colours(pick: int = 0, start: int = 0) -> Optional[int]:
         curses.init_pair(start+24, colours['footer_string_fg'], colours['footer_string_bg'])
         curses.init_pair(start+25, colours['selected_cell_fg'], colours['selected_cell_bg'])
         curses.init_pair(start+26, colours['deselecting_cell_fg'], colours['deselecting_cell_bg'])
-    except:
+    except Exception as e:
         pass
     COLOURS_SET = True
     return start+21
@@ -3598,7 +3614,7 @@ def main() -> None:
     except:
         pass
         
-    function_data["colour_theme_number"] = 3
+    # function_data["colour_theme_number"] = 3
     # function_data["modes"]  = [ 
     #     {
     #         'filter': '',

{listpick-0.1.14.11 → listpick-0.1.14.13}/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.11 → listpick-0.1.14.13}/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,8 +65,10 @@ 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,
     },
         ### (1) Black and white
     {

{listpick-0.1.14.11 → listpick-0.1.14.13/src/listpick.egg-info}/PKG-INFO

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