mirror of
https://github.com/lollipopkit/flutter_server_box.git
synced 2025-12-17 07:14:28 +01:00
* feat: win compatibility * fix * fix: uptime parse * opt.: linux uptime accuracy * fix: windows temperature fetching * opt. * opt.: powershell exec * refactor: address PR review feedback and improve code quality ### Major Improvements: - **Refactored Windows status parsing**: Broke down large `_getWindowsStatus` method into 13 smaller, focused helper methods for better maintainability and readability - **Extracted system detection logic**: Created dedicated `SystemDetector` helper class to separate OS detection concerns from ServerProvider - **Improved concurrency handling**: Implemented proper synchronization for server updates using Future-based locks to prevent race conditions ### Bug Fixes: - **Fixed CPU percentage parsing**: Removed incorrect '*100' multiplication in BSD CPU parsing (values were already percentages) - **Enhanced memory parsing**: Added validation and error handling to BSD memory fallback parsing with proper logging - **Improved uptime parsing**: Added support for multiple Windows date formats and robust error handling with validation - **Fixed division by zero**: Added safety checks in Swap.usedPercent getter ### Code Quality Enhancements: - **Added comprehensive documentation**: Documented Windows CPU counter limitations and approach - **Strengthened error handling**: Added detailed logging and validation throughout parsing methods - **Improved robustness**: Enhanced BSD CPU parsing with percentage validation and warnings - **Better separation of concerns**: Each parsing method now has single responsibility ### Files Changed: - `lib/data/helper/system_detector.dart` (new): System detection helper - `lib/data/model/server/cpu.dart`: Fixed percentage parsing and added validation - `lib/data/model/server/memory.dart`: Enhanced fallback parsing and division-by-zero protection - `lib/data/model/server/server_status_update_req.dart`: Refactored into 13 focused parsing methods - `lib/data/provider/server.dart`: Improved synchronization and extracted system detection 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * refactor: parse & shell fn struct --------- Co-authored-by: Claude <noreply@anthropic.com>
137 lines
4.3 KiB
Dart
137 lines
4.3 KiB
Dart
import 'package:fl_lib/fl_lib.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:server_box/core/route.dart';
|
|
import 'package:server_box/data/model/server/server_private_info.dart';
|
|
import 'package:server_box/data/model/server/systemd.dart';
|
|
import 'package:server_box/data/provider/systemd.dart';
|
|
import 'package:server_box/view/page/ssh/page/page.dart';
|
|
|
|
final class SystemdPage extends StatefulWidget {
|
|
final SpiRequiredArgs args;
|
|
|
|
const SystemdPage({super.key, required this.args});
|
|
|
|
static const route = AppRouteArg<void, SpiRequiredArgs>(page: SystemdPage.new, path: '/systemd');
|
|
|
|
@override
|
|
State<SystemdPage> createState() => _SystemdPageState();
|
|
}
|
|
|
|
final class _SystemdPageState extends State<SystemdPage> {
|
|
late final _pro = SystemdProvider.init(widget.args.spi);
|
|
|
|
@override
|
|
void dispose() {
|
|
super.dispose();
|
|
_pro.dispose();
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Scaffold(
|
|
appBar: CustomAppBar(
|
|
title: const Text('Systemd'),
|
|
actions: isDesktop ? [Btn.icon(icon: const Icon(Icons.refresh), onTap: _pro.getUnits)] : null,
|
|
),
|
|
body: RefreshIndicator(onRefresh: _pro.getUnits, child: _buildBody()),
|
|
);
|
|
}
|
|
|
|
Widget _buildBody() {
|
|
return CustomScrollView(
|
|
slivers: <Widget>[
|
|
SliverToBoxAdapter(
|
|
child: _pro.isBusy.listenVal(
|
|
(isBusy) => AnimatedContainer(
|
|
duration: Durations.medium1,
|
|
curve: Curves.fastEaseInToSlowEaseOut,
|
|
height: isBusy ? SizedLoading.medium.size : 0,
|
|
child: isBusy ? SizedLoading.medium : const SizedBox.shrink(),
|
|
),
|
|
),
|
|
),
|
|
_buildUnitList(_pro.units),
|
|
],
|
|
);
|
|
}
|
|
|
|
Widget _buildUnitList(VNode<List<SystemdUnit>> units) {
|
|
return units.listenVal((units) {
|
|
if (units.isEmpty) {
|
|
return SliverToBoxAdapter(child: CenterGreyTitle(libL10n.empty).paddingSymmetric(horizontal: 13));
|
|
}
|
|
return SliverList(
|
|
delegate: SliverChildBuilderDelegate((context, index) {
|
|
final unit = units[index];
|
|
return ListTile(
|
|
leading: _buildScopeTag(unit.scope),
|
|
title: unit.description != null ? TipText(unit.name, unit.description!) : Text(unit.name),
|
|
subtitle: Wrap(
|
|
children: [_buildStateTag(unit.state), _buildTypeTag(unit.type)],
|
|
).paddingOnly(top: 7),
|
|
trailing: _buildUnitFuncs(unit),
|
|
).cardx.paddingSymmetric(horizontal: 13);
|
|
}, childCount: units.length),
|
|
);
|
|
});
|
|
}
|
|
|
|
Widget _buildUnitFuncs(SystemdUnit unit) {
|
|
return PopupMenu(
|
|
items: unit.availableFuncs.map(_buildUnitFuncBtn).toList(),
|
|
onSelected: (val) async {
|
|
final cmd = unit.getCmd(func: val, isRoot: widget.args.spi.isRoot);
|
|
final sure = await context.showRoundDialog(
|
|
title: libL10n.attention,
|
|
child: SimpleMarkdown(data: '```shell\n$cmd\n```'),
|
|
actions: [
|
|
CountDownBtn(
|
|
seconds: 1,
|
|
onTap: () => context.pop(true),
|
|
text: libL10n.ok,
|
|
afterColor: Colors.red,
|
|
),
|
|
],
|
|
);
|
|
if (sure != true) return;
|
|
|
|
final args = SshPageArgs(spi: widget.args.spi, initCmd: cmd);
|
|
SSHPage.route.go(context, args);
|
|
},
|
|
);
|
|
}
|
|
|
|
PopupMenuEntry _buildUnitFuncBtn(SystemdUnitFunc func) {
|
|
return PopupMenuItem<SystemdUnitFunc>(
|
|
value: func,
|
|
child: Row(
|
|
mainAxisSize: MainAxisSize.min,
|
|
mainAxisAlignment: MainAxisAlignment.spaceAround,
|
|
children: [Icon(func.icon, size: 19), const SizedBox(width: 10), Text(func.name.capitalize)],
|
|
),
|
|
);
|
|
}
|
|
|
|
Widget _buildScopeTag(SystemdUnitScope scope) {
|
|
return _buildTag(scope.name.capitalize, scope.color, true);
|
|
}
|
|
|
|
Widget _buildStateTag(SystemdUnitState state) {
|
|
return _buildTag(state.name.capitalize, state.color);
|
|
}
|
|
|
|
Widget _buildTypeTag(SystemdUnitType type) {
|
|
return _buildTag(type.name.capitalize);
|
|
}
|
|
|
|
Widget _buildTag(String tag, [Color? color, bool noPad = false]) {
|
|
return Container(
|
|
decoration: BoxDecoration(
|
|
color: color?.withValues(alpha: 0.7) ?? UIs.halfAlpha,
|
|
borderRadius: BorderRadius.circular(5),
|
|
),
|
|
child: Text(tag, style: UIs.text11).paddingSymmetric(horizontal: 5, vertical: 1),
|
|
).paddingOnly(right: noPad ? 0 : 5);
|
|
}
|
|
}
|