💄 Optimize downloading and files

This commit is contained in:
2025-11-18 22:21:23 +08:00
parent c8ad791ff3
commit 35b96b0bd2
5 changed files with 53 additions and 73 deletions

View File

@@ -1338,5 +1338,6 @@
"enterNumberOfSplits": "Enter Splits Amount", "enterNumberOfSplits": "Enter Splits Amount",
"orCreateWith": "Or\ncreate with", "orCreateWith": "Or\ncreate with",
"unindexedFiles": "Unindexed files", "unindexedFiles": "Unindexed files",
"folder": "Folder" "folder": "Folder",
"clearCompleted": "Clear Completed"
} }

View File

@@ -293,6 +293,10 @@ class UploadTasksNotifier extends StateNotifier<List<DriveTask>> {
.toList(); .toList();
} }
void clearAllTasks() {
state = [];
}
DriveTask? getTask(String taskId) { DriveTask? getTask(String taskId) {
return state.where((task) => task.taskId == taskId).firstOrNull; return state.where((task) => task.taskId == taskId).firstOrNull;
} }

View File

@@ -233,9 +233,8 @@ class FileDetailScreen extends HookConsumerWidget {
} }
Future<void> _downloadFile(WidgetRef ref) async { Future<void> _downloadFile(WidgetRef ref) async {
final taskId = ref final taskNotifier = ref.read(uploadTasksProvider.notifier);
.read(uploadTasksProvider.notifier) final taskId = taskNotifier.addLocalDownloadTask(item);
.addLocalDownloadTask(item);
try { try {
showSnackBar('Downloading file...'); showSnackBar('Downloading file...');
@@ -253,12 +252,8 @@ class FileDetailScreen extends HookConsumerWidget {
queryParameters: {'original': true}, queryParameters: {'original': true},
onReceiveProgress: (count, total) { onReceiveProgress: (count, total) {
if (total > 0) { if (total > 0) {
ref taskNotifier.updateDownloadProgress(taskId, count, total);
.read(uploadTasksProvider.notifier) taskNotifier.updateTransmissionProgress(taskId, count / total);
.updateDownloadProgress(taskId, count, total);
ref
.read(uploadTasksProvider.notifier)
.updateTransmissionProgress(taskId, count / total);
} }
}, },
); );
@@ -267,18 +262,14 @@ class FileDetailScreen extends HookConsumerWidget {
name: item.name.isEmpty ? '${item.id}.$extName' : item.name, name: item.name.isEmpty ? '${item.id}.$extName' : item.name,
file: File(filePath), file: File(filePath),
); );
ref taskNotifier.updateTaskStatus(taskId, DriveTaskStatus.completed);
.read(uploadTasksProvider.notifier)
.updateTaskStatus(taskId, DriveTaskStatus.completed);
showSnackBar('File saved to downloads'); showSnackBar('File saved to downloads');
} catch (e) { } catch (e) {
ref taskNotifier.updateTaskStatus(
.read(uploadTasksProvider.notifier) taskId,
.updateTaskStatus( DriveTaskStatus.failed,
taskId, errorMessage: e.toString(),
DriveTaskStatus.failed, );
errorMessage: e.toString(),
);
showErrorAlert(e); showErrorAlert(e);
} }
} }

View File

