[hytop] Reorder display columns to TX before RX

projects/hytop/src/hytop/net/app.py

@@ -81,10 +81,10 @@ class NetMonitorApp(App[int]):
         ("host", "Host"),
         ("mode", "Mode"),
         ("nic", "NIC"),
-        ("rx_bps", "RX"),
         ("tx_bps", "TX"),
-        ("rx_avg", "RX@window"),
+        ("rx_bps", "RX"),
         ("tx_avg", "TX@window"),
+        ("rx_avg", "RX@window"),
     ]
 
     def __init__(
@@ -115,10 +115,10 @@ class NetMonitorApp(App[int]):
             "mode",
             "device",
             "nic",
-            "rx",
             "tx",
-            "rx_avg",
+            "rx",
             "tx_avg",
+            "rx_avg",
         ]
         self._sort_mode: str = "grouped"
         self._sort_desc: bool = False
@@ -142,10 +142,10 @@ class NetMonitorApp(App[int]):
         table.add_column("Mode", key="mode")
         table.add_column("Device", key="device")
         table.add_column("NIC", key="nic")
-        table.add_column("RX", key="rx")
         table.add_column("TX", key="tx")
-        table.add_column(f"RX@{fmt_window(self._window)}", key="rx_avg")
+        table.add_column("RX", key="rx")
         table.add_column(f"TX@{fmt_window(self._window)}", key="tx_avg")
+        table.add_column(f"RX@{fmt_window(self._window)}", key="rx_avg")
         render_interval = min(self._interval, 0.5)
         self.set_interval(render_interval, self._tick)
 
@@ -226,14 +226,14 @@ class NetMonitorApp(App[int]):
                 latest_rate = history.latest()
                 if latest_rate is None:
                     return None
-                if field == "rx_bps":
-                    return latest_rate.rx_bps
                 if field == "tx_bps":
                     return latest_rate.tx_bps
-                if field == "rx_avg":
-                    return history.avg("rx_bps", self._window, now)
+                if field == "rx_bps":
+                    return latest_rate.rx_bps
                 if field == "tx_avg":
                     return history.avg("tx_bps", self._window, now)
+                if field == "rx_avg":
+                    return history.avg("rx_bps", self._window, now)
                 return None
 
             key_list = sort_with_missing_last(key_list, _metric_value, self._sort_desc)
@@ -273,10 +273,10 @@ class NetMonitorApp(App[int]):
                 mode,
                 device_text,
                 nic_text,
-                format_rate(latest_rate.rx_bps, self._iec),
                 format_rate(latest_rate.tx_bps, self._iec),
-                format_rate(rx_avg, self._iec),
+                format_rate(latest_rate.rx_bps, self._iec),
                 format_rate(tx_avg, self._iec),
+                format_rate(rx_avg, self._iec),
             ]
 
         if keys_to_display == self._ordered_keys: