listpick 0.1.15.2__py3-none-any.whl → 0.1.15.4__py3-none-any.whl

listpick/listpick_app.py

@@ -2037,7 +2037,11 @@ class Picker:
             self.selected_cells_by_row = get_selected_cells_by_row(self.cell_selections)
 
             if len(self.indexed_items) > 0 and len(self.indexed_items) >= self.cursor_pos and len(self.indexed_items[0][1]) >= self.id_column:
-                self.cursor_pos_id = self.indexed_items[self.cursor_pos][1][self.id_column]
+                try:
+                    self.cursor_pos_id = self.indexed_items[self.cursor_pos][1][self.id_column]
+                except:
+                    self.logger.warning(f"fetch_data() len(indexed_items)={len(self.indexed_items)}, cusor_pos={self.cursor_pos}")
+                    self.cursor_pos_id = -1
                 self.cursor_pos_prev = self.cursor_pos
         with self.data_lock:
             self.items, self.header = tmp_items, tmp_header
@@ -3191,14 +3195,21 @@ class Picker:
                             if 'filter' in self.modes[prev_mode_index]:
                                 self.filter_query = self.filter_query.replace(self.modes[prev_mode_index]['filter'], '')
                             self.filter_query = f"{self.filter_query.strip()} {val.strip()}".strip()
-                            prev_index = self.indexed_items[self.cursor_pos][0] if len(self.indexed_items)>0 else 0
+
+                            if len(self.indexed_items) == 0:
+                                prev_index = -1
+                            else:
+                                prev_index = self.indexed_items[self.cursor_pos][0] if len(self.indexed_items)>0 else 0
 
                             self.indexed_items = filter_items(self.items, self.indexed_items, self.filter_query)
-                            if prev_index in [x[0] for x in self.indexed_items]: new_index = [x[0] for x in self.indexed_items].index(prev_index)
-                            else: new_index = 0
+                            if prev_index >= 0 and prev_index in [x[0] for x in self.indexed_items]:
+                                new_index = [x[0] for x in self.indexed_items].index(prev_index)
+                            else:
+                                new_index = 0
                             self.cursor_pos = new_index
                             # Re-sort self.items after applying filter
-                            sort_items(self.indexed_items, sort_method=self.columns_sort_method[self.sort_column], sort_column=self.sort_column, sort_reverse=self.sort_reverse[self.sort_column])  # Re-sort self.items based on new column
+                            if len(self.items) and self.items != [[]]:
+                                sort_items(self.indexed_items, sort_method=self.columns_sort_method[self.sort_column], sort_column=self.sort_column, sort_reverse=self.sort_reverse[self.sort_column])  # Re-sort self.items based on new column
             elif self.check_key("mode_prev", key, self.keys_dict): # shift+tab key
                 self.logger.info(f"key_function mode_prev")
                 if len(self.modes):
@@ -3211,6 +3222,8 @@ class Picker:
                                 self.filter_query = self.filter_query.replace(self.modes[prev_mode_index]['filter'], '')
                             self.filter_query = f"{self.filter_query.strip()} {val.strip()}".strip()
                             prev_index = self.indexed_items[self.cursor_pos][0] if len(self.indexed_items)>0 else 0
+
+                            # if len(self.items) and self.items != [[]]:
                             self.indexed_items = filter_items(self.items, self.indexed_items, self.filter_query)
                             if prev_index in [x[0] for x in self.indexed_items]: new_index = [x[0] for x in self.indexed_items].index(prev_index)
                             else: new_index = 0
@@ -3707,21 +3720,21 @@ def main() -> None:
         pass
         
     # function_data["colour_theme_number"] = 3
