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

fixed unique name for albums with the same name on different volumes

Browse source
This commit is contained in:
Thibault Deckers 2021-01-08 11:51:26 +09:00
parent cd2811be02
commit 9ca5f7b492
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/model/source/album.dart
View file

@ -29,15 +29,25 @@ mixin AlbumMixin on SourceBase {
} }
String getUniqueAlbumName(String album) { String getUniqueAlbumName(String album) {
final volumeRoot = androidFileUtils.getStorageVolume(album)?.path ?? ''; final otherAlbums = _folderPaths.where((item) => item != album);
final otherAlbums = _folderPaths.where((item) => item != album && item.startsWith(volumeRoot));
final parts = album.split(separator); final parts = album.split(separator);
var partCount = 0; var partCount = 0;
String testName; String testName;
do { do {
testName = separator + parts.skip(parts.length - ++partCount).join(separator); testName = separator + parts.skip(parts.length - ++partCount).join(separator);
} while (otherAlbums.any((item) => item.endsWith(testName))); } while (otherAlbums.any((item) => item.endsWith(testName)));
return parts.skip(parts.length - partCount).join(separator); final uniqueName = parts.skip(parts.length - partCount).join(separator);
final volume = androidFileUtils.getStorageVolume(album);
final volumeRoot = volume?.path ?? '';
final albumRelativePath = album.substring(volumeRoot.length);
if (uniqueName.length < albumRelativePath.length || volume == null) {
return uniqueName;
} else if (volume.isPrimary) {
return albumRelativePath;
} else {
return '$albumRelativePath (${volume.description})';
}
} }
Map<String, ImageEntry> getAlbumEntries() { Map<String, ImageEntry> getAlbumEntries() {

2
lib/widgets/search/expandable_filter_row.dart
View file

@ -105,7 +105,7 @@ class ExpandableFilterRow extends StatelessWidget {
Widget _buildFilterChip(CollectionFilter filter) { Widget _buildFilterChip(CollectionFilter filter) {
return AvesFilterChip( return AvesFilterChip(
key: Key(filter.key), key: ValueKey(filter),
filter: filter, filter: filter,
heroType: heroTypeBuilder?.call(filter) ?? HeroType.onTap, heroType: heroTypeBuilder?.call(filter) ?? HeroType.onTap,
onTap: onTap, onTap: onTap,