mirror of
https://github.com/lifegpc/eh_downloader_flutter.git
synced 2026-07-08 01:30:28 +08:00
Add refresh support for task manager
This commit is contained in:
@@ -192,5 +192,6 @@
|
||||
},
|
||||
"category": "Category",
|
||||
"uploader": "Uploader",
|
||||
"dlUseAvgSpeed": "Show average speed in task details."
|
||||
"dlUseAvgSpeed": "Show average speed in task details.",
|
||||
"refresh": "Refresh"
|
||||
}
|
||||
|
||||
@@ -192,5 +192,6 @@
|
||||
},
|
||||
"category": "分类",
|
||||
"uploader": "上传者",
|
||||
"dlUseAvgSpeed": "在任务详情中显示平均速度。"
|
||||
"dlUseAvgSpeed": "在任务详情中显示平均速度。",
|
||||
"refresh": "刷新"
|
||||
}
|
||||
|
||||
@@ -26,7 +26,7 @@ Future<bool> login(String username, String password) async {
|
||||
password: password,
|
||||
setCookie: true,
|
||||
httpOnly: true,
|
||||
secure: u.scheme == 'https',
|
||||
secure: u.scheme == 'https' || u.host == "localhost",
|
||||
client: "flutter",
|
||||
device: await device,
|
||||
clientVersion: await clientVersion,
|
||||
|
||||
@@ -24,6 +24,8 @@ class TaskManager {
|
||||
late Timer _pingTimer;
|
||||
bool _inited = false;
|
||||
bool get inited => _inited;
|
||||
bool _need_closed = false;
|
||||
bool _wait_closed = false;
|
||||
void clear() {
|
||||
tasks.clear();
|
||||
_channel?.stream.drain();
|
||||
@@ -191,16 +193,29 @@ class TaskManager {
|
||||
}
|
||||
}, onError: (e) {
|
||||
_log.warning("Task websocket error: $e");
|
||||
}, onDone: () {
|
||||
_log.warning(
|
||||
"WenSocket closed: ${_channel?.closeCode} ${_channel?.closeReason}");
|
||||
if (_allowReconnect) {
|
||||
if (_allowReconnect && !_need_closed) {
|
||||
_log.info("Reconnecting to task server in 5 seconds");
|
||||
_reconnectTimer = Timer(const Duration(seconds: 5), () {
|
||||
_reconnectTimer = null;
|
||||
connect();
|
||||
});
|
||||
}
|
||||
if (_wait_closed) {
|
||||
_wait_closed = false;
|
||||
}
|
||||
}, onDone: () {
|
||||
_log.warning(
|
||||
"WenSocket closed: ${_channel?.closeCode} ${_channel?.closeReason}");
|
||||
if (_allowReconnect && !_need_closed) {
|
||||
_log.info("Reconnecting to task server in 5 seconds");
|
||||
_reconnectTimer = Timer(const Duration(seconds: 5), () {
|
||||
_reconnectTimer = null;
|
||||
connect();
|
||||
});
|
||||
}
|
||||
if (_wait_closed) {
|
||||
_wait_closed = false;
|
||||
}
|
||||
}, cancelOnError: true);
|
||||
await _channel!.ready;
|
||||
_closed = false;
|
||||
@@ -246,4 +261,32 @@ class TaskManager {
|
||||
_pingTimer = timer;
|
||||
});
|
||||
}
|
||||
|
||||
FutureOr<bool> _waitClosed() {
|
||||
if (!_wait_closed) return true;
|
||||
return Future.delayed(const Duration(milliseconds: 10), _waitClosed);
|
||||
}
|
||||
|
||||
Future<bool> waitClosed() {
|
||||
return Future.microtask(_waitClosed);
|
||||
}
|
||||
|
||||
Future<void> refresh() async {
|
||||
if (_channel != null) {
|
||||
_need_closed = true;
|
||||
_wait_closed = true;
|
||||
_channel!.sink.add("{\"type\":\"close\"}");
|
||||
await waitClosed();
|
||||
}
|
||||
_channel?.sink.close();
|
||||
_channel = null;
|
||||
_closed = true;
|
||||
if (_reconnectTimer != null) {
|
||||
_reconnectTimer!.cancel();
|
||||
_reconnectTimer = null;
|
||||
}
|
||||
tasks.clear();
|
||||
listener.tryEmit("task_list_changed", null);
|
||||
await connect();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
import 'dart:ui';
|
||||
import 'package:enum_flag/enum_flag.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||
@@ -7,6 +9,8 @@ import 'package:go_router/go_router.dart';
|
||||
import 'api/task.dart';
|
||||
import 'components/task.dart';
|
||||
import 'globals.dart';
|
||||
import 'platform/media_query.dart';
|
||||
import 'utils.dart';
|
||||
|
||||
enum TaskStatusFilterFlag with EnumFlag {
|
||||
wait,
|
||||
@@ -71,6 +75,8 @@ class TaskManagerPage extends StatefulWidget {
|
||||
class _TaskManagerPage extends State<TaskManagerPage>
|
||||
with ThemeModeWidget, IsTopWidget2 {
|
||||
late TaskStatusFilter _filter;
|
||||
final GlobalKey<RefreshIndicatorState> _refreshIndicatorKey =
|
||||
GlobalKey<RefreshIndicatorState>();
|
||||
@override
|
||||
void initState() {
|
||||
_filter = TaskStatusFilter();
|
||||
@@ -177,6 +183,7 @@ class _TaskManagerPage extends State<TaskManagerPage>
|
||||
Widget _buildView(BuildContext context) {
|
||||
final i18n = AppLocalizations.of(context)!;
|
||||
return CustomScrollView(
|
||||
physics: const AlwaysScrollableScrollPhysics(),
|
||||
slivers: <Widget>[
|
||||
SliverAppBar(
|
||||
leading: IconButton(
|
||||
@@ -216,6 +223,25 @@ class _TaskManagerPage extends State<TaskManagerPage>
|
||||
});
|
||||
}
|
||||
|
||||
Widget _buildRefreshIcon(BuildContext context) {
|
||||
final i18n = AppLocalizations.of(context)!;
|
||||
return IconButton(
|
||||
onPressed: () {
|
||||
_refreshIndicatorKey.currentState?.show();
|
||||
},
|
||||
tooltip: i18n.refresh,
|
||||
icon: const Icon(Icons.refresh));
|
||||
}
|
||||
|
||||
Widget _buildIconList(BuildContext context) {
|
||||
return Row(children: [
|
||||
isDesktop || (kIsWeb && pointerIsMouse)
|
||||
? _buildRefreshIcon(context)
|
||||
: Container(),
|
||||
_buildAddMenu(context),
|
||||
]);
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (!tryInitApi(context)) {
|
||||
@@ -229,11 +255,16 @@ class _TaskManagerPage extends State<TaskManagerPage>
|
||||
return Scaffold(
|
||||
body: Stack(
|
||||
children: <Widget>[
|
||||
_buildView(context),
|
||||
RefreshIndicator(
|
||||
key: _refreshIndicatorKey,
|
||||
onRefresh: () async {
|
||||
return await tasks.refresh();
|
||||
},
|
||||
child: _buildView(context)),
|
||||
Positioned(
|
||||
bottom: size.height / 10,
|
||||
right: size.width / 10,
|
||||
child: _buildAddMenu(context))
|
||||
child: _buildIconList(context))
|
||||
],
|
||||
),
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user