new: more battery data & fix: auto reload

This commit is contained in:
lollipopkit
2023-12-20 17:26:04 +08:00
parent 7283c968ae
commit 4a93b326db
26 changed files with 247 additions and 147 deletions

View File

@@ -0,0 +1,93 @@
import 'package:toolbox/data/res/logger.dart';
/// raw dat from server:
/// ```text
/// POWER_SUPPLY_NAME=hidpp_battery_0
/// POWER_SUPPLY_TYPE=Battery
/// POWER_SUPPLY_ONLINE=1
/// POWER_SUPPLY_STATUS=Discharging
/// POWER_SUPPLY_SCOPE=Device
/// POWER_SUPPLY_MODEL_NAME=MX Anywhere 3
/// POWER_SUPPLY_MANUFACTURER=Logitech
/// POWER_SUPPLY_SERIAL_NUMBER=0f-fc-43-f8
/// POWER_SUPPLY_CAPACITY=35
/// ```
class Battery {
final int? percent;
final BatteryStatus status;
final String? name;
final int? cycle;
final int? powerNow;
const Battery({
required this.status,
this.percent,
this.name,
this.cycle,
this.powerNow,
});
factory Battery.fromRaw(String raw) {
final lines = raw.split('\n');
final map = <String, String>{};
for (final line in lines) {
final parts = line.split('=');
if (parts.length != 2) continue;
map[parts[0]] = parts[1];
}
final capacity = map['POWER_SUPPLY_CAPACITY']; // 30%
final cycle = map['POWER_SUPPLY_CYCLE_COUNT']; // 30
final powerNow = map['POWER_SUPPLY_POWER_NOW']; // 30W
return Battery(
percent: capacity == null ? null : int.tryParse(capacity),
status: BatteryStatus.parse(map['POWER_SUPPLY_STATUS']),
name: map['POWER_SUPPLY_MODEL_NAME'],
cycle: cycle == null ? null : int.tryParse(cycle),
powerNow: powerNow == null ? null : int.tryParse(powerNow),
);
}
}
enum BatteryStatus {
charging,
discharging,
full,
unknown,
;
static BatteryStatus parse(String? status) {
switch (status) {
case 'Charging':
return BatteryStatus.charging;
case 'Discharging':
return BatteryStatus.discharging;
case 'Full':
return BatteryStatus.full;
default:
return BatteryStatus.unknown;
}
}
}
abstract final class Batteries {
static List<Battery> parse(String raw) {
final lines = raw.split('\n');
final batteries = <Battery>[];
final oneBatLines = <String>[];
for (final line in lines) {
if (line.isEmpty) {
try {
batteries.add(Battery.fromRaw(oneBatLines.join('\n')));
} catch (e, s) {
Loggers.parse.warning(e, s);
}
oneBatLines.clear();
} else {
oneBatLines.add(line);
}
}
return batteries;
}
}

View File

@@ -1,5 +1,6 @@
import 'package:dartssh2/dartssh2.dart';
import 'package:toolbox/data/model/app/shell_func.dart';
import 'package:toolbox/data/model/server/battery.dart';
import 'package:toolbox/data/model/server/conn.dart';
import 'package:toolbox/data/model/server/cpu.dart';
import 'package:toolbox/data/model/server/disk.dart';
@@ -38,10 +39,6 @@ class Server implements TagPickable {
bool get canViewDetails => state == ServerState.finished;
String get id => spi.id;
bool get isBusy => status._isBusy;
set isBusy(bool value) => status._isBusy = value;
}
class ServerStatus {
@@ -56,11 +53,9 @@ class ServerStatus {
String? err;
DiskIO diskIO;
List<NvidiaSmiItem>? nvidia;
final List<Battery> batteries = [];
final Map<StatusCmdType, String> more = {};
/// Whether is connectting, parsing and etc.
bool _isBusy = false;
ServerStatus({
required this.cpu,
required this.mem,

View File

@@ -1,3 +1,4 @@
import 'package:toolbox/data/model/server/battery.dart';
import 'package:toolbox/data/model/server/nvdia.dart';
import 'package:toolbox/data/model/server/server.dart';
import 'package:toolbox/data/model/server/system.dart';
@@ -129,8 +130,10 @@ Future<ServerStatus> _getLinuxStatus(ServerStatusUpdateReq req) async {
try {
final battery = StatusCmdType.battery.find(segments);
if (battery.isNotEmpty && !battery.contains('/sys/class/power_supply')) {
req.ss.more[StatusCmdType.battery] = battery;
final batteries = Batteries.parse(battery);
req.ss.batteries.clear();
if (batteries.isNotEmpty) {
req.ss.batteries.addAll(batteries);
}
} catch (e, s) {
Loggers.parse.warning(e, s);