tksheet 7.4.3__py3-none-any.whl → 7.4.5__py3-none-any.whl

tksheet/sheet_options.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from .constants import USER_OS, ctrl_key
 from .other_classes import DotDict, FontTuple
+from .sorting import fast_sort_key, natural_sort_key, version_sort_key  # noqa: F401
 from .themes import theme_light_blue
 
 
@@ -255,5 +256,6 @@ def new_sheet_options() -> DotDict:
             "max_row_height": float("inf"),
             "max_index_width": float("inf"),
             "show_top_left": None,
+            "sort_key": natural_sort_key,
         }
     )

tksheet/sorting.py

@@ -3,12 +3,12 @@ from __future__ import annotations
 from collections.abc import Callable, Generator, Iterable, Iterator
 from datetime import datetime
 from pathlib import Path
-from re import finditer
+from re import split
 
 AnyIter = Iterable | Iterator
 
 # Possible date formats to try for the entire string
-date_formats = [
+date_formats = (
     # Common formats
     "%d/%m/%Y",  # Day/Month/Year
     "%m/%d/%Y",  # Month/Day/Year (US format)
@@ -24,7 +24,8 @@ date_formats = [
     "%m,%d,%Y",  # Month,Day,Year
     "%Y,%m,%d",  # Year,Month,Day
     "%d %m %Y",  # Day Month Year (with space)
-    "%m %d %Y",  # Month Day Year
+    "%m %d %Y",  # Month Day Year (with space)
+    "%Y %d %m",  # Year Month Day (with space)
     # With month names
     "%d %b %Y",  # Day Abbreviated Month Year
     "%b %d, %Y",  # Abbreviated Month Day, Year
@@ -42,59 +43,228 @@ date_formats = [
     "%d/%m/%y %H:%M",  # Day/Month/Year Hour:Minute
     "%m/%d/%y %H:%M",  # Month/Day/Year Hour:Minute
     "%Y-%m-%d %H:%M:%S",  # Year-Month-Day Hour:Minute:Second
-]
+)
 
 
-def natural_sort_key(item: object) -> tuple[int, ...]:
+def _string_fallback(item: str) -> tuple[int, ...]:
+    """
+    In order to have reasonable file path sorting:
+    - Split by path separators
+    - Determine depth, more separators more depth
+    - Deal with every dir by splitting by digits
+    - Deal with file name by splitting by digits
+    """
+    components = split(r"[/\\]", item)
+    if components[-1]:
+        return (
+            5,
+            len(components),
+            tuple(int(e) if e.isdigit() else e.lower() for comp in components[:-1] for e in split(r"(\d+)", comp) if e),
+            tuple(int(e) if e.isdigit() else e.lower() for e in split(r"(\d+)", components[-1])),
+        )
+    else:
+        return (
+            5,
+            len(components),
+            tuple(int(e) if e.isdigit() else e.lower() for comp in components[:-1] for e in split(r"(\d+)", comp) if e),
+            (),
+        )
+
+
+def version_sort_key(item: object) -> tuple[int, ...]:
     """
     A key for natural sorting of various Python types.
 
+    - Won't convert strings to floats
+    - Will sort string version numbers
+
     0. None
-    1. bool
-    2. int, float
-    3. datetime
-    4. empty strings
-    5. strings (including paths as POSIX strings)
-    6. unknown objects with __str__
-    7. unknown objects
+    1. Empty strings
+    2. bool
+    3. int, float
+    4. datetime (inc. strings that are dates)
+    5. strings (including string file paths and paths as POSIX strings) & unknown objects with __str__
+    6. unknown objects
     """
-    if item is None:
+    if isinstance(item, str):
+        if item:
+            for date_format in date_formats:
+                try:
+                    return (4, datetime.strptime(item, date_format).timestamp())
+                except ValueError:
+                    continue
+            # the same as _string_fallback
+            components = split(r"[/\\]", item)
+            if components[-1]:
+                return (
+                    5,
+                    len(components),
+                    tuple(
+                        int(e) if e.isdigit() else e.lower()
+                        for comp in components[:-1]
+                        for e in split(r"(\d+)", comp)
+                        if e
+                    ),
+                    tuple(int(e) if e.isdigit() else e.lower() for e in split(r"(\d+)", components[-1])),
+                )
+            else:
+                return (
+                    5,
+                    len(components),
+                    tuple(
+                        int(e) if e.isdigit() else e.lower()
+                        for comp in components[:-1]
+                        for e in split(r"(\d+)", comp)
+                        if e
+                    ),
+                    (),
+                )
+        else:
+            return (1, item)
+
+    elif item is None:
         return (0,)
 
     elif isinstance(item, bool):
-        return (1, item)
+        return (2, item)
 
     elif isinstance(item, (int, float)):
-        return (2, item)
+        return (3, item)
 
     elif isinstance(item, datetime):
-        return (3, item.timestamp())
+        return (4, item.timestamp())
 
-    elif isinstance(item, str):
-        if not item:
-            return (4, item)
+    elif isinstance(item, Path):
+        return _string_fallback(item.as_posix())
+
+    else:
+        try:
+            return _string_fallback(f"{item}")
+        except Exception:
+            return (6, item)
+
+
+def natural_sort_key(item: object) -> tuple[int, ...]:
+    """
+    A key for natural sorting of various Python types.
+
+    - Won't sort string version numbers
+    - Will convert strings to floats
+    - Will sort strings that are file paths
+
+    0. None
+    1. Empty strings
+    2. bool
+    3. int, float (inc. strings that are numbers)
+    4. datetime (inc. strings that are dates)
+    5. strings (including string file paths and paths as POSIX strings) & unknown objects with __str__
+    6. unknown objects
+    """
+    if isinstance(item, str):
+        if item:
+            for date_format in date_formats:
+                try:
+                    return (4, datetime.strptime(item, date_format).timestamp())
+                except ValueError:
+                    continue
 
-        for date_format in date_formats:
             try:
-                return (3, datetime.strptime(item, date_format).timestamp())
+                return (3, float(item))
             except ValueError:
-                continue
+                # the same as _string_fallback
+                components = split(r"[/\\]", item)
+                if components[-1]:
+                    return (
+                        5,
+                        len(components),
+                        tuple(
+                            int(e) if e.isdigit() else e.lower()
+                            for comp in components[:-1]
+                            for e in split(r"(\d+)", comp)
+                            if e
+                        ),
+                        tuple(int(e) if e.isdigit() else e.lower() for e in split(r"(\d+)", components[-1])),
+                    )
+                else:
+                    return (
+                        5,
+                        len(components),
+                        tuple(
+                            int(e) if e.isdigit() else e.lower()
+                            for comp in components[:-1]
+                            for e in split(r"(\d+)", comp)
+                            if e
+                        ),
+                        (),
+                    )
+        else:
+            return (1, item)
+
+    elif item is None:
+        return (0,)
+
+    elif isinstance(item, bool):
+        return (2, item)
+
+    elif isinstance(item, (int, float)):
+        return (3, item)
+
+    elif isinstance(item, datetime):
+        return (4, item.timestamp())
+
+    elif isinstance(item, Path):
+        return _string_fallback(item.as_posix())
+
+    else:
         try:
-            return (2, float(item))
+            return _string_fallback(f"{item}")
         except Exception:
-            pass
+            return (6, item)
+
+
+def fast_sort_key(item: object) -> tuple[int, ...]:
+    """
+    A faster key for natural sorting of various Python types.
+
+    - Won't sort strings that are dates very well
+    - Won't convert strings to floats
+    - Won't sort string file paths very well
+    - Will do ok with string version numbers
 
-        return (5, item.lower(), tuple(int(match.group()) for match in finditer(r"\d+", item)))
+    0. None
+    1. Empty strings
+    2. bool
+    3. int, float
+    4. datetime
+    5. strings (including paths as POSIX strings) & unknown objects with __str__
+    6. unknown objects
+    """
+    if isinstance(item, str):
+        if item:
+            return (5, tuple(int(e) if e.isdigit() else e.lower() for e in split(r"(\d+)", item)))
+        else:
+            return (1, item)
+
+    elif item is None:
+        return (0,)
+
+    elif isinstance(item, bool):
+        return (2, item)
+
+    elif isinstance(item, (int, float)):
+        return (3, item)
+
+    elif isinstance(item, datetime):
+        return (4, item.timestamp())
 
     elif isinstance(item, Path):
-        posix_str = item.as_posix()
-        return (5, posix_str.lower(), tuple(int(match.group()) for match in finditer(r"\d+", posix_str)))
+        return _string_fallback(item.as_posix())
 
     else:
         try:
-            return (6, f"{item}".lower())
+            return _string_fallback(f"{item}")
         except Exception:
-            return (7, item)
+            return (6, item)
 
 
 def sort_selection(
@@ -223,7 +393,7 @@ def sort_columns_by_row(
         unsorted_part = [elem for idx, elem in enumerate(row_data) if idx not in sort_indices_set]
         new_data.append(sorted_part + unsorted_part)
 
-    return sort_indices, {old: new for old, new in zip(range(len(data[row])), sort_indices)}
+    return sort_indices, dict(zip(range(len(data[row])), sort_indices))
 
 
 def _sort_node_children(
@@ -247,14 +417,15 @@ def sort_tree_view(
     _row_index: list[object],
     tree_rns: dict[str, int],
     tree: dict[str, object],
-    key: Callable = natural_sort_key,
+    key: Callable | None = None,
     reverse: bool = False,
 ) -> tuple[list[object], dict[int, int]]:
     if not _row_index or not tree_rns or not tree:
         return [], {}
 
     if key is None:
-        key = natural_sort_key
+        # prefer version_sort_key for iid names
+        key = version_sort_key
 
     # Create the index map and sorted nodes list
     mapping = {}
@@ -281,38 +452,80 @@ def sort_tree_view(
     return sorted_nodes, mapping
 
 
-# def test_natural_sort_key():
-#     test_items = [
-#         None,
-#         False,
-#         True,
-#         5,
-#         3.14,
-#         datetime(2023, 1, 1),
-#         "abc123",
-#         "123abc",
-#         "abc123def",
-#         "998zzz",
-#         "10-01-2023",
-#         "01-10-2023",
-#         "fi1le_0.txt",
-#         "file_2.txt",
-#         "file_10.txt",
-#         "file_1.txt",
-#         "path/to/file_2.txt",
-#         "path/to/file_10.txt",
-#         "path/to/file_1.txt",
-#         "/another/path/file_2.log",
-#         "/another/path/file_10.log",
-#         "/another/path/file_1.log",
-#         "C:\\Windows\\System32\\file_2.dll",
-#         "C:\\Windows\\System32\\file_10.dll",
-#         "C:\\Windows\\System32\\file_1.dll",
-#     ]
-#     print("Sort objects:", [natural_sort_key(e) for e in test_items])
-#     sorted_items = sorted(test_items, key=natural_sort_key)
-#     print("\nNatural Sort Order:", sorted_items)
-
-
 # if __name__ == "__main__":
-#     test_natural_sort_key()
+#     test_cases = {
+#         "Filenames": ["file10.txt", "file2.txt", "file1.txt"],
+#         "Versions": ["1.10", "1.2", "1.9", "1.21"],
+#         "Mixed": ["z1.doc", "z10.doc", "z2.doc", "z100.doc"],
+#         "Paths": [
+#             "/folder/file.txt",
+#             "/folder/file (1).txt",
+#             "/folder (1)/file.txt",
+#             "/folder (10)/file.txt",
+#             "/dir/subdir/file1.txt",
+#             "/dir/subdir/file10.txt",
+#             "/dir/subdir/file2.txt",
+#             "/dir/file.txt",
+#             "/dir/sub/file123.txt",
+#             "/dir/sub/file12.txt",
+#             # New challenging cases
+#             "/a/file.txt",
+#             "/a/file1.txt",
+#             "/a/b/file.txt",
+#             "/a/b/file1.txt",
+#             "/x/file-v1.2.txt",
+#             "/x/file-v1.10.txt",
+#             # My own new challenging cases
+#             "/a/zzzzz.txt",
+#             "/a/b/a.txt",
+#         ],
+#         "Case": ["Apple", "banana", "Corn", "apple", "Banana", "corn"],
+#         "Leading Zeros": ["001", "010", "009", "100"],
+#         "Complex": ["x-1-y-10", "x-1-y-2", "x-2-y-1", "x-10-y-1"],
+#         "Lengths": ["2 ft 9 in", "2 ft 10 in", "10 ft 1 in", "10 ft 2 in"],
+#         "Floats": [
+#             "1.5",
+#             "1.25",
+#             "1.025",
+#             "10.5",
+#             "-10.2",
+#             "-2.5",
+#             "5.7",
+#             "-1.25",
+#             "0.0",
+#             "1.5e3",
+#             "2.5e2",
+#             "1.23e4",
+#             "1e-2",
+#             "file1.2.txt",
+#             "file1.5.txt",
+#             "file1.10.txt",
+#         ],
+#         "Strings": [
+#             "123abc",
+#             "abc123",
+#             "123abc456",
+#             "abc123def",
+#         ],
+#     }
+
+#     print("FAST SORT KEY:")
+
+#     for name, data in test_cases.items():
+#         sorted1 = sorted(data, key=fast_sort_key)
+#         print(f"\n{name}:")
+#         print(sorted1)
+
+#     print("\nNATURAL SORT KEY:")
+
+#     for name, data in test_cases.items():
+#         sorted1 = sorted(data, key=natural_sort_key)
+#         print(f"\n{name}:")
+#         print(sorted1)
+
+#     print("\nVERSION SORT KEY:")
+
+#     for name, data in test_cases.items():
+#         sorted1 = sorted(data, key=version_sort_key)
+#         print(f"\n{name}:")
+#         print(sorted1)

tksheet/text_editor.py

@@ -111,9 +111,15 @@ class TextEditorTkText(tk.Text):
         ):
             self.tag_add("align", 1.0, "end")
             self.event_generate("<<TextModified>>")
-            if args and len(args) > 1 and args[1] != "\n" and args != ("1.0", "end"):
-                if self.yview() != (0.0, 1.0) and self.newline_bindng is not None:
-                    self.newline_bindng(check_lines=False)
+            if (
+                args
+                and len(args) > 1
+                and args[1] != "\n"
+                and args != ("1.0", "end")
+                and self.yview() != (0.0, 1.0)
+                and self.newline_bindng is not None
+            ):
+                self.newline_bindng(check_lines=False)
         return result
 
     def rc(self, event: object) -> None:

tksheet/top_left_rectangle.py

@@ -220,12 +220,11 @@ class TopLeftRectangle(tk.Canvas):
                     self.PAR.ops.default_row_index_width,
                     set_TL=True,
                 )
-        elif rect[0] == self.rh_box:
-            if self.CH.height_resizing_enabled:
-                self.CH.set_height(
-                    self.MT.get_default_header_height(),
-                    set_TL=True,
-                )
+        elif rect[0] == self.rh_box and self.CH.height_resizing_enabled:
+            self.CH.set_height(
+                self.MT.get_default_header_height(),
+                set_TL=True,
+            )
         self.MT.main_table_redraw_grid_and_text(
             redraw_header=True,
             redraw_row_index=True,

{tksheet-7.4.3.dist-info → tksheet-7.4.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tksheet
-Version: 7.4.3
+Version: 7.4.5
 Summary: Tkinter table / sheet and treeview widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors
@@ -24,7 +24,9 @@ License: Copyright (c) 2019 ragardner and open source contributors
         SOFTWARE.
         
 Project-URL: Homepage, https://github.com/ragardner/tksheet
-Project-URL: Bug Reports, https://github.com/ragardner/tksheet/issues
+Project-URL: Documentation, https://github.com/ragardner/tksheet/wiki/Version-7
+Project-URL: Changelog, https://github.com/ragardner/tksheet/blob/master/docs/CHANGELOG.md
+Project-URL: Issues, https://github.com/ragardner/tksheet/issues
 Project-URL: Funding, https://github.com/ragardner
 Keywords: tkinter,table,widget,tree,treeview,sheet,grid,tk
 Classifier: Development Status :: 5 - Production/Stable

tksheet-7.4.5.dist-info/RECORD

@@ -0,0 +1,22 @@
+tksheet/__init__.py,sha256=DBwinDqYjK3FjcSqsMWT72Ew9gnVODLENV3h5GMYLd0,2313
+tksheet/colors.py,sha256=dHhmdFuQDlwohDHsAfT9VdrKoSl_R33L72a3HCin5zo,51591
+tksheet/column_headers.py,sha256=SSDDxSsfVwgg81R2eS4LZoRTfLWixIT_tIBrcZFfXDE,103240
+tksheet/constants.py,sha256=YzomMDH38tPCk3XgbmtYebx_8RIJklD2wpeCUCCJnC0,3906
+tksheet/find_window.py,sha256=JfkgpGluSng3bKMBneDNQg-AJmBcmCW7JIhtYbSUZaE,8036
+tksheet/formatters.py,sha256=eKOX69mUXjkSHMqOMeda0nzMgb88Q05qjZBFCIlZmKc,10239
+tksheet/functions.py,sha256=W2gNUQRFCCZH0gYCNECdl9-HZrhnEMYnxHEY9yl13uw,53058
+tksheet/main_table.py,sha256=OzNnHRcg4JIPuG4Wx5KWe8ZNR0uwVV_78kK1uS9cksg,352912
+tksheet/other_classes.py,sha256=2dMTcH21lDGXXLOO6DmT8HgrhdDOjFC-vo-RlLIv-yk,16603
+tksheet/row_index.py,sha256=1KuU-_7k1Ci97v8RgKT-oSf5wolrQ72-vI8iB3spKo0,134283
+tksheet/sheet.py,sha256=0CqGOrAK8THnyLkvUu3nCP5lubb2AqtNDXeJ7I7XcMI,283928
+tksheet/sheet_options.py,sha256=A_cJEc6XirLO8YrWQHfb10lK2VhGbz28_3XgrKx3TfM,9753
+tksheet/sorting.py,sha256=PGTQBaHyxc4TJ_gws44w9TsX2WSMavdOXN5119YhdZg,16851
+tksheet/text_editor.py,sha256=czGlcJDV9o_jPS4nOlvpjOOs0wkVnK4cGI7PubMMElU,7426
+tksheet/themes.py,sha256=AoNAxibnQi04MN0Zpbn9-kyDnkiiV8TDNWP9FYjpuf0,18473
+tksheet/tksheet_types.py,sha256=8JQVlA6N9jEZTEAytbcyuhOGuNE4fUPxYhTqoidxEE0,588
+tksheet/top_left_rectangle.py,sha256=WHf2FnId1QJ4q2vy9AbMIjAaP-6s9erPqSU5duN9giw,8569
+tksheet-7.4.5.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.4.5.dist-info/METADATA,sha256=4gWTvamk5QyT2W7WI1o73xGqjDvCg38zHgTiDHylvnY,8005
+tksheet-7.4.5.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
+tksheet-7.4.5.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.4.5.dist-info/RECORD,,

{tksheet-7.4.3.dist-info → tksheet-7.4.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tksheet-7.4.3.dist-info/RECORD

@@ -1,22 +0,0 @@
-tksheet/__init__.py,sha256=6xbeTomYvgJaGjRKmHAS1YW24Tmc5ZcR7_YmeyJvDnY,2280
-tksheet/colors.py,sha256=dHhmdFuQDlwohDHsAfT9VdrKoSl_R33L72a3HCin5zo,51591
-tksheet/column_headers.py,sha256=ZfHLhXEKe8M9ggf3nzg252DBVH_NRtQichtTF7pisIc,103245
-tksheet/constants.py,sha256=PkvAtdYXSOiOO5zuxqrObvGIVV2sEE0enN8YLhI8zCc,3922
-tksheet/find_window.py,sha256=JfkgpGluSng3bKMBneDNQg-AJmBcmCW7JIhtYbSUZaE,8036
-tksheet/formatters.py,sha256=21ZkMaDIJNUtjvtlAbPl8Y19I9nDxue-JJegw6hblz8,10551
-tksheet/functions.py,sha256=BDCCKdOUF9FRDq9GF7HmRXaZ22PYRDySlo6WLvyZtVA,52806
-tksheet/main_table.py,sha256=ChMaI_t5rDwfc5pStG5pxKhqWwKnauJGxa_hoTXq478,357778
-tksheet/other_classes.py,sha256=ADybikLipEG4NABXx8bGVAovJJhWcomQOWTorzS1CPU,16581
-tksheet/row_index.py,sha256=R6tCsfXnPbblnSU1tvse_fCjx2DG0U-vx-XaiAPdZs0,133195
-tksheet/sheet.py,sha256=6hHI_W0rmuV6l2C2jd3fa9pgnNx3kW9k6rY0qqEq-Wg,284585
-tksheet/sheet_options.py,sha256=7q5T55sZe_elA3MCP0VnbX_f0Euo425aw4uSoPXteoA,9624
-tksheet/sorting.py,sha256=qLusdRmqDUBkcEgK3WcYbFjIJmXNBoDhR-D2yrWC-BI,9895
-tksheet/text_editor.py,sha256=ZLVF-0WxDin5qUAJ5r7dmsdwvhyEoxw0PlPvi_AGNPE,7328
-tksheet/themes.py,sha256=AoNAxibnQi04MN0Zpbn9-kyDnkiiV8TDNWP9FYjpuf0,18473
-tksheet/tksheet_types.py,sha256=8JQVlA6N9jEZTEAytbcyuhOGuNE4fUPxYhTqoidxEE0,588
-tksheet/top_left_rectangle.py,sha256=KhTT-rBUwQTgaHjSwL83cL5_71k2L1B7gxkSxZlTSK8,8598
-tksheet-7.4.3.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.4.3.dist-info/METADATA,sha256=36JytEf6SmrgwlyWLnvv1SLYumrDvxH4wDERw-cxTXE,7839
-tksheet-7.4.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-tksheet-7.4.3.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.4.3.dist-info/RECORD,,