approve one executor

This commit is contained in:
ManhNTX
2022-08-12 16:38:55 +07:00
committed by Dat H. Pham
parent dd2276aa6a
commit 3e32ee5ac6
12 changed files with 34 additions and 103 deletions
@@ -1,7 +1,5 @@
import 'dart:async';
import 'package:core/presentation/state/failure.dart';
import 'package:core/presentation/state/success.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/filter/filter.dart';
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
@@ -13,7 +11,6 @@ import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:tmail_ui_user/features/thread/data/model/email_change_response.dart';
import 'package:tmail_ui_user/features/thread/domain/model/email_response.dart';
import 'package:tmail_ui_user/features/thread/domain/model/filter_message_option.dart';
import 'package:dartz/dartz.dart' as dartz;
abstract class ThreadDataSource {
Future<EmailsResponse> getAllEmail(
@@ -42,7 +39,6 @@ abstract class ThreadDataSource {
Future<List<EmailId>> emptyTrashFolder(
AccountId accountId,
MailboxId mailboxId,
Future<void> Function(State state) updateState,
Future<void> Function(List<EmailId>? newDestroyed) updateDestroyedEmailCache,
);
}
@@ -1,8 +1,5 @@
import 'dart:async';
import 'package:core/presentation/state/failure.dart';
import 'package:core/presentation/state/success.dart';
import 'package:dartz/dartz.dart' as dartz;
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/filter/filter.dart';
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
@@ -67,7 +64,11 @@ class LocalThreadDataSourceImpl extends ThreadDataSource {
}
@override
Future<List<EmailId>> emptyTrashFolder(AccountId accountId, MailboxId mailboxId, Future<void> Function(State state) updateState, Future<void> Function(List<EmailId>? newDestroyed) updateDestroyedEmailCache) {
Future<List<EmailId>> emptyTrashFolder(
AccountId accountId,
MailboxId mailboxId,
Future<void> Function(List<EmailId>? newDestroyed) updateDestroyedEmailCache
) {
throw UnimplementedError();
}
}
@@ -1,8 +1,5 @@
import 'dart:async';
import 'package:core/presentation/state/failure.dart';
import 'package:core/presentation/state/success.dart';
import 'package:dartz/dartz.dart' as dartz;
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/filter/filter.dart';
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
@@ -78,12 +75,11 @@ class ThreadDataSourceImpl extends ThreadDataSource {
}
@override
Future<List<EmailId>> emptyTrashFolder(AccountId accountId, MailboxId mailboxId, Future<void> Function(State state) updateState, Future<void> Function(List<EmailId>? newDestroyed) updateDestroyedEmailCache) {
Future<List<EmailId>> emptyTrashFolder(AccountId accountId, MailboxId mailboxId, Future<void> Function(List<EmailId>? newDestroyed) updateDestroyedEmailCache) {
return Future.sync(() async {
return await _threadIsolateWorker.emptyTrashFolder(
accountId,
mailboxId,
updateState,
updateDestroyedEmailCache,
);
}).catchError((error) {
@@ -4,7 +4,6 @@ import 'package:core/utils/app_logger.dart';
import 'package:core/utils/build_utils.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/properties/properties.dart';
import 'package:jmap_dart_client/jmap/core/state.dart';
import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_comparator.dart';
@@ -27,19 +26,15 @@ class ThreadIsolateWorker {
Future<List<EmailId>> emptyTrashFolder(
AccountId accountId,
MailboxId mailboxId,
Future<void> Function(State state) updateState,
Future<void> Function(List<EmailId>? newDestroyed) updateDestroyedEmailCache,
) async {
if (BuildUtils.isWeb) {
return _emptyTrashFolderOnWeb(accountId, mailboxId, updateState, updateDestroyedEmailCache);
return _emptyTrashFolderOnWeb(accountId, mailboxId, updateDestroyedEmailCache);
} else {
final result = await _isolateExecutor.execute(
arg1: EmptyTrashFolderArguments(_threadAPI, _emailAPI, accountId, mailboxId),
fun1: _emptyTrashFolderAction,
notification: (value) {
if(value is State) {
updateState.call(value);
}
if (value is List<EmailId>) {
updateDestroyedEmailCache.call(value);
log('ThreadIsolateWorker::emptyTrashFolder(): onUpdateProgress: PERCENT ${value.length}');
@@ -64,10 +59,6 @@ class ThreadIsolateWorker {
filter: EmailFilterCondition(inMailbox: args.trashMailboxId, before: lastEmail?.receivedAt),
properties: Properties({EmailProperty.id}));
if (emailsResponse.state != null) {
sendPort.send(emailsResponse.state!);
}
var newEmailList = emailsResponse.emailList ?? <Email>[];
if (lastEmail != null) {
newEmailList = newEmailList.where((email) => email.id != lastEmail!.id).toList();
@@ -102,7 +93,6 @@ class ThreadIsolateWorker {
Future<List<EmailId>> _emptyTrashFolderOnWeb(
AccountId accountId,
MailboxId trashMailboxId,
Future<void> Function(State state) updateState,
Future<void> Function(List<EmailId> newDestroyed) updateDestroyedEmailCache,
) async {
List<EmailId> emailListCompleted = List.empty(growable: true);
@@ -119,10 +109,6 @@ class ThreadIsolateWorker {
filter: EmailFilterCondition(inMailbox: trashMailboxId, before: lastEmail?.receivedAt),
properties: Properties({EmailProperty.id}));
if (emailsResponse.state != null) {
await updateState.call(emailsResponse.state!);
}
var newEmailList = emailsResponse.emailList ?? <Email>[];
if (lastEmail != null) {
newEmailList = newEmailList.where((email) => email.id != lastEmail!.id).toList();
@@ -9,9 +9,6 @@ import 'package:jmap_dart_client/jmap/core/sort/comparator.dart';
import 'package:jmap_dart_client/jmap/core/state.dart';
import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
import 'package:jmap_dart_client/jmap/mail/email/email.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_comparator.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_comparator_property.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_filter_condition.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
import 'package:model/model.dart';
import 'package:tmail_ui_user/features/email/data/datasource/email_datasource.dart';
@@ -299,46 +296,13 @@ class ThreadRepositoryImpl extends ThreadRepository {
}
@override
Future<bool> emptyTrashFolder(AccountId accountId, MailboxId trashMailboxId) async {
var finalResult = true;
var hasEmails = true;
while (hasEmails) {
Email? lastEmail;
final emailsResponse = await mapDataSource[DataSourceType.network]!.getAllEmail(
accountId,
sort: <Comparator>{}
..add(EmailComparator(EmailComparatorProperty.receivedAt)
..setIsAscending(false)),
filter: EmailFilterCondition(inMailbox: trashMailboxId, before: lastEmail?.receivedAt),
properties: Properties({EmailProperty.id}));
var newEmailList = emailsResponse.emailList ?? <Email>[];
if (lastEmail != null) {
newEmailList = newEmailList.where((email) => email.id != lastEmail!.id).toList();
}
log('ThreadRepositoryImpl::emptyTrashFolder(): ${newEmailList.length}');
if (newEmailList.isNotEmpty == true) {
lastEmail = newEmailList.last;
hasEmails = true;
final emailIds = newEmailList.map((email) => email.id).toList();
final listEmailIdDeleted = await emailDataSource.deleteMultipleEmailsPermanently(accountId, emailIds);
if (listEmailIdDeleted.isNotEmpty && listEmailIdDeleted.length == emailIds.length) {
await _updateEmailCache(newDestroyed: listEmailIdDeleted);
finalResult = true;
} else {
finalResult = false;
}
} else {
hasEmails = false;
}
}
return finalResult;
Future<List<EmailId>> emptyTrashFolder(AccountId accountId, MailboxId trashMailboxId) async {
return mapDataSource[DataSourceType.network]!.emptyTrashFolder(
accountId,
trashMailboxId,
(listEmailIdDeleted) async {
await _updateEmailCache(newDestroyed: listEmailIdDeleted);
},
);
}
}