mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-10 02:20:28 +00:00
feat: add Android dialog mode for external downloads (#1362)
This commit is contained in:
1 parent
def54f8998
commit
c01d11305c
9 files changed
+427
-21
No files matched your search
@@ -5,6 +5,7 @@ import 'dart:ui';
|
||||
|
||||
import 'package:app_links/app_links.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_foreground_task/flutter_foreground_task.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:launch_at_startup/launch_at_startup.dart';
|
||||
@@ -69,6 +70,7 @@ class PendingUpdateTask {
|
||||
|
||||
class AppController extends GetxController with WindowListener, TrayListener {
|
||||
static StartConfig? _defaultStartConfig;
|
||||
static const _nativeChannel = MethodChannel('gopeed.com/libgopeed');
|
||||
|
||||
/// Command line --hidden flag passed from main.dart
|
||||
final bool hiddenFromArgs;
|
||||
@@ -79,6 +81,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
||||
final startConfig = StartConfig().obs;
|
||||
final runningPort = 0.obs;
|
||||
final downloaderConfig = DownloaderConfig().obs;
|
||||
var androidDialogMode = false;
|
||||
|
||||
/// The task that is pending URL update via listen mode.
|
||||
/// Stored here in AppController to persist across page navigations.
|
||||
@@ -124,9 +127,11 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
||||
void onClose() {
|
||||
_linkSubscription?.cancel();
|
||||
trayManager.removeListener(this);
|
||||
HostRpcService.instance.stop();
|
||||
WebViewRpcService.instance.stop();
|
||||
LibgopeedBoot.instance.stop();
|
||||
if (!androidDialogMode) {
|
||||
HostRpcService.instance.stop();
|
||||
WebViewRpcService.instance.stop();
|
||||
LibgopeedBoot.instance.stop();
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -182,6 +187,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
||||
// For web, just show window
|
||||
return;
|
||||
}
|
||||
androidDialogMode = await _isAndroidDialogMode();
|
||||
|
||||
// Handle deep link
|
||||
_appLinks = AppLinks();
|
||||
@@ -241,6 +247,18 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
||||
}
|
||||
}
|
||||
|
||||
Future<bool> _isAndroidDialogMode() async {
|
||||
if (!Util.isAndroid()) {
|
||||
return false;
|
||||
}
|
||||
try {
|
||||
return await _nativeChannel.invokeMethod<bool>('isDialogMode') ?? false;
|
||||
} catch (e) {
|
||||
logger.w("get android dialog mode fail", e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _initWindows() async {
|
||||
if (!Util.isDesktop()) {
|
||||
return;
|
||||
@@ -440,9 +458,7 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
||||
} else {
|
||||
path = (await toFile(uri.toString())).path;
|
||||
}
|
||||
Get.rootDelegate.offAndToNamed(Routes.REDIRECT,
|
||||
arguments: RedirectArgs(Routes.CREATE,
|
||||
arguments: CreateTask(req: Request(url: path))));
|
||||
_handleToCreate0(CreateTask(req: Request(url: path)));
|
||||
}
|
||||
|
||||
String runningAddress() {
|
||||
@@ -697,8 +713,10 @@ class AppController extends GetxController with WindowListener, TrayListener {
|
||||
}
|
||||
|
||||
_handleToCreate0(CreateTask createTaskParams) {
|
||||
final targetRoute =
|
||||
androidDialogMode ? Routes.QUICK_CREATE : Routes.CREATE;
|
||||
Get.rootDelegate.offAndToNamed(Routes.REDIRECT,
|
||||
arguments: RedirectArgs(Routes.CREATE, arguments: createTaskParams));
|
||||
arguments: RedirectArgs(targetRoute, arguments: createTaskParams));
|
||||
}
|
||||
|
||||
_handleToExtension(String params) {
|
||||
|
||||
@@ -0,0 +1,299 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:path/path.dart' as path;
|
||||
|
||||
import '../../../../api/api.dart';
|
||||
import '../../../../api/model/create_task.dart';
|
||||
import '../../../../api/model/create_task_batch.dart';
|
||||
import '../../../../api/model/options.dart';
|
||||
import '../../../../api/model/resolve_result.dart';
|
||||
import '../../../../api/model/resolve_task.dart';
|
||||
import '../../../../util/message.dart';
|
||||
import '../../../views/directory_selector.dart';
|
||||
import '../../app/controllers/app_controller.dart';
|
||||
|
||||
class CreateDialogView extends StatefulWidget {
|
||||
const CreateDialogView({Key? key}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<CreateDialogView> createState() => _CreateDialogViewState();
|
||||
}
|
||||
|
||||
class _CreateDialogViewState extends State<CreateDialogView> {
|
||||
final _pathController = TextEditingController();
|
||||
final _nameController = TextEditingController();
|
||||
|
||||
CreateTask? _createTask;
|
||||
ResolveResult? _resolveResult;
|
||||
Object? _error;
|
||||
bool _resolving = true;
|
||||
bool _creating = false;
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
final appController = Get.find<AppController>();
|
||||
_pathController.text = renderPathPlaceholders(
|
||||
appController.downloaderConfig.value.downloadDir,
|
||||
);
|
||||
WidgetsBinding.instance.addPostFrameCallback((_) => _loadArguments());
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_pathController.dispose();
|
||||
_nameController.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
Future<void> _loadArguments() async {
|
||||
final args = Get.rootDelegate.arguments();
|
||||
if (args is! CreateTask || args.req?.url.isNotEmpty != true) {
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_resolving = false;
|
||||
});
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
_createTask = args;
|
||||
if (args.opts?.path.isNotEmpty == true) {
|
||||
_pathController.text = args.opts!.path;
|
||||
}
|
||||
if (args.opts?.name.isNotEmpty == true) {
|
||||
_nameController.text = args.opts!.name;
|
||||
} else {
|
||||
_nameController.text = _fallbackName(args.req!.url);
|
||||
}
|
||||
|
||||
await _resolve(args);
|
||||
}
|
||||
|
||||
Future<void> _resolve(CreateTask createTask) async {
|
||||
setState(() {
|
||||
_resolving = true;
|
||||
_error = null;
|
||||
});
|
||||
|
||||
try {
|
||||
final opt = Options(
|
||||
name: createTask.opts?.name ?? '',
|
||||
path: _pathController.text,
|
||||
selectFiles: const [],
|
||||
extra: _optsExtra(),
|
||||
);
|
||||
final result = await resolve(
|
||||
ResolveTask(req: createTask.req!, opts: opt),
|
||||
);
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_resolveResult = result;
|
||||
if (_nameController.text.trim().isEmpty ||
|
||||
_nameController.text == _fallbackName(createTask.req!.url)) {
|
||||
_nameController.text = _resolvedName(result, createTask.req!.url);
|
||||
}
|
||||
});
|
||||
} catch (e) {
|
||||
if (!mounted) return;
|
||||
setState(() {
|
||||
_error = e;
|
||||
});
|
||||
} finally {
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_resolving = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Future<void> _confirm() async {
|
||||
final createTaskParams = _createTask;
|
||||
if (createTaskParams?.req == null) {
|
||||
return;
|
||||
}
|
||||
|
||||
setState(() {
|
||||
_creating = true;
|
||||
});
|
||||
|
||||
try {
|
||||
final rr = _resolveResult;
|
||||
final optExtra = _optsExtra();
|
||||
if (rr == null) {
|
||||
await createTask(
|
||||
CreateTask(
|
||||
req: createTaskParams!.req,
|
||||
opts: Options(
|
||||
name: _nameController.text.trim(),
|
||||
path: _pathController.text,
|
||||
selectFiles: const [],
|
||||
extra: optExtra,
|
||||
),
|
||||
),
|
||||
);
|
||||
} else if (rr.id.isEmpty) {
|
||||
final reqs = rr.res.files.map((file) {
|
||||
return CreateTaskBatchItem(
|
||||
req: file.req ?? createTaskParams!.req,
|
||||
opts: Options(
|
||||
name: file.name,
|
||||
path: path.join(_pathController.text, rr.res.name, file.path),
|
||||
selectFiles: const [],
|
||||
extra: optExtra,
|
||||
),
|
||||
);
|
||||
}).toList();
|
||||
await createTaskBatch(CreateTaskBatch(reqs: reqs));
|
||||
} else {
|
||||
await createTask(
|
||||
CreateTask(
|
||||
rid: rr.id,
|
||||
opts: Options(
|
||||
name: _nameController.text.trim(),
|
||||
path: _pathController.text,
|
||||
selectFiles: rr.res.files.asMap().keys.toList(),
|
||||
extra: optExtra,
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
await SystemNavigator.pop();
|
||||
} catch (e) {
|
||||
showErrorMessage(e);
|
||||
if (mounted) {
|
||||
setState(() {
|
||||
_creating = false;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Object _optsExtra() {
|
||||
final httpConfig =
|
||||
Get.find<AppController>().downloaderConfig.value.protocolConfig.http;
|
||||
return OptsExtraHttp(connections: httpConfig.connections);
|
||||
}
|
||||
|
||||
String _resolvedName(ResolveResult result, String url) {
|
||||
if (result.res.name.trim().isNotEmpty) {
|
||||
return result.res.name;
|
||||
}
|
||||
if (result.res.files.length == 1) {
|
||||
return result.res.files.first.name;
|
||||
}
|
||||
return _fallbackName(url);
|
||||
}
|
||||
|
||||
String _fallbackName(String url) {
|
||||
final uri = Uri.tryParse(url);
|
||||
final uriName = uri == null ? '' : path.basename(uri.path);
|
||||
if (uriName.isNotEmpty && uriName != '.') {
|
||||
return uriName;
|
||||
}
|
||||
return url;
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final theme = Theme.of(context);
|
||||
return Scaffold(
|
||||
backgroundColor: Colors.transparent,
|
||||
body: SafeArea(
|
||||
child: Center(
|
||||
child: Material(
|
||||
color: theme.colorScheme.surface,
|
||||
elevation: 16,
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
clipBehavior: Clip.antiAlias,
|
||||
child: ConstrainedBox(
|
||||
constraints: const BoxConstraints(maxWidth: 420),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.fromLTRB(20, 16, 20, 16),
|
||||
child: Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Row(
|
||||
children: [
|
||||
Expanded(
|
||||
child: Text(
|
||||
'create'.tr,
|
||||
style: theme.textTheme.titleMedium,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
),
|
||||
IconButton(
|
||||
icon: const Icon(Icons.close),
|
||||
onPressed: _creating ? null : SystemNavigator.pop,
|
||||
tooltip: 'cancel'.tr,
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
if (_resolving)
|
||||
const LinearProgressIndicator(minHeight: 2)
|
||||
else
|
||||
const SizedBox(height: 2),
|
||||
const SizedBox(height: 14),
|
||||
TextField(
|
||||
controller: _nameController,
|
||||
enabled: !_creating,
|
||||
decoration: InputDecoration(
|
||||
labelText: 'rename'.tr,
|
||||
prefixIcon: const Icon(Icons.insert_drive_file),
|
||||
),
|
||||
maxLines: 1,
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
DirectorySelector(
|
||||
controller: _pathController,
|
||||
showAndoirdToggle: true,
|
||||
allowEdit: true,
|
||||
),
|
||||
if (_error != null) ...[
|
||||
const SizedBox(height: 12),
|
||||
Text(
|
||||
_error.toString(),
|
||||
style: theme.textTheme.bodySmall?.copyWith(
|
||||
color: theme.colorScheme.error,
|
||||
),
|
||||
maxLines: 3,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
],
|
||||
const SizedBox(height: 18),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.end,
|
||||
children: [
|
||||
TextButton(
|
||||
onPressed: _creating ? null : SystemNavigator.pop,
|
||||
child: Text('cancel'.tr),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
ElevatedButton(
|
||||
onPressed:
|
||||
(_resolving || _creating) ? null : _confirm,
|
||||
child: _creating
|
||||
? const SizedBox.square(
|
||||
dimension: 18,
|
||||
child: CircularProgressIndicator(
|
||||
strokeWidth: 2,
|
||||
),
|
||||
)
|
||||
: Text('download'.tr),
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user