@@ -1,8 +1,5 @@
import 'dart:io';
import 'package:cached_network_image/cached_network_image.dart'; import 'package:cached_network_image/cached_network_image.dart';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:file_saver/file_saver.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:gap/gap.dart'; import 'package:gap/gap.dart';
@@ -10,16 +7,11 @@ import 'package:go_router/go_router.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:island/models/file.dart'; import 'package:island/models/file.dart';
import 'package:island/pods/config.dart'; import 'package:island/pods/config.dart';
import 'package:island/pods/network.dart';
import 'package:island/services/time.dart'; import 'package:island/services/time.dart';
import 'package:island/utils/format.dart'; import 'package:island/utils/format.dart';
import 'package:island/widgets/alert.dart';
import 'package:material_symbols_icons/symbols.dart'; import 'package:material_symbols_icons/symbols.dart';
import 'package:path/path.dart' show extension;
import 'package:path_provider/path_provider.dart';
import 'package:styled_widget/styled_widget.dart'; import 'package:styled_widget/styled_widget.dart';
import 'package:island/widgets/data_saving_gate.dart'; import 'package:island/widgets/data_saving_gate.dart';
import 'package:island/widgets/content/file_info_sheet.dart';
import 'file_viewer_contents.dart'; import 'file_viewer_contents.dart';
import 'image.dart'; import 'image.dart';
@@ -281,41 +273,13 @@ class CloudFileWidget extends HookConsumerWidget {
'audio' => AudioFileContent(item: item, uri: uri), 'audio' => AudioFileContent(item: item, uri: uri),
_ => Builder( _ => Builder(
builder: (context) { builder: (context) {
Future<void> downloadFile() async {
try {
showSnackBar('Downloading file...');
final client = ref.read(apiClientProvider);
final tempDir = await getTemporaryDirectory();
var extName = extension(item.name).trim();
if (extName.isEmpty) {
extName = item.mimeType?.split('/').lastOrNull ?? 'bin';
}
final filePath = '${tempDir.path}/${item.id}.$extName';
await client.download(
'/drive/files/${item.id}',
filePath,
queryParameters: {'original': true},
);
await FileSaver.instance.saveFile(
name: item.name.isEmpty ? '${item.id}.$extName' : item.name,
file: File(filePath),
);
showSnackBar('File saved to downloads');
} catch (e) {
showErrorAlert(e);
}
}
return Container( return Container(
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border.all( border: Border.all(
color: Theme.of(context).colorScheme.outline, color: Theme.of(context).colorScheme.outline,
width: 1, width: 1,
), ),
borderRadius: BorderRadius.circular(8), borderRadius: BorderRadius.circular(16),
), ),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@@ -347,19 +311,12 @@ class CloudFileWidget extends HookConsumerWidget {
Row( Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
TextButton.icon(
onPressed: downloadFile,
icon: const Icon(Symbols.download),
label: Text('download').tr(),
),
const Gap(8),
TextButton.icon( TextButton.icon(
onPressed: () { onPressed: () {
showModalBottomSheet( context.pushNamed(
useRootNavigator: true, 'fileDetail',
context: context, pathParameters: {'id': item.id},
isScrollControlled: true, extra: item,
builder: (context) => FileInfoSheet(item: item),
); );
}, },
icon: const Icon(Symbols.info), icon: const Icon(Symbols.info),

View File

@@ -102,7 +102,9 @@ class _UploadOverlayContent extends HookConsumerWidget {
return null; return null;
}, [isExpanded.value]); }, [isExpanded.value]);
final isMobile = MediaQuery.of(context).size.width < 600; final isMobile = !isWideScreen(context);
final taskNotifier = ref.read(uploadTasksProvider.notifier);
return Padding( return Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(
@@ -246,7 +248,7 @@ class _UploadOverlayContent extends HookConsumerWidget {
SliverToBoxAdapter( SliverToBoxAdapter(
child: ListTile( child: ListTile(
dense: true, dense: true,
title: const Text('Clear Completed'), title: const Text('clearCompleted').tr(),
leading: Icon( leading: Icon(
Symbols.clear_all, Symbols.clear_all,
size: 18, size: 18,
@@ -256,9 +258,34 @@ class _UploadOverlayContent extends HookConsumerWidget {
).colorScheme.onSurfaceVariant, ).colorScheme.onSurfaceVariant,
), ),
onTap: () { onTap: () {
ref taskNotifier.clearCompletedTasks();
.read(uploadTasksProvider.notifier) isExpanded.value = false;
.clearCompletedTasks(); },
tileColor:
Theme.of(
context,
).colorScheme.surfaceContainerHighest,
),
),
// Clear all tasks button
if (activeTasks.any(
(task) =>
task.status != DriveTaskStatus.completed,
))
SliverToBoxAdapter(
child: ListTile(
dense: true,
title: const Text('Clear All'),
leading: Icon(
Symbols.clear_all,
size: 18,
color:
Theme.of(context).colorScheme.error,
),
onTap: () {
taskNotifier.clearAllTasks();
isExpanded.value = false; isExpanded.value = false;
}, },
tileColor: tileColor: