listpick 0.1.14.3__tar.gz → 0.1.14.4__tar.gz

{listpick-0.1.14.3/src/listpick.egg-info → listpick-0.1.14.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.14.3
+Version: 0.1.14.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.14.3 → listpick-0.1.14.4}/setup.py

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

@@ -573,10 +573,6 @@ class Picker:
         # If a sort is passed
         if len(self.indexed_items) > 0:
             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[0]) == 1:
-        #     self.number_columns = False
-
-
 
         h, w = self.stdscr.getmaxyx()
 
@@ -677,7 +673,14 @@ class Picker:
         # Update current column index
         self.selected_column = new_index
 
-    def test_screen_size(self):
+    def test_screen_size(self) -> bool:
+        """ 
+        Determine if the terminal is large enough to display the picker. 
+        If the terminal is too small then display a message saying so.
+
+        Returns: True if terminal is large enough to display the Picker.
+
+        """
         self.logger.debug("function: test_screen_size()")
         h, w = self.stdscr.getmaxyx()
         ## Terminal too small to display Picker
@@ -689,9 +692,10 @@ class Picker:
             return False
         return True
 
-    def splash_screen(self, message=""):
-        self.logger.info(f"function: splash_screen({message})")
+    def splash_screen(self, message="") -> None:
         """ Display a splash screen with a message. Useful when loading a large data set. """
+
+        self.logger.info(f"function: splash_screen({message})")
         h, w =self.stdscr.getmaxyx()
         self.stdscr.bkgd(' ', curses.color_pair(2))
         try:
@@ -854,14 +858,6 @@ class Picker:
             except:
                 pass
 
-        # Draw:
-        #    1. standard row
-        #    2. highlights l0
-        #    3. selected
-        #    4. above-selected highlights l1
-        #    5. cursor
-        #    6. top-level highlights l2
-        ## Display rows and highlights
 
         def sort_highlights(highlights):
             """ 
@@ -921,6 +917,15 @@ class Picker:
                 except:
                     pass
 
+        # Draw:
+        #    1. standard row
+        #    2. highlights l0
+        #    3. selected
+        #    4. above-selected highlights l1
+        #    5. cursor
+        #    6. top-level highlights l2
+        ## Display rows and highlights
+
         l0_highlights, l1_highlights, l2_highlights = sort_highlights(self.highlights)
 
 

{listpick-0.1.14.3 → listpick-0.1.14.4}/src/listpick/utils/table_to_list_of_lists.py

@@ -144,11 +144,14 @@ def table_to_list(
         import pandas as pd
         ef = pd.ExcelFile(input_arg)
         sheets = ef.sheet_names
-        if sheet_number < len(sheets):
-            df = pd.read_excel(input_arg, sheet_name=sheet_number)
-        else:
-            df = pd.read_excel(input_arg)
+        sheet_number = min(0, max(sheet_number, len(sheets)-1))
+        df = pd.read_excel(input_arg, engine='odf', sheet_name=sheet_number)
+        # if sheet_number < len(sheets):
+        #     df = pd.read_excel(input_arg, sheet_name=sheet_number)
+        # else:
+        #     df = pd.read_excel(input_arg)
         table_data = df.values.tolist()
+        table_data = [[x if not pd.isna(x) else "" for x in row] for row in table_data]
         try:
             header = list(df.columns)
         except:
@@ -160,11 +163,15 @@ def table_to_list(
             import pandas as pd
             ef = pd.ExcelFile(input_arg)
             sheets = ef.sheet_names
-            if sheet_number < len(sheets):
-                df = pd.read_excel(input_arg, engine='odf', sheet_name=sheet_number)
-            else:
-                df = pd.read_excel(input_arg, engine='odf')
+            sheet_number = min(0, max(sheet_number, len(sheets)-1))
+            df = pd.read_excel(input_arg, engine='odf', sheet_name=sheet_number)
+            # if sheet_number < len(sheets):
+            #     df = pd.read_excel(input_arg, engine='odf', sheet_name=sheet_number)
+            # else:
+            #     df = pd.read_excel(input_arg, engine='odf')
             table_data = df.values.tolist()
+            table_data = [[x if not pd.isna(x) else "" for x in row] for row in table_data]
+            
             try:
                 header = list(df.columns)
             except:

{listpick-0.1.14.3 → listpick-0.1.14.4/src/listpick.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: listpick
-Version: 0.1.14.3
+Version: 0.1.14.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