diff --git a/lib/src/proxmox_lister/proxmox_lister_list_view.dart b/lib/src/proxmox_lister/proxmox_lister_list_view.dart index e633706..21cb982 100644 --- a/lib/src/proxmox_lister/proxmox_lister_list_view.dart +++ b/lib/src/proxmox_lister/proxmox_lister_list_view.dart @@ -142,7 +142,7 @@ class _ProxmoxListerState extends State { return ProxmoxVmCard( node: nodeEntry.key, vm: nodeEntry.value[index], - pm_service: _service, + pmService: _service, ); }, ); diff --git a/lib/src/proxmox_lister/vm_card.dart b/lib/src/proxmox_lister/vm_card.dart index 52e5dfd..a418c51 100644 --- a/lib/src/proxmox_lister/vm_card.dart +++ b/lib/src/proxmox_lister/vm_card.dart @@ -10,7 +10,7 @@ class RunningIndicator extends StatelessWidget { final bool isRunning; @override - Widget build(BuildContext ctx) { + Widget build(context) { return Text( isRunning ? "RUNNING" : "STOPPED", style: TextStyle( @@ -22,19 +22,19 @@ class RunningIndicator extends StatelessWidget { } class ProxmoxVmCard extends StatelessWidget { - ProxmoxVmCard({ + const ProxmoxVmCard({ super.key, required this.node, required this.vm, - required this.pm_service, + required this.pmService, }); final ProxmoxNode node; final ProxmoxVm vm; - final ProxmoxWebService pm_service; + final ProxmoxWebService pmService; @override - Widget build(_) { + Widget build(context) { return Card( child: Column( children: [ @@ -53,7 +53,7 @@ class ProxmoxVmCard extends StatelessWidget { const Spacer(), IconButton( icon: const Icon(Icons.power_settings_new), - onPressed: () => pm_service.toggleVm(node, vm), + onPressed: () => pmService.toggleVm(node, vm), ), ], ), diff --git a/lib/src/proxmox_webservice/model.dart b/lib/src/proxmox_webservice/model.dart index 1292c6f..cea1966 100644 --- a/lib/src/proxmox_webservice/model.dart +++ b/lib/src/proxmox_webservice/model.dart @@ -1,5 +1,3 @@ -import 'dart:ffi'; - typedef ProxmoxNodeMap = Map>; class ProxmoxNode { @@ -117,41 +115,5 @@ class ProxmoxVm { disk: json['disk'], maxmem: json['maxmem'], ); - return switch (json) { - { - 'status': String status, - 'vmid': num vmid, - 'cpus': num? cpus, - 'mem': num? mem, - 'name': String? name, - 'diskwrite': num? diskwrite, - 'netout': num? netout, - 'uptime': num? uptime, - 'cpu': num? cpu, - 'maxdisk': num? maxdisk, - 'netin': num? netin, - 'diskread': num? diskread, - 'disk': num? disk, - 'maxmem': num? maxmem, - } => - ProxmoxVm( - status: status, - vmid: vmid, - cpus: cpus, - mem: mem, - name: name, - diskwrite: diskwrite, - netout: netout, - uptime: uptime, - cpu: cpu, - maxdisk: maxdisk, - netin: netin, - diskread: diskread, - disk: disk, - maxmem: maxmem, - ), - _ => throw FormatException( - "failed to parse proxmox node into object: $json"), - }; } } diff --git a/lib/src/proxmox_webservice/service.dart b/lib/src/proxmox_webservice/service.dart index b40d388..b164cb5 100644 --- a/lib/src/proxmox_webservice/service.dart +++ b/lib/src/proxmox_webservice/service.dart @@ -45,7 +45,7 @@ class ProxmoxWebService { return _authenticated; } - Future?> _doGet(String endpoint, {debug = false}) async { + Future?> _doGet(String endpoint) async { if (!_authenticated) return null; final resp = await http.get( Uri.https( @@ -56,7 +56,6 @@ class ProxmoxWebService { "CSRFPreventionToken": _csrfToken as String, "Cookie": "PVEAuthCookie=$_ticket" }); - if (debug) print(resp.body); if (resp.statusCode != 200) return null; @@ -79,7 +78,6 @@ class ProxmoxWebService { }, body: payload, ); - if (debug) print(resp.body); if (resp.statusCode != 200) return null; diff --git a/lib/src/screen_helper.dart b/lib/src/screen_helper.dart index 4443e04..3bd7436 100644 --- a/lib/src/screen_helper.dart +++ b/lib/src/screen_helper.dart @@ -79,7 +79,7 @@ class _IdleTurnOffState extends State { Widget build(BuildContext context) { return KeyboardListener( focusNode: FocusNode( - onKeyEvent: (_1, _2) { + onKeyEvent: (a, b) { _timer.reset(); return KeyEventResult.ignored; }, diff --git a/lib/src/settings/settings_service.dart b/lib/src/settings/settings_service.dart index 056c5d4..155348e 100644 --- a/lib/src/settings/settings_service.dart +++ b/lib/src/settings/settings_service.dart @@ -1,4 +1,3 @@ -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:shared_preferences/shared_preferences.dart'; diff --git a/pubspec.yaml b/pubspec.yaml index 8b5b657..fd5e7e9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,6 +16,7 @@ dependencies: sdk: flutter http: ^1.2.1 shared_preferences: + async: ^2.11.0 flutter_gen: any dev_dependencies: