From cf3a2465201944557dcc72448ccfe8b4700b4448 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Fri, 15 Mar 2024 19:22:31 -0600 Subject: [PATCH] opt.: ignore all disk not start with `/dev` --- lib/data/model/server/disk.dart | 4 +++- lib/data/res/default.dart | 10 ---------- lib/data/store/setting.dart | 4 ---- lib/view/page/server/detail.dart | 11 ++--------- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/lib/data/model/server/disk.dart b/lib/data/model/server/disk.dart index 9f731215..a616ba07 100644 --- a/lib/data/model/server/disk.dart +++ b/lib/data/model/server/disk.dart @@ -40,8 +40,10 @@ class Disk { pathCache = ''; } try { + final dev = vals[0]; + if (!dev.startsWith('/dev')) continue; list.add(Disk( - dev: vals[0], + dev: dev, mount: vals[5], usedPercent: int.parse(vals[4].replaceFirst('%', '')), used: BigInt.tryParse(vals[2]) ?? BigInt.zero, diff --git a/lib/data/res/default.dart b/lib/data/res/default.dart index 0699ada8..a6fab0a1 100644 --- a/lib/data/res/default.dart +++ b/lib/data/res/default.dart @@ -17,16 +17,6 @@ abstract final class Defaults { 'battery' ]; - static const diskIgnorePath = [ - 'udev', - 'tmpfs', - 'devtmpfs', - 'overlay', - 'run', - 'none', - 'shm', - ]; - static const sshVirtKeys = [ VirtKey.esc, VirtKey.alt, diff --git a/lib/data/store/setting.dart b/lib/data/store/setting.dart index 65f71c3a..c9f5e067 100644 --- a/lib/data/store/setting.dart +++ b/lib/data/store/setting.dart @@ -38,10 +38,6 @@ class SettingStore extends PersistentStore { Defaults.launchPageIdx, ); - /// Server detail disk ignore path - late final diskIgnorePath = - property('diskIgnorePath', Defaults.diskIgnorePath); - /// Disk view: amount / IO late final serverTabPreferDiskAmount = property( 'serverTabPreferDiskAmount', diff --git a/lib/view/page/server/detail.dart b/lib/view/page/server/detail.dart index c624a78c..186401f0 100644 --- a/lib/view/page/server/detail.dart +++ b/lib/view/page/server/detail.dart @@ -430,15 +430,8 @@ class _ServerDetailPageState extends State } Widget _buildDiskView(ServerStatus ss) { - final disks = ss.disk; - disks.removeWhere((e) { - for (final ingorePath in Stores.setting.diskIgnorePath.fetch()) { - if (e.dev.startsWith(ingorePath)) return true; - } - return false; - }); - final children = - List.generate(disks.length, (idx) => _buildDiskItem(disks[idx], ss)); + final children = List.generate( + ss.disk.length, (idx) => _buildDiskItem(ss.disk[idx], ss)); return CardX( child: ExpandTile( title: Text(l10n.disk),