-    # function_data["modes"]  = [ 
-    #     {
-    #         'filter': '',
-    #         'sort': 0,
-    #         'name': 'All',
-    #     },
-    #     {
-    #         'filter': '--2 miss',
-    #         'name': 'miss',
-    #     },
-    #     {
-    #         'filter': '--2 mp4',
-    #         'name': 'mp4',
-    #     },
-    # ]
+    function_data["modes"]  = [ 
+        {
+            'filter': '',
+            'sort': 0,
+            'name': 'All',
+        },
+        {
+            'filter': '--2 miss',
+            'name': 'miss',
+        },
+        {
+            'filter': '--2 mp4',
+            'name': 'mp4',
+        },
+    ]
     highlights = [
         {
             "field": 1,

listpick/utils/filtering.py

@@ -34,6 +34,7 @@ def filter_items(items: list[list[str]], indexed_items: list[Tuple[int, list[str
     Returns indexed_items, which is a list of tuples; each tuple consists of the index and the data of the matching row in the original items list. 
     """
     logger.info("function: filter_items (filtering.py)")
+    if items in [[], [[]]]: return []
 
 
     invert_filter = False

{listpick-0.1.15.2.dist-info → listpick-0.1.15.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.15.2
+Version: 0.1.15.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.15.2.dist-info → listpick-0.1.15.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 listpick/__init__.py,sha256=ExXc97-bibodH--wlwpQivl0zCNR5D1hvpvrf7OBofU,154
 listpick/__main__.py,sha256=wkCjDdqw093W27yWwnlC3nG_sMRKaIad7hHHWy0RBgY,193
-listpick/listpick_app.py,sha256=1K0sSVK-39eBIAZobHMrsFunE4Knp9nLKoExjlPlEjg,193238
+listpick/listpick_app.py,sha256=5TgVHIyR1ssENY9F8hD2AUbzsMICDaIgc5-n7ct2igY,193813
 listpick/pane/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/pane/get_data.py,sha256=21PTDXt9HP-4vZV4QUM8sidTqDEaKnKCDshl3-cSRCo,2255
 listpick/pane/pane_functions.py,sha256=7xynpd3HjZnt6s9W0ZsJlrmYvGCMstAI5OJ7EuQSzdg,3092
@@ -16,7 +16,7 @@ listpick/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 listpick/utils/clipboard_operations.py,sha256=ORdNm2kgGbfs51xJSvgJPERgoSmBgT11axuMkvSoP9A,3133
 listpick/utils/config.py,sha256=MEnAZg2Rhfl38XofEIN0uoVAOY7I0ftc79Evk3fOiVw,1654
 listpick/utils/dump.py,sha256=60YVIMNtBoYvWhmzfTJOsNGcetOvcCB3_T7yv-bYTPQ,3838
-listpick/utils/filtering.py,sha256=uS9sW0inmFvq0cIrwRC1BfuP8kjAD5IWWtls4jGB-70,1199
+listpick/utils/filtering.py,sha256=59_YIEYRV0ovnjF4iyuShq276FMAx5gBD9m3mE9IqJg,1237
 listpick/utils/generate_data.py,sha256=7sv6JRhk0-Gcj4kOlkzx4qPNBJZ-GFWg9vM77GktzpI,3073
 listpick/utils/graphing.py,sha256=ugjAH8js_iH7hulg4SySxb_W_f8B6GhTaceN5i7DID4,6954
 listpick/utils/keycodes.py,sha256=ZGkw1-4szxPnP81wj80r92L6_neIOlBBjQltEieCwnk,2696
@@ -29,9 +29,9 @@ listpick/utils/sorting.py,sha256=WZZiVlVA3Zkcpwji3U5SNFlQ14zVEk3cZJtQirBkecQ,532
 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=McOl9uT3jh7l4TIWeSd8ZGjK_e7r0YZF0Gl20yI6fl0,13873
-listpick-0.1.15.2.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
-listpick-0.1.15.2.dist-info/METADATA,sha256=aCD8uXrdXo0fdcqVWYB7_H6ozBBXjxSqp3qpcuEGGKQ,8131
-listpick-0.1.15.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-listpick-0.1.15.2.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
-listpick-0.1.15.2.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
-listpick-0.1.15.2.dist-info/RECORD,,
+listpick-0.1.15.4.dist-info/licenses/LICENSE.txt,sha256=2mP-MRHJptADDNE9VInMNg1tE-C6Qv93Z4CCQKrpg9w,1061
+listpick-0.1.15.4.dist-info/METADATA,sha256=k72_XlnzWvZSrL-6V68XRy8WbkhxdJfy7NQQ8DaRIcU,8131
+listpick-0.1.15.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+listpick-0.1.15.4.dist-info/entry_points.txt,sha256=-QCf_BKIkUz35Y9nkYpjZWs2Qg0KfRna2PAs5DnF6BE,43
+listpick-0.1.15.4.dist-info/top_level.txt,sha256=5mtsGEz86rz3qQDe0D463gGjAfSp6A3EWg4J4AGYr-Q,9
+listpick-0.1.15.4.dist-info/RECORD,,