diff --git a/assets/linux/alpine.png b/assets/linux/alpine.png new file mode 100644 index 00000000..e4e388ab Binary files /dev/null and b/assets/linux/alpine.png differ diff --git a/assets/linux/arch.png b/assets/linux/arch.png index dd3979d9..23d9c257 100644 Binary files a/assets/linux/arch.png and b/assets/linux/arch.png differ diff --git a/assets/linux/armbian.png b/assets/linux/armbian.png index 0eb899b1..83adef2c 100644 Binary files a/assets/linux/armbian.png and b/assets/linux/armbian.png differ diff --git a/assets/linux/centos.png b/assets/linux/centos.png index 4eba575c..64bee1cd 100644 Binary files a/assets/linux/centos.png and b/assets/linux/centos.png differ diff --git a/assets/linux/debian.png b/assets/linux/debian.png index 37312ffa..a8d26f30 100644 Binary files a/assets/linux/debian.png and b/assets/linux/debian.png differ diff --git a/assets/linux/fedora.png b/assets/linux/fedora.png index 45176f12..85359fd8 100644 Binary files a/assets/linux/fedora.png and b/assets/linux/fedora.png differ diff --git a/assets/linux/kali.png b/assets/linux/kali.png index aa9f6ea9..4b2887e3 100644 Binary files a/assets/linux/kali.png and b/assets/linux/kali.png differ diff --git a/assets/linux/linux.psd b/assets/linux/linux.psd new file mode 100644 index 00000000..5958139d Binary files /dev/null and b/assets/linux/linux.psd differ diff --git a/assets/linux/opensuse.png b/assets/linux/opensuse.png index b555a6da..6186fba5 100644 Binary files a/assets/linux/opensuse.png and b/assets/linux/opensuse.png differ diff --git a/assets/linux/rocky.png b/assets/linux/rocky.png index 4431d97e..19bc0e33 100644 Binary files a/assets/linux/rocky.png and b/assets/linux/rocky.png differ diff --git a/assets/linux/ubuntu.png b/assets/linux/ubuntu.png index 9c79567b..d22b8346 100644 Binary files a/assets/linux/ubuntu.png and b/assets/linux/ubuntu.png differ diff --git a/assets/linux/wrt.png b/assets/linux/wrt.png index bb208dd9..bb4f7aaf 100644 Binary files a/assets/linux/wrt.png and b/assets/linux/wrt.png differ diff --git a/lib/data/model/server/disk_info.dart b/lib/data/model/server/disk_info.dart index b4b3200c..59526187 100644 --- a/lib/data/model/server/disk_info.dart +++ b/lib/data/model/server/disk_info.dart @@ -33,11 +33,20 @@ List parseDisk(String raw) { final list = []; final items = raw.split('\n'); items.removeAt(0); + var pathCache = ''; for (var item in items) { if (item.isEmpty) { continue; } final vals = item.split(numReg); + if (vals.length == 1) { + pathCache = vals[0]; + continue; + } + if (pathCache != '') { + vals[0] = pathCache; + pathCache = ''; + } list.add(DiskInfo( vals[0], vals[5], diff --git a/lib/data/model/server/dist.dart b/lib/data/model/server/dist.dart index f916bc21..d697f1a2 100644 --- a/lib/data/model/server/dist.dart +++ b/lib/data/model/server/dist.dart @@ -8,6 +8,7 @@ enum Dist { wrt, armbian, arch, + alpine, rocky; String? get iconPath { diff --git a/lib/data/model/server/server_status_update_req.dart b/lib/data/model/server/server_status_update_req.dart index 7b0d9fdb..f2eb5fcd 100644 --- a/lib/data/model/server/server_status_update_req.dart +++ b/lib/data/model/server/server_status_update_req.dart @@ -15,7 +15,7 @@ class ServerStatusUpdateReq { Future getStatus(ServerStatusUpdateReq req) async { final net = parseNetSpeed(req.segments[0]); req.ss.netSpeed.update(net); - final sys = _parseSysVer(req.segments[1]); + final sys = _parseSysVer(req.segments[1], req.segments[9]); if (sys != null) { req.ss.sysVer = sys; } @@ -49,10 +49,11 @@ String? _parseUpTime(String raw) { return null; } -String? _parseSysVer(String raw) { +String? _parseSysVer(String raw, String hostname) { final s = raw.split('='); if (s.length == 2) { return s[1].replaceAll('"', '').replaceFirst('\n', ''); } + if (hostname.isNotEmpty) return hostname; return null; } diff --git a/lib/data/res/server_cmd.dart b/lib/data/res/server_cmd.dart index 4a99d284..bb4b24cc 100644 --- a/lib/data/res/server_cmd.dart +++ b/lib/data/res/server_cmd.dart @@ -29,4 +29,6 @@ echo $seperator cat /sys/class/thermal/thermal_zone*/type echo $seperator cat /sys/class/thermal/thermal_zone*/temp +echo $seperator +hostname """; diff --git a/pubspec.yaml b/pubspec.yaml index bb762147..2f0681f5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -100,6 +100,8 @@ flutter: - assets/linux/opensuse.png - assets/linux/wrt.png - assets/linux/armbian.png + - assets/linux/alpine.png + - assets/linux/rocky.png # - images/a_dot_burr.jpeg # - images/a_dot_ham.jpeg # An image asset can refer to one or more resolution-specific "variants", see