cli: use dynamic column widths in simple table

- Remove fixed lengths from Column class
- Add dynamic width calculation to SimpleTable
- Update service table to use new batched printing

Signed-off-by: Richard Alpe <[email protected]>

Author: rical

src/statd/python/cli_pretty/cli_pretty.py

@@ -283,17 +283,17 @@ def table_width(cls):
 
 class Column:
     """Column definition for SimpleTable"""
-    def __init__(self, name, length, align='left', formatter=None):
-        self.name = name          # Header text
-        self.width = length       # Max visible data length (excluding ANSI codes)
-        self.align = align        # 'left' or 'right' (defaults to 'left')
-        self.formatter = formatter # Optional function to format values
+    def __init__(self, name, align='left', formatter=None):
+        self.name = name
+        self.align = align
+        self.formatter = formatter
 
 class SimpleTable:
-    """Simple table formatter that handles ANSI colors correctly"""
+    """Simple table formatter that handles ANSI colors correctly and calculates dynamic column widths"""
 
     def __init__(self, columns):
         self.columns = columns
+        self.rows = []
 
     @staticmethod
     def visible_width(text):
@@ -302,48 +302,68 @@ def visible_width(text):
         clean_text = re.sub(ansi_pattern, '', str(text))
         return len(clean_text)
 
-    def _format_column(self, value, column):
-        """Format a single column value with proper alignment
+    def row(self, *values):
+        """Store row data for later formatting"""
+        if len(values) != len(self.columns):
+            raise ValueError(f"Expected {len(self.columns)} values, got {len(values)}")
+        self.rows.append(values)
 
-        The column length specifies max expected data length.
-        Framework automatically adds 1 space for column separation.
-        """
-        if column.formatter:
-            value = column.formatter(value)
+    def print(self, styled=True):
+        """Calculate widths and print complete table"""
+        column_widths = self._calculate_column_widths()
+        print(self._format_header(column_widths, styled))
+        for row_data in self.rows:
+            print(self._format_row(row_data, column_widths))
 
-        value_str = str(value)
-        visible_len = self.visible_width(value_str)
+    def _calculate_column_widths(self):
+        """Calculate maximum width needed for each column"""
+        widths = [self.visible_width(col.name) for col in self.columns]
 
-        if column.align == 'right':
-            padding = column.width - visible_len
-            return ' ' * max(0, padding) + value_str + ' '
-        else:  # left alignment (default)
-            padding = column.width - visible_len
-            return value_str + ' ' * max(0, padding) + ' '
+        for row_data in self.rows:
+            for i, (value, column) in enumerate(zip(row_data, self.columns)):
+                formatted_value = column.formatter(value) if column.formatter else value
+                value_width = self.visible_width(str(formatted_value))
+                widths[i] = max(widths[i], value_width)
+
+        return widths
 
-    def header(self, styled=True):
+    def _format_header(self, column_widths, styled=True):
         """Generate formatted header row"""
         header_parts = []
-        for column in self.columns:
+        for i, column in enumerate(self.columns):
+            width = column_widths[i]
             if column.align == 'right':
-                header_parts.append(f"{column.name:>{column.width}} ")
-            else:  # left alignment (default)
-                header_parts.append(f"{column.name:{column.width}} ")
+                header_parts.append(f"{column.name:>{width}}  ")
+            else:
+                header_parts.append(f"{column.name:{width}}  ")
 
-        header_str = ''.join(header_parts)
+        header_str = ''.join(header_parts).rstrip()
         return Decore.invert(header_str) if styled else header_str
 
-    def row(self, *values):
-        """Generate formatted data row"""
-        if len(values) != len(self.columns):
-            raise ValueError(f"Expected {len(self.columns)} values, got {len(values)}")
-
+    def _format_row(self, row_data, column_widths):
+        """Format a single data row"""
         row_parts = []
-        for value, column in zip(values, self.columns):
-            row_parts.append(self._format_column(value, column))
+        for i, (value, column) in enumerate(zip(row_data, self.columns)):
+            formatted_value = self._format_column_value(value, column, column_widths[i])
+            row_parts.append(formatted_value)
 
         return ''.join(row_parts).rstrip()
 
+    def _format_column_value(self, value, column, width):
+        """Format a single column value with proper alignment"""
+        if column.formatter:
+            value = column.formatter(value)
+
+        value_str = str(value)
+        visible_len = self.visible_width(value_str)
+
+        if column.align == 'right':
+            padding = width - visible_len
+            return ' ' * max(0, padding) + value_str + '  '
+        else:
+            padding = width - visible_len
+            return value_str + ' ' * max(0, padding) + '  '
+
 
 class Decore():
     @staticmethod
