tksheet 7.4.8__py3-none-any.whl → 7.4.10__py3-none-any.whl

tksheet/sorting.py

@@ -1,13 +1,11 @@
 from __future__ import annotations
 
-from collections.abc import Callable, Generator, Iterable, Iterator
+from collections.abc import Callable, Iterator
 from datetime import datetime
 from pathlib import Path
 from re import split
 from typing import Any
 
-AnyIter = Iterable | Iterator
-
 # Possible date formats to try for the entire string
 date_formats = (
     # Common formats
@@ -298,7 +296,7 @@ def sort_selection(
 
 
 def sort_column(
-    data: list[list[Any]] | list[Any] | AnyIter[Any],
+    data: list[list[Any]] | list[Any] | Iterator[Any],
     column: int = 0,
     reverse: bool = False,
     key: Callable | None = None,
@@ -316,7 +314,7 @@ def sort_column(
 
 
 def sort_row(
-    data: list[list[Any]] | list[Any] | AnyIter[Any],
+    data: list[list[Any]] | list[Any] | Iterator[Any],
     row: int = 0,
     reverse: bool = False,
     key: Callable | None = None,
@@ -397,58 +395,71 @@ def sort_columns_by_row(
     return sort_indices, dict(zip(range(len(data[row])), sort_indices))
 
 
-def _sort_node_children(
-    node: Any,
-    tree: dict[str, Any],
-    reverse: bool,
-    key: Callable,
-) -> Generator[Any, None, None]:
-    sorted_children = sorted(
-        (tree[child_iid] for child_iid in node.children if child_iid in tree),
-        key=lambda child: key(child.text),
-        reverse=reverse,
-    )
-    for child in sorted_children:
-        yield child
-        if child.children:  # If the child node has children
-            yield from _sort_node_children(child, tree, reverse, key)
-
-
-def sort_tree_view(
-    _row_index: list[Any],
-    tree_rns: dict[str, int],
-    tree: dict[str, Any],
-    key: Callable | None = None,
+def sort_tree_rows_by_column(
+    data: list[list[Any]],
+    column: int,
+    index: list[Any],
+    rns: dict[str, int],
     reverse: bool = False,
+    key: Callable | None = None,
 ) -> tuple[list[Any], dict[int, int]]:
-    if not _row_index or not tree_rns or not tree:
+    """
+    Sorts tree rows by a specified column in depth-first order, returning sorted nodes and a row mapping.
+
+    Args:
+        data: List of rows, where each row is a list of column values.
+        column: Index of the column to sort by.
+        index: List of nodes, where each node has 'iid', 'parent', and 'children' attributes.
+        rns: Dictionary mapping item IDs (iid) to original row numbers in data.
+        reverse: If True, sort in descending order; otherwise, ascending.
+        key: Optional function to compute sort keys; defaults to natural_sort_key if None.
+
+    Returns:
+        Tuple containing:
+        - List of nodes in sorted order.
+        - Dictionary mapping original row numbers to new row numbers.
+    """
+    if not index or not rns:
         return [], {}
 
     if key is None:
-        # prefer version_sort_key for iid names
-        key = version_sort_key
+        key = natural_sort_key  # Assuming natural_sort_key is defined elsewhere
 
-    # Create the index map and sorted nodes list
-    mapping = {}
-    sorted_nodes = []
-    new_index = 0
+    # Define the sort_reverse parameter to avoid unnecessary reversals
+    sort_reverse = not reverse
 
-    # Sort top-level nodes
-    for node in sorted(
-        (node for node in _row_index if node.parent == ""),
-        key=lambda node: key(node.text),
-        reverse=reverse,
-    ):
-        iid = node.iid
-        mapping[tree_rns[iid]] = new_index
-        sorted_nodes.append(node)
-        new_index += 1
-
-        # Sort children recursively
-        for descendant_node in _sort_node_children(node, tree, reverse, key):
-            mapping[tree_rns[descendant_node.iid]] = new_index
-            sorted_nodes.append(descendant_node)
-            new_index += 1
+    # Helper function to compute the sorting key for a node
+    def get_key(node):
+        row = data[rns[node.iid]]
+        return key(row[column] if len(row) > column else None)
+
+    # Initialize stack with sorted top-level nodes for efficiency
+    stack = sorted(
+        (node for node in index if node.parent == ""),
+        key=get_key,
+        reverse=sort_reverse,
+    )
+
+    # Initialize output structures
+    sorted_nodes = []
+    mapping = {}
+    new_rn = 0
+
+    # Process nodes iteratively in depth-first order
+    while stack:
+        current = stack.pop()  # Pop from the right end
+        sorted_nodes.append(current)
+        mapping[rns[current.iid]] = new_rn
+        new_rn += 1
+        if current.children:
+            # Sort children
+            sorted_children = sorted(
+                (index[rns[ciid]] for ciid in current.children if ciid in rns),
+                key=get_key,
+                reverse=sort_reverse,
+            )
+            # Extend stack with sorted children
+            stack.extend(sorted_children)  # Adds to the right end
 
     return sorted_nodes, mapping
 

tksheet/tksheet_types.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from collections.abc import Iterable, Iterator
 from typing import Literal, Tuple, Union
 
 from .other_classes import Span
@@ -26,8 +25,6 @@ CellPropertyKey = Literal[
     "align",
 ]
 
-AnyIter = Iterable | Iterator
-
 Binding = Literal[
     "all",
     "single_select",

{tksheet-7.4.8.dist-info → tksheet-7.4.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: tksheet
-Version: 7.4.8
+Version: 7.4.10
 Summary: Tkinter table / sheet and treeview widget
 Author-email: ragardner <github@ragardner.simplelogin.com>
 License: Copyright (c) 2019 ragardner and open source contributors

tksheet-7.4.10.dist-info/RECORD

@@ -0,0 +1,22 @@
+tksheet/__init__.py,sha256=OgyS9wliRNfROen76H0boTTekZzt6Yx6gy05ytI54ps,2327
+tksheet/colors.py,sha256=dHhmdFuQDlwohDHsAfT9VdrKoSl_R33L72a3HCin5zo,51591
+tksheet/column_headers.py,sha256=tCIjq9sv5MfOfhC1hXzWU20RO1icdox1AvlYIESIQl4,103215
+tksheet/constants.py,sha256=aiDvUSaPtl_TSNtRRJ_p87c9iTBz9ksMd5IsSXzz4Hk,13316
+tksheet/find_window.py,sha256=TvbSqO42cw1o1AO0tQ0Q1iZogouNr4ObMo7JfkZCxgA,19877
+tksheet/formatters.py,sha256=DGcRiMsDJnySNpQcjfiX84oJ7TmOSMdU6u9injIhA4g,10095
+tksheet/functions.py,sha256=Lfo605jYI87KLWo6okQhfUlr-c93ZxuOR5VJKCNY6UM,51019
+tksheet/main_table.py,sha256=Nxc1oALcWvYnUVqD4ryRvayW-KZwFmKLyHaxaWABLJ0,363945
+tksheet/other_classes.py,sha256=pe9_Cj6d3rdeMif9nGvUz0MEUChf0l4d669RNqcNhY4,16578
+tksheet/row_index.py,sha256=_lCilwJfc5Eem22S7WZH_85zWQGGLGMa1upHUGCj_Y0,140328
+tksheet/sheet.py,sha256=ZgryLoqfkm2vtJDIVhXAvSUQ8G7TXztiID8Ftt3V2qo,269531
+tksheet/sheet_options.py,sha256=ob-XYgGfBoi2TaFAvUUmlWUkw9xB-yXmJw17gu9__Lw,9948
+tksheet/sorting.py,sha256=zcZPpRtP1h_xJGtGkG3E43H7deKQFnh9cMwZ1B2-aGc,17502
+tksheet/text_editor.py,sha256=rU8Fz0-ltkM63W9io2DoZJPyzUGzCc9Z0qBtc4D1H40,7404
+tksheet/themes.py,sha256=AoNAxibnQi04MN0Zpbn9-kyDnkiiV8TDNWP9FYjpuf0,18473
+tksheet/tksheet_types.py,sha256=1MjXR34EmvP1KfHlLTvKKVnf0VMz_LU_WOM2q4o5hfI,4598
+tksheet/top_left_rectangle.py,sha256=M52IrPIeMoYE3jSpooZmqw_0W5Fz_R-Yu1ZqA685EZ8,8557
+tksheet-7.4.10.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
+tksheet-7.4.10.dist-info/METADATA,sha256=pyrkLPJDMS3fT3VWRFu5jsnCXn62_E25VQ3FpaGiKCY,8006
+tksheet-7.4.10.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+tksheet-7.4.10.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
+tksheet-7.4.10.dist-info/RECORD,,

tksheet-7.4.8.dist-info/RECORD

@@ -1,22 +0,0 @@
-tksheet/__init__.py,sha256=l619QID9OmLzoGYKcDr2pSJsVrSSFAzG17P5JHbii5s,2326
-tksheet/colors.py,sha256=dHhmdFuQDlwohDHsAfT9VdrKoSl_R33L72a3HCin5zo,51591
-tksheet/column_headers.py,sha256=FWDiKOX4LbaNA0zj2tbnnkOBW-RE6QuDxyc3EEEur5M,103267
-tksheet/constants.py,sha256=aiDvUSaPtl_TSNtRRJ_p87c9iTBz9ksMd5IsSXzz4Hk,13316
-tksheet/find_window.py,sha256=TvbSqO42cw1o1AO0tQ0Q1iZogouNr4ObMo7JfkZCxgA,19877
-tksheet/formatters.py,sha256=DGcRiMsDJnySNpQcjfiX84oJ7TmOSMdU6u9injIhA4g,10095
-tksheet/functions.py,sha256=pCTnCniLIbJI1S9nnPauok93H2EQHEHVvTVWLWImG-I,51024
-tksheet/main_table.py,sha256=U95qEPjUV75jlpOF0pMBk5mas9qrG87zKeEuIUOzDXw,363142
-tksheet/other_classes.py,sha256=pe9_Cj6d3rdeMif9nGvUz0MEUChf0l4d669RNqcNhY4,16578
-tksheet/row_index.py,sha256=F7mjNJ8o0TNDGVF78JsAH0GxJAYCGx1pbjkmxTJjMbQ,134303
-tksheet/sheet.py,sha256=kvbmFekdwEm3hyRBILPYn3SJW905UOZJO3NUllmBUk0,272258
-tksheet/sheet_options.py,sha256=ob-XYgGfBoi2TaFAvUUmlWUkw9xB-yXmJw17gu9__Lw,9948
-tksheet/sorting.py,sha256=-x1ZBIYfaneRrQPhbb0Ehs70373o52ADXp481La3nOY,16806
-tksheet/text_editor.py,sha256=rU8Fz0-ltkM63W9io2DoZJPyzUGzCc9Z0qBtc4D1H40,7404
-tksheet/themes.py,sha256=AoNAxibnQi04MN0Zpbn9-kyDnkiiV8TDNWP9FYjpuf0,18473
-tksheet/tksheet_types.py,sha256=7FIDsInby1y1DZMpVINXem4Ol5RFG1ETE5fn9I9uXSk,4679
-tksheet/top_left_rectangle.py,sha256=M52IrPIeMoYE3jSpooZmqw_0W5Fz_R-Yu1ZqA685EZ8,8557
-tksheet-7.4.8.dist-info/LICENSE.txt,sha256=ndbcCPe9SlHfweE_W2RAueWUe2k7yudyxYLq6WjFdn4,1101
-tksheet-7.4.8.dist-info/METADATA,sha256=g03IKcPe7_orOLSvu_VQXmy_qC4Lw1Xyui75SVUoVzc,8005
-tksheet-7.4.8.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-tksheet-7.4.8.dist-info/top_level.txt,sha256=my61PXCcck_HHAc9cq3NAlyAr3A3FXxCy9gptEOaCN8,8
-tksheet-7.4.8.dist-info/RECORD,,