2007-03-07 01:26:50 +00:00
|
|
|
//
|
|
|
|
// PlaylistLoader.m
|
|
|
|
// Cog
|
|
|
|
//
|
|
|
|
// Created by Vincent Spader on 3/05/07.
|
|
|
|
// Copyright 2007 Vincent Spader All rights reserved.
|
|
|
|
//
|
|
|
|
|
2013-10-09 15:45:16 +00:00
|
|
|
#include <objc/runtime.h>
|
|
|
|
|
2016-09-02 00:20:53 +00:00
|
|
|
#include <mach/semaphore.h>
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
#import "AppController.h"
|
2007-03-07 01:26:50 +00:00
|
|
|
#import "PlaylistController.h"
|
|
|
|
#import "PlaylistEntry.h"
|
2022-02-07 05:49:27 +00:00
|
|
|
#import "PlaylistLoader.h"
|
2007-03-07 01:26:50 +00:00
|
|
|
|
2007-03-14 02:28:30 +00:00
|
|
|
#import "NSFileHandle+CreateFile.h"
|
|
|
|
|
2007-10-09 01:20:46 +00:00
|
|
|
#import "CogAudio/AudioContainer.h"
|
2008-03-01 18:29:14 +00:00
|
|
|
#import "CogAudio/AudioMetadataReader.h"
|
2022-02-07 05:49:27 +00:00
|
|
|
#import "CogAudio/AudioPlayer.h"
|
|
|
|
#import "CogAudio/AudioPropertiesReader.h"
|
2007-03-09 01:16:06 +00:00
|
|
|
|
2018-06-28 10:59:59 +00:00
|
|
|
#import "XmlContainer.h"
|
2013-10-09 15:45:16 +00:00
|
|
|
|
2013-10-09 23:14:23 +00:00
|
|
|
#import "NSData+MD5.h"
|
|
|
|
|
2018-06-28 10:59:59 +00:00
|
|
|
#import "NSString+FinderCompare.h"
|
|
|
|
|
2021-12-24 09:01:21 +00:00
|
|
|
#import "SQLiteStore.h"
|
|
|
|
|
2013-10-11 12:03:55 +00:00
|
|
|
#import "Logging.h"
|
|
|
|
|
2022-02-15 04:02:18 +00:00
|
|
|
#import "NSDictionary+Merge.h"
|
|
|
|
|
2022-02-17 05:38:43 +00:00
|
|
|
#import "RedundantPlaylistDataStore.h"
|
|
|
|
|
2007-03-07 01:26:50 +00:00
|
|
|
@implementation PlaylistLoader
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (id)init {
|
2008-05-03 16:01:27 +00:00
|
|
|
self = [super init];
|
2022-02-07 05:49:27 +00:00
|
|
|
if(self) {
|
2009-08-16 16:49:34 +00:00
|
|
|
[self initDefaults];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
2009-03-06 04:37:44 +00:00
|
|
|
queue = [[NSOperationQueue alloc] init];
|
2021-05-08 00:19:10 +00:00
|
|
|
[queue setMaxConcurrentOperationCount:8];
|
2008-05-03 16:01:27 +00:00
|
|
|
}
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
return self;
|
2008-05-03 16:01:27 +00:00
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (void)initDefaults {
|
2022-02-09 03:42:03 +00:00
|
|
|
NSDictionary *defaultsDictionary = @{@"readCueSheetsInFolders": [NSNumber numberWithBool:YES]};
|
2022-02-07 05:49:27 +00:00
|
|
|
|
2009-08-16 16:49:34 +00:00
|
|
|
[[NSUserDefaults standardUserDefaults] registerDefaults:defaultsDictionary];
|
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (BOOL)save:(NSString *)filename {
|
2007-03-07 01:26:50 +00:00
|
|
|
NSString *ext = [filename pathExtension];
|
2022-02-07 05:49:27 +00:00
|
|
|
if([ext isEqualToString:@"pls"]) {
|
2007-03-07 01:26:50 +00:00
|
|
|
return [self save:filename asType:kPlaylistPls];
|
2022-02-07 05:49:27 +00:00
|
|
|
} else {
|
2007-03-07 01:26:50 +00:00
|
|
|
return [self save:filename asType:kPlaylistM3u];
|
|
|
|
}
|
2022-02-07 05:49:27 +00:00
|
|
|
}
|
2007-03-07 01:26:50 +00:00
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (BOOL)save:(NSString *)filename asType:(PlaylistType)type {
|
|
|
|
if(type == kPlaylistM3u) {
|
2007-03-07 01:26:50 +00:00
|
|
|
return [self saveM3u:filename];
|
2022-02-07 05:49:27 +00:00
|
|
|
} else if(type == kPlaylistPls) {
|
2007-03-07 01:26:50 +00:00
|
|
|
return [self savePls:filename];
|
2022-02-07 05:49:27 +00:00
|
|
|
} else if(type == kPlaylistXml) {
|
|
|
|
return [self saveXml:filename];
|
2007-03-07 01:26:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return NO;
|
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (NSString *)relativePathFrom:(NSString *)filename toURL:(NSURL *)entryURL {
|
2007-03-07 01:26:50 +00:00
|
|
|
NSString *basePath = [[[filename stringByStandardizingPath] stringByDeletingLastPathComponent] stringByAppendingString:@"/"];
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
if([entryURL isFileURL]) {
|
|
|
|
// We want relative paths.
|
2016-05-05 20:05:39 +00:00
|
|
|
NSMutableString *entryPath = [[[entryURL path] stringByStandardizingPath] mutableCopy];
|
2007-03-07 01:26:50 +00:00
|
|
|
|
2007-03-09 01:16:06 +00:00
|
|
|
[entryPath replaceOccurrencesOfString:basePath withString:@"" options:(NSAnchoredSearch | NSLiteralSearch | NSCaseInsensitiveSearch) range:NSMakeRange(0, [entryPath length])];
|
2022-02-07 05:49:27 +00:00
|
|
|
if([entryURL fragment]) {
|
2007-10-15 22:19:14 +00:00
|
|
|
[entryPath appendString:@"#"];
|
|
|
|
[entryPath appendString:[entryURL fragment]];
|
|
|
|
}
|
2007-03-07 01:26:50 +00:00
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
return entryPath;
|
|
|
|
} else {
|
|
|
|
// Write [entryURL absoluteString] to file
|
2007-03-07 01:26:50 +00:00
|
|
|
return [entryURL absoluteString];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (BOOL)saveM3u:(NSString *)filename {
|
2007-03-14 02:28:30 +00:00
|
|
|
NSFileHandle *fileHandle = [NSFileHandle fileHandleForWritingAtPath:filename createFile:YES];
|
2022-02-07 05:49:27 +00:00
|
|
|
if(!fileHandle) {
|
2013-10-11 12:03:55 +00:00
|
|
|
ALog(@"Error saving m3u!");
|
2008-02-13 01:50:39 +00:00
|
|
|
return NO;
|
2007-03-07 01:26:50 +00:00
|
|
|
}
|
2007-03-09 01:16:06 +00:00
|
|
|
[fileHandle truncateFileAtOffset:0];
|
2022-02-07 05:49:27 +00:00
|
|
|
[fileHandle writeData:[@"#\n" dataUsingEncoding:NSUTF8StringEncoding]];
|
|
|
|
|
|
|
|
for(PlaylistEntry *pe in [playlistController arrangedObjects]) {
|
2008-02-20 00:44:40 +00:00
|
|
|
NSString *path = [self relativePathFrom:filename toURL:[pe URL]];
|
2007-03-07 01:26:50 +00:00
|
|
|
[fileHandle writeData:[[path stringByAppendingString:@"\n"] dataUsingEncoding:NSUTF8StringEncoding]];
|
|
|
|
}
|
|
|
|
|
2007-03-09 01:16:06 +00:00
|
|
|
[fileHandle closeFile];
|
|
|
|
|
2007-03-07 01:26:50 +00:00
|
|
|
return YES;
|
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (BOOL)savePls:(NSString *)filename {
|
2007-03-14 02:28:30 +00:00
|
|
|
NSFileHandle *fileHandle = [NSFileHandle fileHandleForWritingAtPath:filename createFile:YES];
|
2022-02-07 05:49:27 +00:00
|
|
|
if(!fileHandle) {
|
2007-03-07 01:26:50 +00:00
|
|
|
return NO;
|
|
|
|
}
|
2007-03-09 01:16:06 +00:00
|
|
|
[fileHandle truncateFileAtOffset:0];
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
[fileHandle writeData:[[NSString stringWithFormat:@"[playlist]\nnumberOfEntries=%lu\n\n", (unsigned long)[[playlistController content] count]] dataUsingEncoding:NSUTF8StringEncoding]];
|
2007-03-07 01:26:50 +00:00
|
|
|
|
2007-03-07 01:45:45 +00:00
|
|
|
int i = 1;
|
2022-02-07 05:49:27 +00:00
|
|
|
for(PlaylistEntry *pe in [playlistController arrangedObjects]) {
|
2008-02-20 00:44:40 +00:00
|
|
|
NSString *path = [self relativePathFrom:filename toURL:[pe URL]];
|
2022-02-07 05:49:27 +00:00
|
|
|
NSString *entry = [NSString stringWithFormat:@"File%i=%@\n", i, path];
|
2007-03-07 01:26:50 +00:00
|
|
|
|
|
|
|
[fileHandle writeData:[entry dataUsingEncoding:NSUTF8StringEncoding]];
|
2007-03-07 01:45:45 +00:00
|
|
|
i++;
|
2007-03-07 01:26:50 +00:00
|
|
|
}
|
|
|
|
|
2007-03-09 01:16:06 +00:00
|
|
|
[fileHandle writeData:[@"\nVERSION=2" dataUsingEncoding:NSUTF8StringEncoding]];
|
|
|
|
[fileHandle closeFile];
|
|
|
|
|
2007-03-07 01:26:50 +00:00
|
|
|
return YES;
|
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
NSMutableDictionary *dictionaryWithPropertiesOfObject(id obj, NSArray *filterList) {
|
|
|
|
NSMutableDictionary *dict = [NSMutableDictionary dictionary];
|
|
|
|
|
|
|
|
Class class = [obj class];
|
|
|
|
|
|
|
|
do {
|
|
|
|
unsigned count;
|
|
|
|
objc_property_t *properties = class_copyPropertyList(class, &count);
|
|
|
|
|
|
|
|
for(int i = 0; i < count; i++) {
|
|
|
|
NSString *key = [NSString stringWithUTF8String:property_getName(properties[i])];
|
|
|
|
if([filterList containsObject:key]) continue;
|
|
|
|
|
|
|
|
Class classObject = NSClassFromString([key capitalizedString]);
|
|
|
|
if(classObject) {
|
|
|
|
id subObj = dictionaryWithPropertiesOfObject([obj valueForKey:key], filterList);
|
|
|
|
[dict setObject:subObj forKey:key];
|
|
|
|
} else {
|
|
|
|
id value = [obj valueForKey:key];
|
|
|
|
if(value) [dict setObject:value forKey:key];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
free(properties);
|
|
|
|
|
|
|
|
if(count) break;
|
|
|
|
|
|
|
|
class = [class superclass];
|
|
|
|
} while(class);
|
|
|
|
|
|
|
|
return dict;
|
2013-10-09 15:45:16 +00:00
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (BOOL)saveXml:(NSString *)filename {
|
2013-10-09 15:45:16 +00:00
|
|
|
NSFileHandle *fileHandle = [NSFileHandle fileHandleForWritingAtPath:filename createFile:YES];
|
2022-02-07 05:49:27 +00:00
|
|
|
if(!fileHandle) {
|
2013-10-09 15:45:16 +00:00
|
|
|
return NO;
|
|
|
|
}
|
|
|
|
[fileHandle truncateFileAtOffset:0];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
NSArray *filterList = @[@"display", @"length", @"path", @"filename", @"status", @"statusMessage", @"spam", @"lengthText", @"positionText", @"stopAfter", @"shuffleIndex", @"index", @"current", @"queued", @"currentPosition", @"queuePosition", @"error", @"removed", @"URL", @"albumArt"];
|
|
|
|
|
|
|
|
NSMutableDictionary *albumArtSet = [[NSMutableDictionary alloc] init];
|
|
|
|
|
|
|
|
NSMutableArray *topLevel = [[NSMutableArray alloc] init];
|
|
|
|
|
|
|
|
for(PlaylistEntry *pe in [playlistController arrangedObjects]) {
|
|
|
|
BOOL error = [pe error];
|
|
|
|
|
|
|
|
NSMutableDictionary *dict = dictionaryWithPropertiesOfObject(pe, filterList);
|
2013-10-09 15:45:16 +00:00
|
|
|
|
|
|
|
NSString *path = [self relativePathFrom:filename toURL:[pe URL]];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
[dict setObject:path forKey:@"URL"];
|
|
|
|
NSData *albumArt = [dict objectForKey:@"albumArtInternal"];
|
|
|
|
if(albumArt) {
|
|
|
|
[dict removeObjectForKey:@"albumArtInternal"];
|
|
|
|
NSString *hash = [albumArt MD5];
|
|
|
|
if(![albumArtSet objectForKey:hash])
|
|
|
|
[albumArtSet setObject:albumArt forKey:hash];
|
|
|
|
[dict setObject:hash forKey:@"albumArt"];
|
|
|
|
}
|
|
|
|
|
|
|
|
if(error)
|
|
|
|
[dict removeObjectForKey:@"metadataLoaded"];
|
|
|
|
|
|
|
|
[topLevel addObject:dict];
|
|
|
|
}
|
|
|
|
|
|
|
|
NSMutableArray *queueList = [[NSMutableArray alloc] init];
|
|
|
|
|
|
|
|
for(PlaylistEntry *pe in [playlistController queueList]) {
|
|
|
|
[queueList addObject:[NSNumber numberWithInteger:pe.index]];
|
|
|
|
}
|
|
|
|
|
2022-02-09 03:42:03 +00:00
|
|
|
NSDictionary *dictionary = @{@"albumArt": albumArtSet, @"queue": queueList, @"items": topLevel};
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
NSError *err;
|
|
|
|
|
|
|
|
NSData *data = [NSPropertyListSerialization dataWithPropertyList:dictionary format:NSPropertyListXMLFormat_v1_0 options:0 error:&err];
|
|
|
|
|
|
|
|
[fileHandle writeData:data];
|
|
|
|
|
|
|
|
[fileHandle closeFile];
|
2013-10-09 15:45:16 +00:00
|
|
|
|
|
|
|
return YES;
|
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (NSArray *)fileURLsAtPath:(NSString *)path {
|
2007-03-09 01:16:06 +00:00
|
|
|
NSFileManager *manager = [NSFileManager defaultManager];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
2007-03-09 01:16:06 +00:00
|
|
|
NSMutableArray *urls = [NSMutableArray array];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
2007-03-09 01:16:06 +00:00
|
|
|
NSArray *subpaths = [manager subpathsAtPath:path];
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
for(NSString *subpath in subpaths) {
|
|
|
|
NSString *absoluteSubpath = [NSString pathWithComponents:@[path, subpath]];
|
|
|
|
|
2007-03-09 01:16:06 +00:00
|
|
|
BOOL isDir;
|
2022-02-07 05:49:27 +00:00
|
|
|
if([manager fileExistsAtPath:absoluteSubpath isDirectory:&isDir] && isDir == NO) {
|
|
|
|
if([[absoluteSubpath pathExtension] caseInsensitiveCompare:@"cue"] != NSOrderedSame ||
|
|
|
|
[[NSUserDefaults standardUserDefaults] boolForKey:@"readCueSheetsInFolders"]) {
|
2009-08-16 16:49:34 +00:00
|
|
|
[urls addObject:[NSURL fileURLWithPath:absoluteSubpath]];
|
|
|
|
}
|
2007-03-09 01:16:06 +00:00
|
|
|
}
|
|
|
|
}
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
NSSortDescriptor *sd_path = [[NSSortDescriptor alloc] initWithKey:@"path" ascending:YES];
|
|
|
|
[urls sortUsingDescriptors:@[sd_path]];
|
|
|
|
|
2007-03-09 01:16:06 +00:00
|
|
|
return urls;
|
|
|
|
}
|
|
|
|
|
2022-01-09 10:10:08 +00:00
|
|
|
static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_block_t block) {
|
2022-02-07 05:49:27 +00:00
|
|
|
if(dispatch_queue_get_label(queue) == dispatch_queue_get_label(DISPATCH_CURRENT_QUEUE_LABEL)) {
|
|
|
|
block();
|
|
|
|
} else {
|
|
|
|
dispatch_sync(queue, block);
|
|
|
|
}
|
2022-01-09 10:10:08 +00:00
|
|
|
}
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
- (void)beginProgress:(NSString *)localizedDescription {
|
2022-02-07 05:49:27 +00:00
|
|
|
dispatch_sync_reentrant(dispatch_get_main_queue(), ^{
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
self->playbackController.progressOverall = [NSProgress progressWithTotalUnitCount:100000];
|
|
|
|
self->playbackController.progressOverall.localizedDescription = localizedDescription;
|
2022-02-07 05:49:27 +00:00
|
|
|
});
|
2022-01-09 10:10:08 +00:00
|
|
|
}
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
- (void)completeProgress {
|
|
|
|
dispatch_sync_reentrant(dispatch_get_main_queue(), ^{
|
|
|
|
if(self->playbackController.progressJob) {
|
|
|
|
[self->playbackController.progressJob setCompletedUnitCount:100000];
|
|
|
|
self->playbackController.progressJob = nil;
|
|
|
|
}
|
|
|
|
[self->playbackController.progressOverall setCompletedUnitCount:100000];
|
|
|
|
self->playbackController.progressOverall = nil;
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)beginProgressJob:(NSString *)localizedDescription percentOfTotal:(double)percent {
|
|
|
|
dispatch_sync_reentrant(dispatch_get_main_queue(), ^{
|
|
|
|
NSUInteger jobCount = (NSUInteger)ceil(1000.0 * percent);
|
|
|
|
self->playbackController.progressJob = [NSProgress progressWithTotalUnitCount:100000];
|
|
|
|
self->playbackController.progressJob.localizedDescription = localizedDescription;
|
|
|
|
[self->playbackController.progressOverall addChild:self->playbackController.progressJob withPendingUnitCount:jobCount];
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)completeProgressJob {
|
|
|
|
dispatch_sync_reentrant(dispatch_get_main_queue(), ^{
|
|
|
|
[self->playbackController.progressJob setCompletedUnitCount:100000];
|
|
|
|
self->playbackController.progressJob = nil;
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)setProgressStatus:(double)status {
|
|
|
|
if(status >= 0) {
|
|
|
|
dispatch_sync_reentrant(dispatch_get_main_queue(), ^{
|
|
|
|
NSUInteger jobCount = (NSUInteger)ceil(1000.0 * status);
|
|
|
|
[self->playbackController.progressOverall setCompletedUnitCount:jobCount];
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
[self completeProgress];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
- (void)setProgressJobStatus:(double)status {
|
|
|
|
if(status >= 0) {
|
|
|
|
dispatch_sync_reentrant(dispatch_get_main_queue(), ^{
|
|
|
|
NSUInteger jobCount = (NSUInteger)ceil(1000.0 * status);
|
|
|
|
[self->playbackController.progressJob setCompletedUnitCount:jobCount];
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
[self completeProgressJob];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (NSArray *)insertURLs:(NSArray *)urls atIndex:(NSInteger)index sort:(BOOL)sort {
|
2007-05-28 14:58:08 +00:00
|
|
|
NSMutableSet *uniqueURLs = [NSMutableSet set];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
2007-05-28 14:58:08 +00:00
|
|
|
NSMutableArray *expandedURLs = [NSMutableArray array];
|
2007-10-19 02:23:10 +00:00
|
|
|
NSMutableArray *containedURLs = [NSMutableArray array];
|
|
|
|
NSMutableArray *fileURLs = [NSMutableArray array];
|
2007-05-28 14:58:08 +00:00
|
|
|
NSMutableArray *validURLs = [NSMutableArray array];
|
2022-02-07 05:49:27 +00:00
|
|
|
NSDictionary *xmlData = nil;
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
double progress;
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
if(!urls) {
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self completeProgress];
|
2022-01-19 02:12:57 +00:00
|
|
|
return @[];
|
2022-02-07 05:49:27 +00:00
|
|
|
}
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self beginProgress:NSLocalizedString(@"ProgressActionLoader", @"playlist loader inserting files")];
|
|
|
|
|
|
|
|
[self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderListingFiles", @"collecting files") percentOfTotal:20.0];
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
if(index < 0)
|
2007-03-09 01:16:06 +00:00
|
|
|
index = 0;
|
2022-02-07 05:49:27 +00:00
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
progress = 0.0;
|
2022-02-07 05:49:27 +00:00
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
double progressstep = [urls count] ? 100.0 / (double)([urls count]) : 0;
|
2008-05-03 15:15:45 +00:00
|
|
|
|
2007-03-09 01:16:06 +00:00
|
|
|
NSURL *url;
|
2022-02-07 05:49:27 +00:00
|
|
|
for(url in urls) {
|
|
|
|
if([url isFileURL]) {
|
2007-03-09 01:16:06 +00:00
|
|
|
BOOL isDir;
|
2022-02-07 05:49:27 +00:00
|
|
|
if([[NSFileManager defaultManager] fileExistsAtPath:[url path] isDirectory:&isDir]) {
|
|
|
|
if(isDir == YES) {
|
|
|
|
// Get subpaths
|
2007-05-28 14:58:08 +00:00
|
|
|
[expandedURLs addObjectsFromArray:[self fileURLsAtPath:[url path]]];
|
2022-02-07 05:49:27 +00:00
|
|
|
} else {
|
|
|
|
[expandedURLs addObject:[NSURL fileURLWithPath:[url path]]];
|
2007-03-09 01:16:06 +00:00
|
|
|
}
|
|
|
|
}
|
2022-02-07 05:49:27 +00:00
|
|
|
} else {
|
|
|
|
// Non-file URL..
|
2007-05-28 14:58:08 +00:00
|
|
|
[expandedURLs addObject:url];
|
2007-03-09 01:16:06 +00:00
|
|
|
}
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
progress += progressstep;
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self setProgressJobStatus:progress];
|
2022-02-07 05:49:27 +00:00
|
|
|
}
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self completeProgressJob];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
progress = 0.0;
|
2022-02-07 05:49:27 +00:00
|
|
|
|
2013-10-11 12:03:55 +00:00
|
|
|
DLog(@"Expanded urls: %@", expandedURLs);
|
2007-03-09 01:16:06 +00:00
|
|
|
|
2007-05-28 14:58:08 +00:00
|
|
|
NSArray *sortedURLs;
|
2022-02-07 05:49:27 +00:00
|
|
|
if(sort == YES) {
|
2009-08-16 16:49:34 +00:00
|
|
|
sortedURLs = [expandedURLs sortedArrayUsingSelector:@selector(finderCompare:)];
|
2022-02-07 05:49:27 +00:00
|
|
|
// sortedURLs = [expandedURLs sortedArrayUsingSelector:@selector(compareTrackNumbers:)];
|
|
|
|
} else {
|
2009-02-28 17:41:37 +00:00
|
|
|
sortedURLs = expandedURLs;
|
2007-05-28 14:58:08 +00:00
|
|
|
}
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderFilteringContainerFiles", @"handling container file types") percentOfTotal:20.0];
|
|
|
|
|
|
|
|
progressstep = [sortedURLs count] ? 100.0 / (double)([sortedURLs count]) : 0;
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
for(url in sortedURLs) {
|
|
|
|
// Container vs non-container url
|
|
|
|
if([[self acceptableContainerTypes] containsObject:[[url pathExtension] lowercaseString]]) {
|
|
|
|
NSArray *urls = [AudioContainer urlsForContainerURL:url];
|
|
|
|
|
|
|
|
if(urls != nil && [urls count] != 0) {
|
|
|
|
[containedURLs addObjectsFromArray:urls];
|
|
|
|
|
|
|
|
// Make sure the container isn't added twice.
|
|
|
|
[uniqueURLs addObject:url];
|
|
|
|
} else {
|
|
|
|
/* Fall back on adding the raw file if all container parsers have failed. */
|
|
|
|
[fileURLs addObject:url];
|
|
|
|
}
|
|
|
|
} else if([[[url pathExtension] lowercaseString] isEqualToString:@"xml"]) {
|
|
|
|
xmlData = [XmlContainer entriesForContainerURL:url];
|
|
|
|
} else {
|
2007-10-19 02:23:10 +00:00
|
|
|
[fileURLs addObject:url];
|
2007-05-28 14:58:08 +00:00
|
|
|
}
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
progress += progressstep;
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self setProgressJobStatus:progress];
|
2007-05-28 14:58:08 +00:00
|
|
|
}
|
2022-02-07 05:49:27 +00:00
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
progress = 0.0;
|
|
|
|
[self completeProgressJob];
|
|
|
|
|
|
|
|
if([fileURLs count] > 0) {
|
|
|
|
[self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderFilteringFiles", @"eliminating unsupported file types") percentOfTotal:20.0];
|
|
|
|
} else {
|
|
|
|
[self setProgressStatus:60.0];
|
|
|
|
}
|
2007-05-28 14:58:08 +00:00
|
|
|
|
2013-10-11 12:03:55 +00:00
|
|
|
DLog(@"File urls: %@", fileURLs);
|
2007-10-19 02:23:10 +00:00
|
|
|
|
2013-10-11 12:03:55 +00:00
|
|
|
DLog(@"Contained urls: %@", containedURLs);
|
2007-10-19 02:23:10 +00:00
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
progressstep = [fileURLs count] ? 100.0 / (double)([fileURLs count]) : 0;
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
for(url in fileURLs) {
|
|
|
|
progress += progressstep;
|
|
|
|
|
|
|
|
if(![[AudioPlayer schemes] containsObject:[url scheme]])
|
2007-03-09 01:16:06 +00:00
|
|
|
continue;
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
NSString *ext = [[url pathExtension] lowercaseString];
|
|
|
|
|
|
|
|
// Need a better way to determine acceptable file types than basing it on extensions.
|
|
|
|
if([url isFileURL] && ![[AudioPlayer fileTypes] containsObject:ext])
|
2007-03-09 01:16:06 +00:00
|
|
|
continue;
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
if(![uniqueURLs containsObject:url]) {
|
2007-05-27 16:14:29 +00:00
|
|
|
[validURLs addObject:url];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
2007-05-27 16:14:29 +00:00
|
|
|
[uniqueURLs addObject:url];
|
|
|
|
}
|
2022-02-07 05:49:27 +00:00
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self setProgressJobStatus:progress];
|
2022-02-07 05:49:27 +00:00
|
|
|
}
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
progress = 0.0;
|
2022-02-07 05:49:27 +00:00
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
if([fileURLs count] > 0) {
|
|
|
|
[self completeProgressJob];
|
|
|
|
}
|
|
|
|
|
|
|
|
if([containedURLs count] > 0) {
|
|
|
|
[self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderFilteringContainedFiles", @"eliminating unsupported file types from containers") percentOfTotal:20.0];
|
|
|
|
} else {
|
|
|
|
[self setProgressStatus:80.0];
|
|
|
|
}
|
2022-02-07 05:49:27 +00:00
|
|
|
|
2013-10-11 12:03:55 +00:00
|
|
|
DLog(@"Valid urls: %@", validURLs);
|
2007-10-19 02:23:10 +00:00
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
progressstep = [containedURLs count] ? 100.0 / (double)([containedURLs count]) : 0;
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
for(url in containedURLs) {
|
|
|
|
progress += progressstep;
|
|
|
|
|
|
|
|
if(![[AudioPlayer schemes] containsObject:[url scheme]])
|
2007-10-19 02:23:10 +00:00
|
|
|
continue;
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
// Need a better way to determine acceptable file types than basing it on extensions.
|
|
|
|
if([url isFileURL] && ![[AudioPlayer fileTypes] containsObject:[[url pathExtension] lowercaseString]])
|
2007-10-19 02:23:10 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
[validURLs addObject:url];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self setProgressJobStatus:progress];
|
2022-02-07 05:49:27 +00:00
|
|
|
}
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
progress = 0.0;
|
|
|
|
if([containedURLs count] > 0) {
|
|
|
|
[self completeProgressJob];
|
|
|
|
}
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
// Create actual entries
|
|
|
|
int count = (int)[validURLs count];
|
|
|
|
if(xmlData) count += [[xmlData objectForKey:@"entries"] count];
|
|
|
|
|
|
|
|
// no valid URLs, or they use an unsupported URL scheme
|
|
|
|
if(!count) {
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self completeProgress];
|
2022-02-07 05:49:27 +00:00
|
|
|
return @[];
|
|
|
|
}
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderAddingEntries", @"creating and adding playlist entries") percentOfTotal:20.0];
|
|
|
|
|
|
|
|
progressstep = 100.0 / (double)(count);
|
2022-02-07 05:49:27 +00:00
|
|
|
|
2021-04-30 01:16:24 +00:00
|
|
|
NSInteger i = 0;
|
2013-10-09 15:45:16 +00:00
|
|
|
NSMutableArray *entries = [NSMutableArray arrayWithCapacity:count];
|
2022-02-07 05:49:27 +00:00
|
|
|
for(NSURL *url in validURLs) {
|
2008-03-13 01:43:33 +00:00
|
|
|
PlaylistEntry *pe;
|
2022-02-07 05:49:27 +00:00
|
|
|
pe = [[PlaylistEntry alloc] init];
|
2007-03-09 01:16:06 +00:00
|
|
|
|
2008-03-01 19:56:10 +00:00
|
|
|
pe.URL = url;
|
2022-02-07 05:49:27 +00:00
|
|
|
pe.index = index + i;
|
2008-03-01 19:56:10 +00:00
|
|
|
pe.title = [[url path] lastPathComponent];
|
|
|
|
pe.queuePosition = -1;
|
2007-03-09 01:16:06 +00:00
|
|
|
[entries addObject:pe];
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
++i;
|
|
|
|
|
|
|
|
progress += progressstep;
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self setProgressJobStatus:progress];
|
2022-02-07 05:49:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
NSInteger j = index + i;
|
|
|
|
|
|
|
|
if(xmlData) {
|
|
|
|
for(NSDictionary *entry in [xmlData objectForKey:@"entries"]) {
|
|
|
|
PlaylistEntry *pe;
|
|
|
|
pe = [[PlaylistEntry alloc] init];
|
|
|
|
|
|
|
|
[pe setValuesForKeysWithDictionary:entry];
|
|
|
|
pe.index = index + i;
|
|
|
|
pe.queuePosition = -1;
|
|
|
|
[entries addObject:pe];
|
|
|
|
|
|
|
|
++i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self completeProgress];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
2007-03-09 01:16:06 +00:00
|
|
|
NSIndexSet *is = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(index, [entries count])];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
2007-03-09 01:16:06 +00:00
|
|
|
[playlistController insertObjects:entries atArrangedObjectIndexes:is];
|
2013-10-10 08:43:04 +00:00
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
if(xmlData && [[xmlData objectForKey:@"queue"] count]) {
|
|
|
|
[playlistController emptyQueueList:self];
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
for(NSNumber *index in [xmlData objectForKey:@"queue"]) {
|
|
|
|
NSInteger indexVal = [index intValue] + j;
|
|
|
|
PlaylistEntry *pe = [entries objectAtIndex:indexVal];
|
|
|
|
pe.queuePosition = i;
|
|
|
|
pe.queued = YES;
|
|
|
|
|
|
|
|
[[playlistController queueList] addObject:pe];
|
|
|
|
|
|
|
|
++i;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Clear the selection
|
|
|
|
[playlistController setSelectionIndexes:[NSIndexSet indexSet]];
|
|
|
|
|
|
|
|
{
|
|
|
|
NSArray *arrayFirst = @[[entries objectAtIndex:0]];
|
|
|
|
NSMutableArray *arrayRest = [entries mutableCopy];
|
|
|
|
[arrayRest removeObjectAtIndex:0];
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
metadataLoadInProgress = YES;
|
|
|
|
|
|
|
|
[self beginProgress:NSLocalizedString(@"ProgressActionLoadingMetadata", @"loading metadata for tracks")];
|
|
|
|
[self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoadingMetadata", @"processing files") percentOfTotal:50.0];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
[self performSelectorOnMainThread:@selector(syncLoadInfoForEntries:) withObject:arrayFirst waitUntilDone:YES];
|
|
|
|
|
|
|
|
progressstep = 100.0 / (double)([entries count]);
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
progress = progressstep;
|
|
|
|
[self setProgressJobStatus:progress];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
if([arrayRest count])
|
|
|
|
[self performSelectorInBackground:@selector(loadInfoForEntries:) withObject:arrayRest];
|
|
|
|
else
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self completeProgress];
|
2022-02-07 05:49:27 +00:00
|
|
|
return entries;
|
|
|
|
}
|
2008-03-03 02:25:52 +00:00
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (void)loadInfoForEntries:(NSArray *)entries {
|
|
|
|
NSMutableIndexSet *update_indexes = [[NSMutableIndexSet alloc] init];
|
|
|
|
long i, j;
|
|
|
|
NSMutableIndexSet *load_info_indexes = [[NSMutableIndexSet alloc] init];
|
|
|
|
|
|
|
|
SQLiteStore *store = [SQLiteStore sharedStore];
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
__block double progress = 0.0;
|
2022-02-07 05:49:27 +00:00
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
double progressstep;
|
2022-02-07 05:49:27 +00:00
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
if(metadataLoadInProgress && [entries count]) {
|
|
|
|
progressstep = 100.0 / (double)([entries count] + 1);
|
|
|
|
progress = progressstep;
|
|
|
|
} else if([entries count]) {
|
|
|
|
[self beginProgress:NSLocalizedString(@"ProgressActionLoadingMetadata", @"loading metadata for tracks")];
|
|
|
|
[self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoadingMetadata", @"processing files") percentOfTotal:50.0];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
progressstep = 100.0 / (double)([entries count]);
|
|
|
|
progress = 0.0;
|
|
|
|
}
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
i = 0;
|
|
|
|
j = 0;
|
|
|
|
for(PlaylistEntry *pe in entries) {
|
|
|
|
long idx = j++;
|
|
|
|
|
|
|
|
if([pe metadataLoaded]) continue;
|
|
|
|
|
|
|
|
[update_indexes addIndex:pe.index];
|
|
|
|
[load_info_indexes addIndex:idx];
|
|
|
|
|
|
|
|
++i;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!i) {
|
|
|
|
[playlistController performSelectorOnMainThread:@selector(updateTotalTime) withObject:nil waitUntilDone:NO];
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self completeProgress];
|
|
|
|
metadataLoadInProgress = NO;
|
2022-02-07 05:49:27 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
NSLock *outLock = [[NSLock alloc] init];
|
|
|
|
NSMutableArray *outArray = [[NSMutableArray alloc] init];
|
2022-02-17 05:38:43 +00:00
|
|
|
RedundantPlaylistDataStore *dataStore = [[RedundantPlaylistDataStore alloc] init];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
__block NSLock *weakLock = outLock;
|
|
|
|
__block NSMutableArray *weakArray = outArray;
|
2022-02-17 05:38:43 +00:00
|
|
|
__block RedundantPlaylistDataStore *weakDataStore = dataStore;
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
{
|
|
|
|
[load_info_indexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *_Nonnull stop) {
|
|
|
|
__block PlaylistEntry *weakPe = [entries objectAtIndex:idx];
|
|
|
|
|
|
|
|
NSBlockOperation *op = [[NSBlockOperation alloc] init];
|
|
|
|
|
|
|
|
[op addExecutionBlock:^{
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
if(weakPe.deleted) {
|
|
|
|
[weakLock lock];
|
|
|
|
progress += progressstep;
|
|
|
|
[self setProgressJobStatus:progress];
|
|
|
|
[weakLock unlock];
|
|
|
|
return;
|
|
|
|
}
|
2022-06-15 04:27:51 +00:00
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
DLog(@"Loading metadata for %@", weakPe.URL);
|
|
|
|
|
|
|
|
NSDictionary *entryProperties = [AudioPropertiesReader propertiesForURL:weakPe.URL];
|
|
|
|
if(entryProperties == nil)
|
|
|
|
return;
|
|
|
|
|
2022-02-11 14:00:36 +00:00
|
|
|
NSDictionary *entryMetadata = [AudioMetadataReader metadataForURL:weakPe.URL];
|
|
|
|
|
2022-02-15 04:02:18 +00:00
|
|
|
NSDictionary *entryInfo = [NSDictionary dictionaryByMerging:entryProperties with:entryMetadata];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
[weakLock lock];
|
2022-02-17 05:38:43 +00:00
|
|
|
entryInfo = [weakDataStore coalesceEntryInfo:entryInfo];
|
2022-02-07 05:49:27 +00:00
|
|
|
[weakArray addObject:weakPe];
|
|
|
|
[weakArray addObject:entryInfo];
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
progress += progressstep;
|
|
|
|
[self setProgressJobStatus:progress];
|
2022-02-07 05:49:27 +00:00
|
|
|
[weakLock unlock];
|
|
|
|
}];
|
|
|
|
|
|
|
|
[queue addOperation:op];
|
|
|
|
}];
|
|
|
|
}
|
|
|
|
|
|
|
|
[queue waitUntilAllOperationsAreFinished];
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
progress = 0.0;
|
|
|
|
[self completeProgressJob];
|
|
|
|
|
|
|
|
[self beginProgressJob:NSLocalizedString(@"ProgressSubActionMetadataApply", @"applying info to playlist storage") percentOfTotal:50.0];
|
|
|
|
|
|
|
|
progressstep = 200.0 / (double)([outArray count]);
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
for(i = 0, j = [outArray count]; i < j; i += 2) {
|
|
|
|
__block PlaylistEntry *weakPe = [outArray objectAtIndex:i];
|
|
|
|
__block NSDictionary *entryInfo = [outArray objectAtIndex:i + 1];
|
|
|
|
dispatch_sync_reentrant(dispatch_get_main_queue(), ^{
|
2022-06-15 04:27:51 +00:00
|
|
|
if(!weakPe.deleted) {
|
|
|
|
[weakPe setMetadata:entryInfo];
|
|
|
|
[store trackUpdate:weakPe];
|
|
|
|
}
|
2022-02-07 05:49:27 +00:00
|
|
|
progress += progressstep;
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self setProgressJobStatus:progress];
|
2022-02-07 05:49:27 +00:00
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
[playlistController performSelectorOnMainThread:@selector(updateTotalTime) withObject:nil waitUntilDone:NO];
|
|
|
|
|
|
|
|
{
|
|
|
|
__block NSScrollView *weakPlaylistView = playlistView;
|
|
|
|
__block NSIndexSet *weakIndexSet = update_indexes;
|
|
|
|
dispatch_sync_reentrant(dispatch_get_main_queue(), ^{
|
|
|
|
unsigned long columns = [[[weakPlaylistView documentView] tableColumns] count];
|
|
|
|
[weakPlaylistView.documentView reloadDataForRowIndexes:weakIndexSet columnIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, columns)]];
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
[self completeProgress];
|
|
|
|
metadataLoadInProgress = NO;
|
2021-05-08 00:19:10 +00:00
|
|
|
}
|
[Job Queue] Overhauled long action handling
Long actions, such as file opening, playlist loading, metadata loading
and refreshing, etc, are now handled through NSProgress. Additionally,
a new status bar change displays the progress of the task instead of
the total duration of the playlist. Finally, app quit is blocked by a
running task, and if the app is quit while a task is running, it will
be delayed until the task completes, at which time the app will
terminate cleanly.
Signed-off-by: Christopher Snowhill <kode54@gmail.com>
2022-06-15 08:01:45 +00:00
|
|
|
|
2019-12-06 03:04:46 +00:00
|
|
|
// To be called on main thread only
|
2022-02-07 05:49:27 +00:00
|
|
|
- (void)syncLoadInfoForEntries:(NSArray *)entries {
|
|
|
|
NSMutableIndexSet *update_indexes = [[NSMutableIndexSet alloc] init];
|
|
|
|
long i, j;
|
|
|
|
NSMutableIndexSet *load_info_indexes = [[NSMutableIndexSet alloc] init];
|
|
|
|
|
|
|
|
SQLiteStore *store = [SQLiteStore sharedStore];
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
j = 0;
|
|
|
|
for(PlaylistEntry *pe in entries) {
|
|
|
|
long idx = j++;
|
|
|
|
|
|
|
|
if([pe metadataLoaded]) continue;
|
|
|
|
|
|
|
|
[update_indexes addIndex:pe.index];
|
|
|
|
[load_info_indexes addIndex:idx];
|
|
|
|
|
|
|
|
++i;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(!i) {
|
|
|
|
[self->playlistController updateTotalTime];
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
[load_info_indexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *_Nonnull stop) {
|
|
|
|
PlaylistEntry *pe = [entries objectAtIndex:idx];
|
|
|
|
|
|
|
|
DLog(@"Loading metadata for %@", pe.URL);
|
|
|
|
|
|
|
|
NSDictionary *entryProperties = [AudioPropertiesReader propertiesForURL:pe.URL];
|
|
|
|
if(entryProperties == nil)
|
|
|
|
return;
|
|
|
|
|
2022-02-15 04:02:18 +00:00
|
|
|
NSDictionary *entryInfo = [NSDictionary dictionaryByMerging:entryProperties with:[AudioMetadataReader metadataForURL:pe.URL]];
|
2022-02-07 05:49:27 +00:00
|
|
|
|
|
|
|
[pe setMetadata:entryInfo];
|
|
|
|
[store trackUpdate:pe];
|
|
|
|
}];
|
|
|
|
|
|
|
|
[self->playlistController updateTotalTime];
|
|
|
|
|
|
|
|
{
|
|
|
|
unsigned long columns = [[[self->playlistView documentView] tableColumns] count];
|
|
|
|
[self->playlistView.documentView reloadDataForRowIndexes:update_indexes columnIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, columns)]];
|
|
|
|
}
|
2019-12-06 03:04:46 +00:00
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (void)clear:(id)sender {
|
2009-08-16 16:49:34 +00:00
|
|
|
[playlistController clear:sender];
|
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (NSArray *)addURLs:(NSArray *)urls sort:(BOOL)sort {
|
2016-06-30 05:10:29 +00:00
|
|
|
return [self insertURLs:urls atIndex:(int)[[playlistController content] count] sort:sort];
|
2007-03-09 01:16:06 +00:00
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (NSArray *)addURL:(NSURL *)url {
|
2022-01-19 02:12:57 +00:00
|
|
|
return [self insertURLs:@[url] atIndex:(int)[[playlistController content] count] sort:NO];
|
2007-05-27 16:14:29 +00:00
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (NSArray *)addDatabase {
|
|
|
|
SQLiteStore *store = [SQLiteStore sharedStore];
|
|
|
|
|
|
|
|
int64_t count = [store playlistGetCount];
|
|
|
|
|
|
|
|
NSInteger i = 0;
|
|
|
|
NSMutableArray *entries = [NSMutableArray arrayWithCapacity:count];
|
|
|
|
|
|
|
|
for(i = 0; i < count; ++i) {
|
|
|
|
PlaylistEntry *pe = [store playlistGetCachedItem:i];
|
|
|
|
|
|
|
|
pe.queuePosition = -1;
|
|
|
|
|
|
|
|
[entries addObject:pe];
|
|
|
|
}
|
|
|
|
|
|
|
|
NSIndexSet *is = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [entries count])];
|
|
|
|
|
|
|
|
[playlistController insertObjectsUnsynced:entries atArrangedObjectIndexes:is];
|
|
|
|
|
|
|
|
count = [store queueGetCount];
|
|
|
|
|
|
|
|
if(count) {
|
|
|
|
NSMutableIndexSet *refreshSet = [[NSMutableIndexSet alloc] init];
|
|
|
|
|
|
|
|
[playlistController emptyQueueListUnsynced];
|
|
|
|
|
|
|
|
for(i = 0; i < count; ++i) {
|
|
|
|
NSInteger indexVal = [store queueGetEntry:i];
|
|
|
|
PlaylistEntry *pe = [entries objectAtIndex:indexVal];
|
|
|
|
pe.queuePosition = i;
|
|
|
|
pe.queued = YES;
|
|
|
|
|
|
|
|
[[playlistController queueList] addObject:pe];
|
|
|
|
|
|
|
|
[refreshSet addIndex:[pe index]];
|
|
|
|
}
|
|
|
|
|
|
|
|
// Refresh entire row to refresh tooltips
|
|
|
|
unsigned long columns = [[playlistView.documentView tableColumns] count];
|
|
|
|
[playlistView.documentView reloadDataForRowIndexes:refreshSet columnIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, columns)]];
|
|
|
|
}
|
|
|
|
|
|
|
|
// Clear the selection
|
|
|
|
[playlistController setSelectionIndexes:[NSIndexSet indexSet]];
|
|
|
|
|
|
|
|
if([entries count]) {
|
|
|
|
[self performSelectorInBackground:@selector(loadInfoForEntries:) withObject:entries];
|
|
|
|
}
|
|
|
|
|
|
|
|
return entries;
|
2021-12-24 09:01:21 +00:00
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (NSArray *)acceptableFileTypes {
|
2007-10-09 01:20:46 +00:00
|
|
|
return [[self acceptableContainerTypes] arrayByAddingObjectsFromArray:[AudioPlayer fileTypes]];
|
2007-03-09 01:16:06 +00:00
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (NSArray *)acceptablePlaylistTypes {
|
2022-01-19 02:12:57 +00:00
|
|
|
return @[@"m3u", @"pls"];
|
2007-10-13 04:53:48 +00:00
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (NSArray *)acceptableContainerTypes {
|
2007-10-09 01:20:46 +00:00
|
|
|
return [AudioPlayer containerTypes];
|
2007-03-07 01:26:50 +00:00
|
|
|
}
|
|
|
|
|
2022-02-07 05:49:27 +00:00
|
|
|
- (void)willInsertURLs:(NSArray *)urls origin:(URLOrigin)origin {
|
2009-02-28 22:22:33 +00:00
|
|
|
[playlistController willInsertURLs:urls origin:origin];
|
2008-05-09 21:24:49 +00:00
|
|
|
}
|
2022-02-07 05:49:27 +00:00
|
|
|
- (void)didInsertURLs:(NSArray *)urls origin:(URLOrigin)origin {
|
2009-02-28 22:22:33 +00:00
|
|
|
[playlistController didInsertURLs:urls origin:origin];
|
2008-05-09 21:24:49 +00:00
|
|
|
}
|
|
|
|
|
2007-03-07 01:26:50 +00:00
|
|
|
@end
|