mirror of
https://github.com/lollipopkit/flutter_server_box.git
synced 2025-12-16 23:04:22 +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>
95 lines
3.0 KiB
Dart
95 lines
3.0 KiB
Dart
import 'dart:ui';
|
|
import 'package:fl_lib/fl_lib.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:server_box/core/extension/context/locale.dart';
|
|
import 'package:server_box/data/model/server/server_private_info.dart';
|
|
import 'package:server_box/data/provider/server.dart';
|
|
import 'package:server_box/data/res/store.dart';
|
|
|
|
class ServerOrderPage extends StatefulWidget {
|
|
const ServerOrderPage({super.key});
|
|
|
|
@override
|
|
State<ServerOrderPage> createState() => _ServerOrderPageState();
|
|
|
|
static const route = AppRouteNoArg(page: ServerOrderPage.new, path: '/settings/order/server');
|
|
}
|
|
|
|
class _ServerOrderPageState extends State<ServerOrderPage> {
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Scaffold(
|
|
appBar: CustomAppBar(title: Text(l10n.serverOrder)),
|
|
body: _buildBody(),
|
|
);
|
|
}
|
|
|
|
Widget _proxyDecorator(Widget child, int index, Animation<double> animation) {
|
|
return AnimatedBuilder(
|
|
animation: animation,
|
|
builder: (BuildContext context, Widget? child) {
|
|
final double animValue = Curves.easeInOut.transform(animation.value);
|
|
final double elevation = lerpDouble(1, 6, animValue)!;
|
|
final double scale = lerpDouble(1, 1.02, animValue)!;
|
|
return Transform.scale(
|
|
scale: scale,
|
|
child: Card(elevation: elevation, child: child),
|
|
);
|
|
},
|
|
child: _buildCardTile(index),
|
|
);
|
|
}
|
|
|
|
Widget _buildBody() {
|
|
final orders = ServerProvider.serverOrder;
|
|
return orders.listenVal((order) {
|
|
if (order.isEmpty) {
|
|
return Center(child: Text(libL10n.empty));
|
|
}
|
|
return ReorderableListView.builder(
|
|
footer: const SizedBox(height: 77),
|
|
onReorder: (oldIndex, newIndex) {
|
|
setState(() {
|
|
orders.value.move(oldIndex, newIndex, property: Stores.setting.serverOrder);
|
|
});
|
|
},
|
|
padding: const EdgeInsets.all(8),
|
|
buildDefaultDragHandles: false,
|
|
itemBuilder: (_, idx) => _buildItem(idx, order[idx]),
|
|
itemCount: order.length,
|
|
proxyDecorator: _proxyDecorator,
|
|
);
|
|
});
|
|
}
|
|
|
|
Widget _buildItem(int index, String id) {
|
|
return ReorderableDelayedDragStartListener(
|
|
key: ValueKey('server_item_$id'),
|
|
index: index,
|
|
child: Padding(
|
|
padding: const EdgeInsets.only(bottom: 8),
|
|
child: CardX(child: _buildCardTile(index)),
|
|
),
|
|
);
|
|
}
|
|
|
|
Widget _buildCardTile(int index) {
|
|
final id = ServerProvider.serverOrder.value[index];
|
|
final spi = ServerProvider.pick(id: id)?.value.spi;
|
|
if (spi == null) {
|
|
return const SizedBox();
|
|
}
|
|
|
|
return ListTile(
|
|
title: Text(spi.name, style: const TextStyle(fontWeight: FontWeight.w500)),
|
|
subtitle: Text(spi.oldId, style: UIs.textGrey),
|
|
leading: CircleAvatar(
|
|
backgroundColor: Theme.of(context).colorScheme.primary,
|
|
foregroundColor: Theme.of(context).colorScheme.onPrimary,
|
|
child: Text(spi.name[0]),
|
|
),
|
|
trailing: ReorderableDragStartListener(index: index, child: const Icon(Icons.drag_handle)),
|
|
);
|
|
}
|
|
}
|