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

fixed album auto naming for folders on SD card

Browse source
This commit is contained in:
Thibault Deckers 2021-04-13 13:27:47 +09:00
parent cb01ea1a16
commit fb9defb131
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,7 +56,7 @@ mixin AlbumMixin on SourceBase {
final otherAlbumsOnDevice = _directories.where((item) => item != dirPath).toSet(); final otherAlbumsOnDevice = _directories.where((item) => item != dirPath).toSet();
final uniqueNameInDevice = unique(dirPath, otherAlbumsOnDevice); final uniqueNameInDevice = unique(dirPath, otherAlbumsOnDevice);
if (uniqueNameInDevice.length < relativeDir.length) { if (uniqueNameInDevice.length <= relativeDir.length) {
return uniqueNameInDevice; return uniqueNameInDevice;
} }

4
test/model/collection_source_test.dart
View file

@ -254,6 +254,8 @@ void main() {
FakeMediaStoreService.newImage('${FakeStorageService.primaryPath}', '1'), FakeMediaStoreService.newImage('${FakeStorageService.primaryPath}', '1'),
FakeMediaStoreService.newImage('${FakeStorageService.primaryPath}Pictures/Seneca', '1'), FakeMediaStoreService.newImage('${FakeStorageService.primaryPath}Pictures/Seneca', '1'),
FakeMediaStoreService.newImage('${FakeStorageService.primaryPath}Seneca', '1'), FakeMediaStoreService.newImage('${FakeStorageService.primaryPath}Seneca', '1'),
FakeMediaStoreService.newImage('${FakeStorageService.removablePath}Pictures/Cicero', '1'),
FakeMediaStoreService.newImage('${FakeStorageService.removablePath}Marcus Aurelius', '1'),
}; };
await androidFileUtils.init(); await androidFileUtils.init();
@ -269,6 +271,8 @@ void main() {
expect(source.getAlbumDisplayName(context, FakeStorageService.primaryRootAlbum), FakeStorageService.primaryDescription); expect(source.getAlbumDisplayName(context, FakeStorageService.primaryRootAlbum), FakeStorageService.primaryDescription);
expect(source.getAlbumDisplayName(context, '${FakeStorageService.primaryPath}Pictures/Seneca'), 'Pictures/Seneca'); expect(source.getAlbumDisplayName(context, '${FakeStorageService.primaryPath}Pictures/Seneca'), 'Pictures/Seneca');
expect(source.getAlbumDisplayName(context, '${FakeStorageService.primaryPath}Seneca'), 'Seneca'); expect(source.getAlbumDisplayName(context, '${FakeStorageService.primaryPath}Seneca'), 'Seneca');
expect(source.getAlbumDisplayName(context, '${FakeStorageService.removablePath}Pictures/Cicero'), 'Cicero');
expect(source.getAlbumDisplayName(context, '${FakeStorageService.removablePath}Marcus Aurelius'), 'Marcus Aurelius');
return Placeholder(); return Placeholder();
}, },
), ),