chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

Emergency Bug Fix: Fix loading individual tracks

Browse source 
And folders of tracks, too! The only thing that worked in 3117 was
playlist files. Hah!

Fixes #436

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
This commit is contained in:
Christopher Snowhill 2025-05-11 05:32:49 -07:00
parent 70042c39f8
commit bafbc511c6
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Playlist/PlaylistLoader.m
View file

@ -593,13 +593,13 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
keys = [keys sortedArrayUsingSelector:@selector(finderCompare:)]; keys = [keys sortedArrayUsingSelector:@selector(finderCompare:)];
} }
NSArray *objs = [loadedURLs objectsForKeys:keys notFoundMarker:[NSNull null]]; NSArray *objs = [loadedURLs objectsForKeys:keys notFoundMarker:[NSNull null]];
// Pass 1: Collect unique URLs /* Pass 1: Collect unique URLs
* v2: from containers only
*/
for(id obj in objs) { for(id obj in objs) {
if([obj isKindOfClass:[NSURL class]]) { /*if([obj isKindOfClass:[NSURL class]]) {
if(![uniqueURLs containsObject:obj]) { } else*/
[uniqueURLs addObject:obj]; if([obj isKindOfClass:[NSArray class]]) {
}
} else if([obj isKindOfClass:[NSArray class]]) {
for(NSURL *url in obj) { for(NSURL *url in obj) {
if(![uniqueURLs containsObject:url]) { if(![uniqueURLs containsObject:url]) {
[uniqueURLs addObject:url]; [uniqueURLs addObject:url];
@ -608,11 +608,17 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
} }
} }
// Pass 2: Only add outer URLs that are unique, but add all contained URLs /* Pass 2: Only add outer URLs that are unique, but add all contained URLs
* v2: only add outer URLs to unique list here, otherwise they don't get added at all :D
* Technically doing it for outer paths here isn't necessary, as the expanded URLs
* dictionary will end up deduplicating input paths anyway. We just don't want it
* happening to playlist or container contents
*/
for(id obj in objs) { for(id obj in objs) {
if([obj isKindOfClass:[NSURL class]]) { if([obj isKindOfClass:[NSURL class]]) {
if(![uniqueURLs containsObject:obj]) { if(![uniqueURLs containsObject:obj]) {
[fileURLs addObject:obj]; [fileURLs addObject:obj];
[uniqueURLs addObject:obj];
} }
} else if([obj isKindOfClass:[NSArray class]]) { } else if([obj isKindOfClass:[NSArray class]]) {
[fileURLs addObjectsFromArray:obj]; [fileURLs addObjectsFromArray:obj];