From e80f6d4cc2411aab60e05ac0f72483acc9687028 Mon Sep 17 00:00:00 2001
From: lollipopkit <lollipopkit@icloud.com>
Date: Fri, 3 Nov 2023 22:13:18 +0800
Subject: [PATCH] opt.

- spi: use ip as name if empty
- server tab ui
- only display io speed when available
---
 lib/data/model/server/disk.dart |  5 +++--
 lib/view/page/server/edit.dart  |  4 +++-
 lib/view/page/server/tab.dart   | 23 ++++++++++-------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/data/model/server/disk.dart b/lib/data/model/server/disk.dart
index f4940f00..2b66122f 100644
--- a/lib/data/model/server/disk.dart
+++ b/lib/data/model/server/disk.dart
@@ -44,8 +44,9 @@ class DiskIO extends TimeSeq<DiskIOPiece> {
 
   (String?, String?) getSpeed(String dev) {
     final (read_, write_) = _getSpeed(dev);
-    final read = '${read_?.convertBytes}/s';
-    final write = '${write_?.convertBytes}/s';
+    if (read_ == null || write_ == null) return (null, null);
+    final read = '${read_.convertBytes}/s';
+    final write = '${write_.convertBytes}/s';
     return (read, write);
   }
 
diff --git a/lib/view/page/server/edit.dart b/lib/view/page/server/edit.dart
index 2a23a4bb..6d8382df 100644
--- a/lib/view/page/server/edit.dart
+++ b/lib/view/page/server/edit.dart
@@ -393,7 +393,9 @@ class _ServerEditPageState extends State<ServerEditPage> {
     }
 
     final spi = ServerPrivateInfo(
-      name: _nameController.text,
+      name: _nameController.text.isEmpty
+          ? _ipController.text
+          : _nameController.text,
       ip: _ipController.text,
       port: int.parse(_portController.text),
       user: _usernameController.text,
diff --git a/lib/view/page/server/tab.dart b/lib/view/page/server/tab.dart
index d40952fe..f66ee4d5 100644
--- a/lib/view/page/server/tab.dart
+++ b/lib/view/page/server/tab.dart
@@ -212,8 +212,8 @@ class _ServerPageState extends State<ServerPage>
   Widget _wrapWithSizedbox(Widget child) {
     return SizedBox(
       width: _useDoubleColumn
-          ? (_media.size.width - 146) / 10
-          : (_media.size.width - 74) / 5,
+          ? (_media.size.width - 137) / 8
+          : (_media.size.width - 74) / 4,
       child: child,
     );
   }
@@ -307,17 +307,14 @@ class _ServerPageState extends State<ServerPage>
   List<Widget> _buildNormalCard(ServerStatus ss, ServerPrivateInfo spi) {
     return [
       UIs.height13,
-      Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 13),
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            _wrapWithSizedbox(_buildPercentCircle(ss.cpu.usedPercent())),
-            _wrapWithSizedbox(_buildPercentCircle(ss.mem.usedPercent * 100)),
-            _wrapWithSizedbox(_buildNet(ss, spi.id)),
-            _wrapWithSizedbox(_buildDisk(ss, spi.id)),
-          ],
-        ),
+      Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          _wrapWithSizedbox(_buildPercentCircle(ss.cpu.usedPercent())),
+          _wrapWithSizedbox(_buildPercentCircle(ss.mem.usedPercent * 100)),
+          _wrapWithSizedbox(_buildNet(ss, spi.id)),
+          _wrapWithSizedbox(_buildDisk(ss, spi.id)),
+        ],
       ),
       UIs.height13,
       if (Stores.setting.moveOutServerTabFuncBtns.fetch() &&