fix: swap

This commit is contained in:
lollipopkit
2023-10-31 19:53:30 +08:00
parent 37df072711
commit b4dbde9a80
13 changed files with 86 additions and 8 deletions

View File

@@ -392,6 +392,12 @@ abstract class S {
/// **'Disconnected'** /// **'Disconnected'**
String get disconnected; String get disconnected;
/// No description provided for @disk.
///
/// In en, this message translates to:
/// **'Disk'**
String get disk;
/// No description provided for @diskIgnorePath. /// No description provided for @diskIgnorePath.
/// ///
/// In en, this message translates to: /// In en, this message translates to:
@@ -878,6 +884,12 @@ abstract class S {
/// **'Need to restart app'** /// **'Need to restart app'**
String get needRestart; String get needRestart;
/// No description provided for @net.
///
/// In en, this message translates to:
/// **'Net'**
String get net;
/// No description provided for @netViewType. /// No description provided for @netViewType.
/// ///
/// In en, this message translates to: /// In en, this message translates to:
@@ -1352,6 +1364,12 @@ abstract class S {
/// **'Tags'** /// **'Tags'**
String get tag; String get tag;
/// No description provided for @temperature.
///
/// In en, this message translates to:
/// **'Temperature'**
String get temperature;
/// No description provided for @terminal. /// No description provided for @terminal.
/// ///
/// In en, this message translates to: /// In en, this message translates to:

View File

@@ -153,6 +153,9 @@ class SDe extends S {
@override @override
String get disconnected => 'Disconnected'; String get disconnected => 'Disconnected';
@override
String get disk => 'Festplatte';
@override @override
String get diskIgnorePath => 'Pfad für Datenträger ignorieren'; String get diskIgnorePath => 'Pfad für Datenträger ignorieren';
@@ -416,6 +419,9 @@ class SDe extends S {
@override @override
String get needRestart => 'App muss neugestartet werden'; String get needRestart => 'App muss neugestartet werden';
@override
String get net => 'Netz';
@override @override
String get netViewType => 'Netzwerkansicht Typ'; String get netViewType => 'Netzwerkansicht Typ';
@@ -661,6 +667,9 @@ class SDe extends S {
@override @override
String get tag => 'Tags'; String get tag => 'Tags';
@override
String get temperature => 'Temperatur';
@override @override
String get terminal => 'Terminal'; String get terminal => 'Terminal';

View File

@@ -153,6 +153,9 @@ class SEn extends S {
@override @override
String get disconnected => 'Disconnected'; String get disconnected => 'Disconnected';
@override
String get disk => 'Disk';
@override @override
String get diskIgnorePath => 'Ignore path for disk'; String get diskIgnorePath => 'Ignore path for disk';
@@ -416,6 +419,9 @@ class SEn extends S {
@override @override
String get needRestart => 'Need to restart app'; String get needRestart => 'Need to restart app';
@override
String get net => 'Net';
@override @override
String get netViewType => 'Net view type'; String get netViewType => 'Net view type';
@@ -661,6 +667,9 @@ class SEn extends S {
@override @override
String get tag => 'Tags'; String get tag => 'Tags';
@override
String get temperature => 'Temperature';
@override @override
String get terminal => 'Terminal'; String get terminal => 'Terminal';

View File

@@ -153,6 +153,9 @@ class SId extends S {
@override @override
String get disconnected => 'Terputus'; String get disconnected => 'Terputus';
@override
String get disk => 'Disk';
@override @override
String get diskIgnorePath => 'Abaikan jalan untuk disk'; String get diskIgnorePath => 'Abaikan jalan untuk disk';
@@ -416,6 +419,9 @@ class SId extends S {
@override @override
String get needRestart => 'Perlu memulai ulang aplikasi'; String get needRestart => 'Perlu memulai ulang aplikasi';
@override
String get net => 'Net';
@override @override
String get netViewType => 'Jenis tampilan bersih'; String get netViewType => 'Jenis tampilan bersih';
@@ -661,6 +667,9 @@ class SId extends S {
@override @override
String get tag => 'Tag'; String get tag => 'Tag';
@override
String get temperature => 'Suhu';
@override @override
String get terminal => 'Terminal'; String get terminal => 'Terminal';

View File

@@ -153,6 +153,9 @@ class SZh extends S {
@override @override
String get disconnected => '连接断开'; String get disconnected => '连接断开';
@override
String get disk => '硬盘';
@override @override
String get diskIgnorePath => '忽略的磁盘路径'; String get diskIgnorePath => '忽略的磁盘路径';
@@ -416,6 +419,9 @@ class SZh extends S {
@override @override
String get needRestart => '需要重启 App'; String get needRestart => '需要重启 App';
@override
String get net => '网络';
@override @override
String get netViewType => '网络视图类型'; String get netViewType => '网络视图类型';
@@ -661,6 +667,9 @@ class SZh extends S {
@override @override
String get tag => '标签'; String get tag => '标签';
@override
String get temperature => '温度';
@override @override
String get terminal => '终端'; String get terminal => '终端';
@@ -915,6 +924,9 @@ class SZhTw extends SZh {
@override @override
String get disconnected => '連接斷開'; String get disconnected => '連接斷開';
@override
String get disk => '硬盤';
@override @override
String get diskIgnorePath => '忽略的磁盤路徑'; String get diskIgnorePath => '忽略的磁盤路徑';
@@ -1178,6 +1190,9 @@ class SZhTw extends SZh {
@override @override
String get needRestart => '需要重啓 App'; String get needRestart => '需要重啓 App';
@override
String get net => '網絡';
@override @override
String get netViewType => '網絡視圖類型'; String get netViewType => '網絡視圖類型';
@@ -1423,6 +1438,9 @@ class SZhTw extends SZh {
@override @override
String get tag => '标签'; String get tag => '标签';
@override
String get temperature => '溫度';
@override @override
String get terminal => '终端機'; String get terminal => '终端機';

View File

@@ -212,7 +212,7 @@ const _statusCmds = [
'uptime', 'uptime',
'cat /proc/net/snmp', 'cat /proc/net/snmp',
'df -h', '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*/type',
'cat /sys/class/thermal/thermal_zone*/temp', 'cat /sys/class/thermal/thermal_zone*/temp',
'hostname', 'hostname',

View File

@@ -95,7 +95,7 @@ Swap parseSwap(String raw) {
?.group(2) ?? ?.group(2) ??
'1', '1',
) ?? ) ??
1; 0;
final free = int.tryParse( final free = int.tryParse(
items items
.firstWhere( .firstWhere(
@@ -105,7 +105,7 @@ Swap parseSwap(String raw) {
?.group(2) ?? ?.group(2) ??
'1', '1',
) ?? ) ??
1; 0;
final cached = int.tryParse( final cached = int.tryParse(
items items
.firstWhere( .firstWhere(

View File

@@ -49,6 +49,7 @@
"dirEmpty": "Stelle sicher, dass der Ordner leer ist.", "dirEmpty": "Stelle sicher, dass der Ordner leer ist.",
"disabled": "Behinderte", "disabled": "Behinderte",
"disconnected": "Disconnected", "disconnected": "Disconnected",
"disk": "Festplatte",
"diskIgnorePath": "Pfad für Datenträger ignorieren", "diskIgnorePath": "Pfad für Datenträger ignorieren",
"dl2Local": "Datei \"{fileName}\" herunterladen?", "dl2Local": "Datei \"{fileName}\" herunterladen?",
"dockerEditHost": "DOCKER_HOST bearbeiten", "dockerEditHost": "DOCKER_HOST bearbeiten",
@@ -130,6 +131,7 @@
"ms": "ms", "ms": "ms",
"name": "Name", "name": "Name",
"needRestart": "App muss neugestartet werden", "needRestart": "App muss neugestartet werden",
"net": "Netz",
"netViewType": "Netzwerkansicht Typ", "netViewType": "Netzwerkansicht Typ",
"newContainer": "Neuer Container", "newContainer": "Neuer Container",
"noClient": "Kein Client", "noClient": "Kein Client",
@@ -209,6 +211,7 @@
"syncTip": "Damit einige Änderungen wirksam werden, kann ein Neustart erforderlich sein.", "syncTip": "Damit einige Änderungen wirksam werden, kann ein Neustart erforderlich sein.",
"system": "Systeme", "system": "Systeme",
"tag": "Tags", "tag": "Tags",
"temperature": "Temperatur",
"terminal": "Terminal", "terminal": "Terminal",
"theme": "Themen", "theme": "Themen",
"themeMode": "Themen-Modus", "themeMode": "Themen-Modus",

View File

@@ -49,6 +49,7 @@
"dirEmpty": "Make sure dir is empty.", "dirEmpty": "Make sure dir is empty.",
"disabled": "Disabled", "disabled": "Disabled",
"disconnected": "Disconnected", "disconnected": "Disconnected",
"disk": "Disk",
"diskIgnorePath": "Ignore path for disk", "diskIgnorePath": "Ignore path for disk",
"dl2Local": "Download {fileName} to local?", "dl2Local": "Download {fileName} to local?",
"dockerEditHost": "Edit DOCKER_HOST", "dockerEditHost": "Edit DOCKER_HOST",
@@ -130,6 +131,7 @@
"ms": "ms", "ms": "ms",
"name": "Name", "name": "Name",
"needRestart": "Need to restart app", "needRestart": "Need to restart app",
"net": "Net",
"netViewType": "Net view type", "netViewType": "Net view type",
"newContainer": "New container", "newContainer": "New container",
"noClient": "No client", "noClient": "No client",
@@ -209,6 +211,7 @@
"syncTip": "A restart may be required for some changes to take effect.", "syncTip": "A restart may be required for some changes to take effect.",
"system": "System", "system": "System",
"tag": "Tags", "tag": "Tags",
"temperature": "Temperature",
"terminal": "Terminal", "terminal": "Terminal",
"theme": "Theme", "theme": "Theme",
"themeMode": "Theme mode", "themeMode": "Theme mode",

View File

@@ -49,6 +49,7 @@
"dirEmpty": "Pastikan dir kosong.", "dirEmpty": "Pastikan dir kosong.",
"disabled": "Dengan disabilitas", "disabled": "Dengan disabilitas",
"disconnected": "Terputus", "disconnected": "Terputus",
"disk": "Disk",
"diskIgnorePath": "Abaikan jalan untuk disk", "diskIgnorePath": "Abaikan jalan untuk disk",
"dl2Local": "Unduh {fileName} ke lokal?", "dl2Local": "Unduh {fileName} ke lokal?",
"dockerEditHost": "Edit Docker_host", "dockerEditHost": "Edit Docker_host",
@@ -130,6 +131,7 @@
"ms": "MS", "ms": "MS",
"name": "Nama", "name": "Nama",
"needRestart": "Perlu memulai ulang aplikasi", "needRestart": "Perlu memulai ulang aplikasi",
"net": "Net",
"netViewType": "Jenis tampilan bersih", "netViewType": "Jenis tampilan bersih",
"newContainer": "Wadah baru", "newContainer": "Wadah baru",
"noClient": "Tidak ada klien", "noClient": "Tidak ada klien",
@@ -209,6 +211,7 @@
"syncTip": "Pengaktifan ulang mungkin diperlukan agar beberapa perubahan dapat diterapkan.", "syncTip": "Pengaktifan ulang mungkin diperlukan agar beberapa perubahan dapat diterapkan.",
"system": "Sistem", "system": "Sistem",
"tag": "Tag", "tag": "Tag",
"temperature": "Suhu",
"terminal": "Terminal", "terminal": "Terminal",
"theme": " Tema", "theme": " Tema",
"themeMode": "Mode tema", "themeMode": "Mode tema",

View File

@@ -49,6 +49,7 @@
"dirEmpty": "请确保文件夹为空", "dirEmpty": "请确保文件夹为空",
"disabled": "已禁用", "disabled": "已禁用",
"disconnected": "连接断开", "disconnected": "连接断开",
"disk": "硬盘",
"diskIgnorePath": "忽略的磁盘路径", "diskIgnorePath": "忽略的磁盘路径",
"dl2Local": "下载 {fileName} 到本地?", "dl2Local": "下载 {fileName} 到本地?",
"dockerEditHost": "编辑 DOCKER_HOST", "dockerEditHost": "编辑 DOCKER_HOST",
@@ -130,6 +131,7 @@
"ms": "毫秒", "ms": "毫秒",
"name": "名称", "name": "名称",
"needRestart": "需要重启 App", "needRestart": "需要重启 App",
"net": "网络",
"netViewType": "网络视图类型", "netViewType": "网络视图类型",
"newContainer": "新建容器", "newContainer": "新建容器",
"noClient": "没有SSH连接", "noClient": "没有SSH连接",
@@ -209,6 +211,7 @@
"syncTip": "可能需要重新启动,某些更改才能生效。", "syncTip": "可能需要重新启动,某些更改才能生效。",
"system": "系统", "system": "系统",
"tag": "标签", "tag": "标签",
"temperature": "温度",
"terminal": "终端", "terminal": "终端",
"theme": "主题", "theme": "主题",
"themeMode": "主题模式", "themeMode": "主题模式",

View File

@@ -49,6 +49,7 @@
"dirEmpty": "請確保文件夾為空", "dirEmpty": "請確保文件夾為空",
"disabled": "已禁用", "disabled": "已禁用",
"disconnected": "連接斷開", "disconnected": "連接斷開",
"disk": "硬盤",
"diskIgnorePath": "忽略的磁盤路徑", "diskIgnorePath": "忽略的磁盤路徑",
"dl2Local": "下載 {fileName} 到本地?", "dl2Local": "下載 {fileName} 到本地?",
"dockerEditHost": "編輯 DOCKER_HOST", "dockerEditHost": "編輯 DOCKER_HOST",
@@ -130,6 +131,7 @@
"ms": "毫秒", "ms": "毫秒",
"name": "名稱", "name": "名稱",
"needRestart": "需要重啓 App", "needRestart": "需要重啓 App",
"net": "網絡",
"netViewType": "網絡視圖類型", "netViewType": "網絡視圖類型",
"newContainer": "新建容器", "newContainer": "新建容器",
"noClient": "沒有SSH連接", "noClient": "沒有SSH連接",
@@ -209,6 +211,7 @@
"syncTip": "可能需要重新啟動,某些更改才能生效。", "syncTip": "可能需要重新啟動,某些更改才能生效。",
"system": "系統", "system": "系統",
"tag": "标签", "tag": "标签",
"temperature": "溫度",
"terminal": "终端機", "terminal": "终端機",
"theme": "主題", "theme": "主題",
"themeMode": "主題模式", "themeMode": "主題模式",

View File

@@ -319,8 +319,8 @@ class _ServerDetailPageState extends State<ServerDetailPage>
List.generate(disks.length, (idx) => _buildDiskItem(disks[idx], ss)); List.generate(disks.length, (idx) => _buildDiskItem(disks[idx], ss));
return CardX( return CardX(
ExpandTile( ExpandTile(
title: Text('Disk'), title: Text(l10n.disk),
leading: Icon(Icons.storage, size: 17), leading: const Icon(Icons.storage, size: 17),
initiallyExpanded: children.length <= 7, initiallyExpanded: children.length <= 7,
children: children, children: children,
), ),
@@ -374,8 +374,8 @@ class _ServerDetailPageState extends State<ServerDetailPage>
build: () { build: () {
return CardX( return CardX(
ExpandTile( ExpandTile(
title: Text('Net'), title: Text(l10n.net),
leading: Icon(Icons.device_hub, size: 17), leading: const Icon(Icons.device_hub, size: 17),
initiallyExpanded: children.length <= 7, initiallyExpanded: children.length <= 7,
children: children, children: children,
), ),
@@ -414,7 +414,7 @@ class _ServerDetailPageState extends State<ServerDetailPage>
} }
return CardX( return CardX(
ExpandTile( ExpandTile(
title: Text('Temperature'), title: Text(l10n.temperature),
leading: const Icon(Icons.ac_unit, size: 17), leading: const Icon(Icons.ac_unit, size: 17),
initiallyExpanded: ss.temps.devices.length <= 7, initiallyExpanded: ss.temps.devices.length <= 7,
children: ss.temps.devices children: ss.temps.devices