Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1331 ignore attempts to move file to its current folder

Browse source
This commit is contained in:
Thibault Deckers 2025-02-02 20:59:17 +01:00
parent 892e64ef28
commit 16da0ec3f5
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/exifinterface/src/main/java/androidx/exifinterface/media/ExifInterfaceFork.java
View file

@ -93,6 +93,7 @@ import java.util.zip.CRC32;
/* /*
* Forked from 'androidx.exifinterface:exifinterface:1.4.0-beta01' on 2025/01/21 * Forked from 'androidx.exifinterface:exifinterface:1.4.0-beta01' on 2025/01/21
* Named differently to let ExifInterface be loaded as subdependency. * Named differently to let ExifInterface be loaded as subdependency.
* cf https://maven.google.com/web/index.html?q=exifinterface#androidx.exifinterface:exifinterface
* cf https://github.com/androidx/androidx/tree/androidx-main/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media * cf https://github.com/androidx/androidx/tree/androidx-main/exifinterface/exifinterface/src/main/java/androidx/exifinterface/media
*/ */

12
lib/widgets/common/action_mixins/entry_storage.dart
View file

@ -162,13 +162,21 @@ mixin EntryStorageMixin on FeedbackMixin, PermissionAwareMixin, SizeAwareMixin {
Future<void> doQuickMove( Future<void> doQuickMove(
BuildContext context, { BuildContext context, {
required MoveType moveType, required MoveType moveType,
required Map<String, Iterable<AvesEntry>> entriesByDestination, required Map<String, Set<AvesEntry>> entriesByDestination,
bool hideShowAction = false, bool hideShowAction = false,
VoidCallback? onSuccess, VoidCallback? onSuccess,
}) async { }) async {
if (moveType == MoveType.move) {
// skip moving entries to their directory
entriesByDestination.forEach((destinationAlbum, entries) {
entries.removeWhere((entry) => entry.directory == destinationAlbum);
});
entriesByDestination.removeWhere((_, entries) => entries.isEmpty);
}
final entries = entriesByDestination.values.expand((v) => v).toSet(); final entries = entriesByDestination.values.expand((v) => v).toSet();
final todoCount = entries.length; final todoCount = entries.length;
assert(todoCount > 0); if (todoCount == 0) return;
final toBin = moveType == MoveType.toBin; final toBin = moveType == MoveType.toBin;
final copy = moveType == MoveType.copy; final copy = moveType == MoveType.copy;