From b4dbde9a80364c869469f38132e908948507bf77 Mon Sep 17 00:00:00 2001 From: lollipopkit Date: Tue, 31 Oct 2023 19:53:30 +0800 Subject: [PATCH] fix: swap --- .dart_tool/flutter_gen/gen_l10n/l10n.dart | 18 ++++++++++++++++++ .dart_tool/flutter_gen/gen_l10n/l10n_de.dart | 9 +++++++++ .dart_tool/flutter_gen/gen_l10n/l10n_en.dart | 9 +++++++++ .dart_tool/flutter_gen/gen_l10n/l10n_id.dart | 9 +++++++++ .dart_tool/flutter_gen/gen_l10n/l10n_zh.dart | 18 ++++++++++++++++++ lib/data/model/app/shell_func.dart | 2 +- lib/data/model/server/memory.dart | 4 ++-- lib/l10n/app_de.arb | 3 +++ lib/l10n/app_en.arb | 3 +++ lib/l10n/app_id.arb | 3 +++ lib/l10n/app_zh.arb | 3 +++ lib/l10n/app_zh_tw.arb | 3 +++ lib/view/page/server/detail.dart | 10 +++++----- 13 files changed, 86 insertions(+), 8 deletions(-) diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n.dart b/.dart_tool/flutter_gen/gen_l10n/l10n.dart index c8468ff6..33e650d8 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n.dart @@ -392,6 +392,12 @@ abstract class S { /// **'Disconnected'** String get disconnected; + /// No description provided for @disk. + /// + /// In en, this message translates to: + /// **'Disk'** + String get disk; + /// No description provided for @diskIgnorePath. /// /// In en, this message translates to: @@ -878,6 +884,12 @@ abstract class S { /// **'Need to restart app'** String get needRestart; + /// No description provided for @net. + /// + /// In en, this message translates to: + /// **'Net'** + String get net; + /// No description provided for @netViewType. /// /// In en, this message translates to: @@ -1352,6 +1364,12 @@ abstract class S { /// **'Tags'** String get tag; + /// No description provided for @temperature. + /// + /// In en, this message translates to: + /// **'Temperature'** + String get temperature; + /// No description provided for @terminal. /// /// In en, this message translates to: diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart index 4cf53113..ba5b2abf 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_de.dart @@ -153,6 +153,9 @@ class SDe extends S { @override String get disconnected => 'Disconnected'; + @override + String get disk => 'Festplatte'; + @override String get diskIgnorePath => 'Pfad für Datenträger ignorieren'; @@ -416,6 +419,9 @@ class SDe extends S { @override String get needRestart => 'App muss neugestartet werden'; + @override + String get net => 'Netz'; + @override String get netViewType => 'Netzwerkansicht Typ'; @@ -661,6 +667,9 @@ class SDe extends S { @override String get tag => 'Tags'; + @override + String get temperature => 'Temperatur'; + @override String get terminal => 'Terminal'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart index 822c16fe..2b031613 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_en.dart @@ -153,6 +153,9 @@ class SEn extends S { @override String get disconnected => 'Disconnected'; + @override + String get disk => 'Disk'; + @override String get diskIgnorePath => 'Ignore path for disk'; @@ -416,6 +419,9 @@ class SEn extends S { @override String get needRestart => 'Need to restart app'; + @override + String get net => 'Net'; + @override String get netViewType => 'Net view type'; @@ -661,6 +667,9 @@ class SEn extends S { @override String get tag => 'Tags'; + @override + String get temperature => 'Temperature'; + @override String get terminal => 'Terminal'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart index da8df9c0..4e147951 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_id.dart @@ -153,6 +153,9 @@ class SId extends S { @override String get disconnected => 'Terputus'; + @override + String get disk => 'Disk'; + @override String get diskIgnorePath => 'Abaikan jalan untuk disk'; @@ -416,6 +419,9 @@ class SId extends S { @override String get needRestart => 'Perlu memulai ulang aplikasi'; + @override + String get net => 'Net'; + @override String get netViewType => 'Jenis tampilan bersih'; @@ -661,6 +667,9 @@ class SId extends S { @override String get tag => 'Tag'; + @override + String get temperature => 'Suhu'; + @override String get terminal => 'Terminal'; diff --git a/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart b/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart index 6ab7b73f..8f1a3c72 100644 --- a/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart +++ b/.dart_tool/flutter_gen/gen_l10n/l10n_zh.dart @@ -153,6 +153,9 @@ class SZh extends S { @override String get disconnected => '连接断开'; + @override + String get disk => '硬盘'; + @override String get diskIgnorePath => '忽略的磁盘路径'; @@ -416,6 +419,9 @@ class SZh extends S { @override String get needRestart => '需要重启 App'; + @override + String get net => '网络'; + @override String get netViewType => '网络视图类型'; @@ -661,6 +667,9 @@ class SZh extends S { @override String get tag => '标签'; + @override + String get temperature => '温度'; + @override String get terminal => '终端'; @@ -915,6 +924,9 @@ class SZhTw extends SZh { @override String get disconnected => '連接斷開'; + @override + String get disk => '硬盤'; + @override String get diskIgnorePath => '忽略的磁盤路徑'; @@ -1178,6 +1190,9 @@ class SZhTw extends SZh { @override String get needRestart => '需要重啓 App'; + @override + String get net => '網絡'; + @override String get netViewType => '網絡視圖類型'; @@ -1423,6 +1438,9 @@ class SZhTw extends SZh { @override String get tag => '标签'; + @override + String get temperature => '溫度'; + @override String get terminal => '终端機'; diff --git a/lib/data/model/app/shell_func.dart b/lib/data/model/app/shell_func.dart index f841b549..fb39fc95 100644 --- a/lib/data/model/app/shell_func.dart +++ b/lib/data/model/app/shell_func.dart @@ -212,7 +212,7 @@ const _statusCmds = [ 'uptime', 'cat /proc/net/snmp', 'df -h', - 'cat /proc/meminfo | grep Mem', + "cat /proc/meminfo | grep -E 'Mem|Swap'", 'cat /sys/class/thermal/thermal_zone*/type', 'cat /sys/class/thermal/thermal_zone*/temp', 'hostname', diff --git a/lib/data/model/server/memory.dart b/lib/data/model/server/memory.dart index c2f75489..94d5ba58 100644 --- a/lib/data/model/server/memory.dart +++ b/lib/data/model/server/memory.dart @@ -95,7 +95,7 @@ Swap parseSwap(String raw) { ?.group(2) ?? '1', ) ?? - 1; + 0; final free = int.tryParse( items .firstWhere( @@ -105,7 +105,7 @@ Swap parseSwap(String raw) { ?.group(2) ?? '1', ) ?? - 1; + 0; final cached = int.tryParse( items .firstWhere( diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index 9410c8cf..7d8945d8 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -49,6 +49,7 @@ "dirEmpty": "Stelle sicher, dass der Ordner leer ist.", "disabled": "Behinderte", "disconnected": "Disconnected", + "disk": "Festplatte", "diskIgnorePath": "Pfad für Datenträger ignorieren", "dl2Local": "Datei \"{fileName}\" herunterladen?", "dockerEditHost": "DOCKER_HOST bearbeiten", @@ -130,6 +131,7 @@ "ms": "ms", "name": "Name", "needRestart": "App muss neugestartet werden", + "net": "Netz", "netViewType": "Netzwerkansicht Typ", "newContainer": "Neuer Container", "noClient": "Kein Client", @@ -209,6 +211,7 @@ "syncTip": "Damit einige Änderungen wirksam werden, kann ein Neustart erforderlich sein.", "system": "Systeme", "tag": "Tags", + "temperature": "Temperatur", "terminal": "Terminal", "theme": "Themen", "themeMode": "Themen-Modus", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 7d2cbc46..9123525c 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -49,6 +49,7 @@ "dirEmpty": "Make sure dir is empty.", "disabled": "Disabled", "disconnected": "Disconnected", + "disk": "Disk", "diskIgnorePath": "Ignore path for disk", "dl2Local": "Download {fileName} to local?", "dockerEditHost": "Edit DOCKER_HOST", @@ -130,6 +131,7 @@ "ms": "ms", "name": "Name", "needRestart": "Need to restart app", + "net": "Net", "netViewType": "Net view type", "newContainer": "New container", "noClient": "No client", @@ -209,6 +211,7 @@ "syncTip": "A restart may be required for some changes to take effect.", "system": "System", "tag": "Tags", + "temperature": "Temperature", "terminal": "Terminal", "theme": "Theme", "themeMode": "Theme mode", diff --git a/lib/l10n/app_id.arb b/lib/l10n/app_id.arb index 3a0ac844..f6b2c5a6 100644 --- a/lib/l10n/app_id.arb +++ b/lib/l10n/app_id.arb @@ -49,6 +49,7 @@ "dirEmpty": "Pastikan dir kosong.", "disabled": "Dengan disabilitas", "disconnected": "Terputus", + "disk": "Disk", "diskIgnorePath": "Abaikan jalan untuk disk", "dl2Local": "Unduh {fileName} ke lokal?", "dockerEditHost": "Edit Docker_host", @@ -130,6 +131,7 @@ "ms": "MS", "name": "Nama", "needRestart": "Perlu memulai ulang aplikasi", + "net": "Net", "netViewType": "Jenis tampilan bersih", "newContainer": "Wadah baru", "noClient": "Tidak ada klien", @@ -209,6 +211,7 @@ "syncTip": "Pengaktifan ulang mungkin diperlukan agar beberapa perubahan dapat diterapkan.", "system": "Sistem", "tag": "Tag", + "temperature": "Suhu", "terminal": "Terminal", "theme": " Tema", "themeMode": "Mode tema", diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb index e08d348e..28eb9afb 100644 --- a/lib/l10n/app_zh.arb +++ b/lib/l10n/app_zh.arb @@ -49,6 +49,7 @@ "dirEmpty": "请确保文件夹为空", "disabled": "已禁用", "disconnected": "连接断开", + "disk": "硬盘", "diskIgnorePath": "忽略的磁盘路径", "dl2Local": "下载 {fileName} 到本地？", "dockerEditHost": "编辑 DOCKER_HOST", @@ -130,6 +131,7 @@ "ms": "毫秒", "name": "名称", "needRestart": "需要重启 App", + "net": "网络", "netViewType": "网络视图类型", "newContainer": "新建容器", "noClient": "没有SSH连接", @@ -209,6 +211,7 @@ "syncTip": "可能需要重新启动，某些更改才能生效。", "system": "系统", "tag": "标签", + "temperature": "温度", "terminal": "终端", "theme": "主题", "themeMode": "主题模式", diff --git a/lib/l10n/app_zh_tw.arb b/lib/l10n/app_zh_tw.arb index 50aca3b1..64959e04 100644 --- a/lib/l10n/app_zh_tw.arb +++ b/lib/l10n/app_zh_tw.arb @@ -49,6 +49,7 @@ "dirEmpty": "請確保文件夾為空", "disabled": "已禁用", "disconnected": "連接斷開", + "disk": "硬盤", "diskIgnorePath": "忽略的磁盤路徑", "dl2Local": "下載 {fileName} 到本地？", "dockerEditHost": "編輯 DOCKER_HOST", @@ -130,6 +131,7 @@ "ms": "毫秒", "name": "名稱", "needRestart": "需要重啓 App", + "net": "網絡", "netViewType": "網絡視圖類型", "newContainer": "新建容器", "noClient": "沒有SSH連接", @@ -209,6 +211,7 @@ "syncTip": "可能需要重新啟動，某些更改才能生效。", "system": "系統", "tag": "标签", + "temperature": "溫度", "terminal": "终端機", "theme": "主題", "themeMode": "主題模式", diff --git a/lib/view/page/server/detail.dart b/lib/view/page/server/detail.dart index a01c3b5b..3b641763 100644 --- a/lib/view/page/server/detail.dart +++ b/lib/view/page/server/detail.dart @@ -319,8 +319,8 @@ class _ServerDetailPageState extends State List.generate(disks.length, (idx) => _buildDiskItem(disks[idx], ss)); return CardX( ExpandTile( - title: Text('Disk'), - leading: Icon(Icons.storage, size: 17), + title: Text(l10n.disk), + leading: const Icon(Icons.storage, size: 17), initiallyExpanded: children.length <= 7, children: children, ), @@ -374,8 +374,8 @@ class _ServerDetailPageState extends State build: () { return CardX( ExpandTile( - title: Text('Net'), - leading: Icon(Icons.device_hub, size: 17), + title: Text(l10n.net), + leading: const Icon(Icons.device_hub, size: 17), initiallyExpanded: children.length <= 7, children: children, ), @@ -414,7 +414,7 @@ class _ServerDetailPageState extends State } return CardX( ExpandTile( - title: Text('Temperature'), + title: Text(l10n.temperature), leading: const Icon(Icons.ac_unit, size: 17), initiallyExpanded: ss.temps.devices.length <= 7, children: ss.temps.devices