aljaz/flutter_server_box
1
1
Fork 0
mirror of https://github.com/lollipopkit/flutter_server_box.git synced 2025-12-17 07:14:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

opt.: migrate fl_lib

Browse Source
This commit is contained in:
lollipopkit
2024-05-14 22:29:37 +08:00
parent 248430e5b0
commit 04dfede535
136 changed files with 686 additions and 3896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/data/model/server/battery.dart
View File

@@ -1,4 +1,5 @@
import 'package:toolbox/data/res/logger.dart';
import 'package:fl_lib/fl_lib.dart';
/// raw dat from server:
/// ```text
@@ -92,7 +93,7 @@ abstract final class Batteries {
if (onlyLiPoly && !bat.isLiPoly) continue;
batteries.add(bat);
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
oneBatLines.clear();
} else {

3
lib/data/model/server/disk.dart
View File

@@ -1,5 +1,4 @@
import 'package:toolbox/core/extension/listx.dart';
import 'package:toolbox/core/extension/numx.dart';
import 'package:fl_lib/fl_lib.dart';
import 'package:toolbox/data/model/server/time_seq.dart';
import '../../res/misc.dart';

2
lib/data/model/server/memory.dart
View File

@@ -1,4 +1,4 @@
import 'package:toolbox/core/extension/listx.dart';
import 'package:fl_lib/fl_lib.dart';
class Memory {
final int total;

2
lib/data/model/server/net_speed.dart
View File

@@ -1,4 +1,4 @@
import 'package:toolbox/core/extension/numx.dart';
import 'package:fl_lib/fl_lib.dart';
import 'time_seq.dart';

4
lib/data/model/server/proc.dart
View File

@@ -1,4 +1,4 @@
import 'package:toolbox/data/res/logger.dart';
import 'package:fl_lib/fl_lib.dart';
import '../../../data/res/misc.dart';
@@ -142,7 +142,7 @@ class PsResult {
procs.add(Proc.parse(line, map));
} catch (e, trace) {
errs.add('$line: $e');
Loggers.parse.warning('Process failed', e, trace);
Loggers.app.warning('Process failed', e, trace);
}
}

25
lib/data/model/server/pve.dart
View File

@@ -1,7 +1,5 @@
import 'package:fl_lib/fl_lib.dart';
import 'package:toolbox/core/extension/context/locale.dart';
import 'package:toolbox/core/extension/duration.dart';
import 'package:toolbox/core/extension/numx.dart';
import 'package:toolbox/core/extension/order.dart';
enum PveResType {
lxc,
@@ -132,7 +130,12 @@ final class PveLxc extends PveResIface implements PveCtrlIface {
@override
String get summary {
if (available) {
return uptime.secondsToDuration().toStr;
return uptime.secondsToDuration().toAgoStr(
day: l10n.day,
hour: l10n.hour,
minute: l10n.minute,
second: l10n.second,
);
}
return l10n.stopped;
}
@@ -210,7 +213,12 @@ final class PveQemu extends PveResIface implements PveCtrlIface {
@override
String get summary {
if (available) {
return uptime.secondsToDuration().toStr;
return uptime.secondsToDuration().toAgoStr(
day: l10n.day,
hour: l10n.hour,
minute: l10n.minute,
second: l10n.second,
);
}
return l10n.stopped;
}
@@ -260,7 +268,12 @@ final class PveNode extends PveResIface {
String get topRight {
if (isRunning) {
return uptime.secondsToDuration().toStr;
return uptime.secondsToDuration().toAgoStr(
day: l10n.day,
hour: l10n.hour,
minute: l10n.minute,
second: l10n.second,
);
}
return l10n.stopped;
}

2
lib/data/model/server/sensors.dart
View File

@@ -1,5 +1,5 @@
import 'package:fl_lib/fl_lib.dart';
import 'package:toolbox/core/extension/context/locale.dart';
import 'package:toolbox/data/res/logger.dart';
final class SensorAdaptor {
final String raw;

2
lib/data/model/server/server.dart
View File

@@ -1,6 +1,6 @@
import 'package:dartssh2/dartssh2.dart';
import 'package:fl_lib/fl_lib.dart';
import 'package:toolbox/core/extension/context/locale.dart';
import 'package:toolbox/core/extension/listx.dart';
import 'package:toolbox/data/model/app/error.dart';
import 'package:toolbox/data/model/app/shell_func.dart';
import 'package:toolbox/data/model/server/battery.dart';

44
lib/data/model/server/server_status_update_req.dart
View File

@@ -1,9 +1,9 @@
import 'package:fl_lib/fl_lib.dart';
import 'package:toolbox/data/model/server/battery.dart';
import 'package:toolbox/data/model/server/nvdia.dart';
import 'package:toolbox/data/model/server/sensors.dart';
import 'package:toolbox/data/model/server/server.dart';
import 'package:toolbox/data/model/server/system.dart';
import 'package:toolbox/data/res/logger.dart';
import '../app/shell_func.dart';
import 'cpu.dart';
@@ -45,7 +45,7 @@ Future<ServerStatus> _getLinuxStatus(ServerStatusUpdateReq req) async {
final net = NetSpeed.parse(StatusCmdType.net.find(segments), time);
req.ss.netSpeed.update(net);
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
@@ -56,7 +56,7 @@ Future<ServerStatus> _getLinuxStatus(ServerStatusUpdateReq req) async {
req.ss.more[StatusCmdType.sys] = sys;
}
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
@@ -65,14 +65,14 @@ Future<ServerStatus> _getLinuxStatus(ServerStatusUpdateReq req) async {
req.ss.more[StatusCmdType.host] = host;
}
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
final cpus = SingleCpuCore.parse(StatusCmdType.cpu.find(segments));
req.ss.cpu.update(cpus);
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
@@ -81,7 +81,7 @@ Future<ServerStatus> _getLinuxStatus(ServerStatusUpdateReq req) async {
StatusCmdType.tempVal.find(segments),
);
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
@@ -90,20 +90,20 @@ Future<ServerStatus> _getLinuxStatus(ServerStatusUpdateReq req) async {
req.ss.tcp = tcp;
}
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
req.ss.disk = Disk.parse(StatusCmdType.disk.find(segments));
req.ss.diskUsage = DiskUsage.parse(req.ss.disk);
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
req.ss.mem = Memory.parse(StatusCmdType.mem.find(segments));
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
@@ -112,26 +112,26 @@ Future<ServerStatus> _getLinuxStatus(ServerStatusUpdateReq req) async {
req.ss.more[StatusCmdType.uptime] = uptime;
}
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
req.ss.swap = Swap.parse(StatusCmdType.mem.find(segments));
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
final diskio = DiskIO.parse(StatusCmdType.diskio.find(segments), time);
req.ss.diskIO.update(diskio);
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
req.ss.nvidia = NvidiaSmi.fromXml(StatusCmdType.nvidia.find(segments));
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
@@ -144,7 +144,7 @@ Future<ServerStatus> _getLinuxStatus(ServerStatusUpdateReq req) async {
req.ss.batteries.addAll(batteries);
}
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
@@ -154,7 +154,7 @@ Future<ServerStatus> _getLinuxStatus(ServerStatusUpdateReq req) async {
req.ss.sensors.addAll(sensors);
}
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
@@ -164,7 +164,7 @@ Future<ServerStatus> _getLinuxStatus(ServerStatusUpdateReq req) async {
req.ss.customCmds[key] = value;
}
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
return req.ss;
@@ -179,25 +179,25 @@ Future<ServerStatus> _getBsdStatus(ServerStatusUpdateReq req) async {
final net = NetSpeed.parseBsd(BSDStatusCmdType.net.find(segments), time);
req.ss.netSpeed.update(net);
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
req.ss.more[StatusCmdType.sys] = BSDStatusCmdType.sys.find(segments);
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
req.ss.cpu = parseBsdCpu(BSDStatusCmdType.cpu.find(segments));
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
// try {
// req.ss.mem = parseBsdMem(BSDStatusCmdType.mem.find(segments));
// } catch (e, s) {
// Loggers.parse.warning(e, s);
// Loggers.app.warning(e, s);
// }
try {
@@ -206,13 +206,13 @@ Future<ServerStatus> _getBsdStatus(ServerStatusUpdateReq req) async {
req.ss.more[StatusCmdType.uptime] = uptime;
}
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
try {
req.ss.disk = Disk.parse(BSDStatusCmdType.disk.find(segments));
} catch (e, s) {
Loggers.parse.warning(e, s);
Loggers.app.warning(e, s);
}
return req.ss;
}