progress-table 3.1.2__tar.gz → 3.2.1__tar.gz

{progress_table-3.1.2 → progress_table-3.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: progress-table
-Version: 3.1.2
+Version: 3.2.1
 Summary: Display progress as a pretty table in the command line.
 Project-URL: Home, https://github.com/gahaalt/progress-table
 Project-URL: Documentation, https://github.com/sjmikler/progress-table/blob/main/docs
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.7
 Requires-Dist: colorama
+Requires-Dist: wcwidth
 Provides-Extra: dev
 Requires-Dist: hatch; extra == 'dev'
 Requires-Dist: pyright; extra == 'dev'

{progress_table-3.1.2 → progress_table-3.2.1}/progress_table/__init__.py

@@ -10,7 +10,7 @@ Supported features:
 """
 
 __license__ = "MIT"
-__version__ = "3.1.2"
+__version__ = "3.2.1"
 __author__ = "Szymon Mikler"
 
 from progress_table.progress_table import ProgressTable, styles

{progress_table-3.1.2 → progress_table-3.2.1}/progress_table/progress_table.py

@@ -17,6 +17,7 @@ from dataclasses import dataclass
 from threading import Thread
 from typing import Any, TextIO
 
+import wcwidth
 from colorama import Style
 
 from progress_table import styles
@@ -833,31 +834,38 @@ class ProgressTable:
         return {col: self.column_colors[col] + color_colorama[col] for col in color}
 
     def _apply_cell_formatting(self, value: Any, column_name: str, color: str) -> str:
-        str_value = self.custom_cell_format(value)
         width = self.column_widths[column_name]
+        str_value = self.custom_cell_format(value)
         alignment = self.column_alignments[column_name]
 
+        real_width = 0
+        clipped = False
+        num_characters = len(str_value)
+        for idx, letter in enumerate(str_value):
+            ch_width = wcwidth.wcwidth(letter)
+            if real_width + ch_width > width:
+                num_characters = idx
+                clipped = True
+                break
+            real_width += ch_width
+
+        str_value = str_value[:num_characters]
+        num_characters += width - real_width
+
         if alignment == "center":
-            str_value = str_value.center(width)
+            str_value = str_value.center(num_characters)
         elif alignment == "left":
-            str_value = str_value.ljust(width)
+            str_value = str_value.ljust(num_characters)
         elif alignment == "right":
-            str_value = str_value.rjust(width)
+            str_value = str_value.rjust(num_characters)
         else:
             allowed_alignments = ["center", "left", "right"]
             msg = f"Alignment '{alignment}' not in {allowed_alignments}!"
             raise KeyError(msg)
 
-        clipped = len(str_value) > width
-        str_value = "".join(
-            [
-                " ",  # space at the beginning of the row
-                str_value[:width].center(width),
-                self.table_style.cell_overflow if clipped else " ",
-            ],
-        )
         reset = Style.RESET_ALL if color else ""
-        return f"{color}{str_value}{reset}"
+        maybe_overflow = self.table_style.cell_overflow if clipped else " "
+        return f"{color} {str_value}{maybe_overflow}{reset}"
 
     def _get_outer_inner_width(self) -> int:
         return sum(self.column_widths.values()) + 3 * len(self.column_widths) + 1

{progress_table-3.1.2 → progress_table-3.2.1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 name = "progress-table"
 dynamic = ["version"]
 description = "Display progress as a pretty table in the command line."
-dependencies = ["colorama"]
+dependencies = ["colorama", "wcwidth"]
 license = { text = "MIT" }
 requires-python = ">=3.7"
 authors = [