@@ -1781,17 +1801,15 @@ def show_services(json):
     # copied so I left a lot of comments. If you copy it feel free
     # to be less verbose..
     service_table = SimpleTable([
-        Column('NAME', 15, 'left'),        # Max service name length
-        Column('STATUS', 10, 'left'),      # Max status text length (e.g., "running")
-        Column('PID', 7, 'right'),         # Max PID digits
-        Column('MEM', 6, 'right'),         # Max memory string (e.g., "123.4M")
-        Column('UP', 4, 'right'),          # Max uptime string (e.g., "3d")
-        Column('RST', 3, 'right'),         # Max restart count digits
-        Column('DESCRIPTION', 30)           # Last column needs no padding
+        Column('NAME'),
+        Column('STATUS'),
+        Column('PID', 'right'),
+        Column('MEM', 'right'),
+        Column('UP', 'right'),
+        Column('RST', 'right'),
+        Column('DESCRIPTION')
     ])
 
-    print(service_table.header())
-
     for svc in services:
         name = svc.get('name', '')
         status = svc.get('status', '')
@@ -1815,8 +1833,10 @@ def show_services(json):
         memory_str = format_memory_bytes(memory_bytes)
         uptime_str = format_uptime_seconds(uptime_secs)
 
-        print(service_table.row(name, status_str, pid_str, memory_str,
-                                uptime_str, restart_count, description))
+        service_table.row(name, status_str, pid_str, memory_str,
+                          uptime_str, restart_count, description)
+
+    service_table.print()
 
 
 def show_hardware(json):

test/case/statd/system/cli/show-services

@@ -1,24 +1,24 @@
-NAME            STATUS         PID    MEM   UP RST DESCRIPTION                    
-udevd           running       1185         23m   0 Device event daemon (udev)
-dbus            running       2248         23m   0 D-Bus message bus daemon
-confd           running       3039         23m   0 Configuration daemon
-netopeer        running       3548         23m   0 NETCONF server
-dnsmasq         running       2249         23m   0 DHCP/DNS proxy
-tty:hvc0        running       3559         23m   0 Getty on hvc0
-iitod           running       2340         23m   0 LED daemon
-klishd          running       3560         23m   0 CLI backend daemon
-mdns-alias      running       3617         23m   0 mDNS alias advertiser
-mstpd           stopped                          0 Spanning Tree daemon
-rauc            running       3564         23m   0 Software update service
-resolvconf      done                             2 Update DNS configuration
-statd           running       3472         23m   0 Status daemon
-staticd         running       3653         23m   0 Static routing daemon
-syslogd         running       2241         23m   0 System log daemon
-watchdogd       running       2242         23m   0 System watchdog daemon
-zebra           running       3587         23m   0 Zebra routing daemon
-mdns            running       3616         23m   0 Avahi mDNS-SD daemon
-chronyd         running       3618         23m   0 Chrony NTP v3/v4 daemon
-lldpd           running       3633         23m   0 LLDP daemon (IEEE 802.1ab)
-nginx           running       3635         23m   0 Web server
-rousette        running       3636         23m   0 RESTCONF server
-sshd            running       3641         23m   0 OpenSSH daemon
+NAME        STATUS    PID  MEM   UP  RST  DESCRIPTION
+udevd       running  1185       23m    0  Device event daemon (udev)
+dbus        running  2248       23m    0  D-Bus message bus daemon
+confd       running  3039       23m    0  Configuration daemon
+netopeer    running  3548       23m    0  NETCONF server
+dnsmasq     running  2249       23m    0  DHCP/DNS proxy
+tty:hvc0    running  3559       23m    0  Getty on hvc0
+iitod       running  2340       23m    0  LED daemon
+klishd      running  3560       23m    0  CLI backend daemon
+mdns-alias  running  3617       23m    0  mDNS alias advertiser
+mstpd       stopped                    0  Spanning Tree daemon
+rauc        running  3564       23m    0  Software update service
+resolvconf  done                       2  Update DNS configuration
+statd       running  3472       23m    0  Status daemon
+staticd     running  3653       23m    0  Static routing daemon
+syslogd     running  2241       23m    0  System log daemon
+watchdogd   running  2242       23m    0  System watchdog daemon
+zebra       running  3587       23m    0  Zebra routing daemon
+mdns        running  3616       23m    0  Avahi mDNS-SD daemon
+chronyd     running  3618       23m    0  Chrony NTP v3/v4 daemon
+lldpd       running  3633       23m    0  LLDP daemon (IEEE 802.1ab)
+nginx       running  3635       23m    0  Web server
+rousette    running  3636       23m    0  RESTCONF server
+sshd        running  3641       23m    0  OpenSSH daemon