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

Sentry: Replace most of old logging, add traces

Browse source 
Add event traces to playlist loading and metadata processing queues.
Unfortunately, most of the old non-error events should not be logged,
because Sentry gets terribly spammy with captureMessage events. They
should only be used for error events, or other uncommon events which
do not already throw exceptions or NSError objects.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
This commit is contained in:
Christopher Snowhill 2025-02-26 20:28:51 -08:00
parent bde8f23ab1
commit 6855449550
3 changed files with 253 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Application/PlaybackController.m
View file

@ -19,7 +19,9 @@
#import "Logging.h" #import "Logging.h"
//@import Sentry; @import Sentry;
// Sentry captureMessage is too spammy to use for anything but actual errors
extern BOOL kAppControllerShuttingDown; extern BOOL kAppControllerShuttingDown;
@ -284,11 +286,11 @@ NSDictionary *makeRGInfo(PlaylistEntry *pe) {
if(!pe.url) { if(!pe.url) {
pe.error = YES; pe.error = YES;
pe.errorMessage = NSLocalizedStringFromTableInBundle(@"ErrorMessageBadFile", nil, [NSBundle bundleForClass:[self class]], @""); pe.errorMessage = NSLocalizedStringFromTableInBundle(@"ErrorMessageBadFile", nil, [NSBundle bundleForClass:[self class]], @"");
//[[FIRCrashlytics crashlytics] log:@"Attempting to play bad file."]; [SentrySDK captureMessage:@"Attempted to play a bad file with no URL"];
return; return;
} }
//[[FIRCrashlytics crashlytics] logWithFormat:@"Playing track: %@", pe.url]; //[SentrySDK captureMessage:[NSString stringWithFormat:@"Playing track: %@", pe.url]];
DLog(@"PLAYLIST CONTROLLER: %@", [playlistController class]); DLog(@"PLAYLIST CONTROLLER: %@", [playlistController class]);
[playlistController setCurrentEntry:pe]; [playlistController setCurrentEntry:pe];
@ -767,15 +769,15 @@ NSDictionary *makeRGInfo(PlaylistEntry *pe) {
} }
if(pe && pe.url) { if(pe && pe.url) {
//[[FIRCrashlytics crashlytics] logWithFormat:@"Beginning decoding track: %@", pe.url]; //[SentrySDK captureMessage:[NSString stringWithFormat:@"Beginning decoding track: %@", pe.url]];
[player setNextStream:pe.url withUserInfo:pe withRGInfo:makeRGInfo(pe)]; [player setNextStream:pe.url withUserInfo:pe withRGInfo:makeRGInfo(pe)];
} else if(pe) { } else if(pe) {
//[[FIRCrashlytics crashlytics] log:@"Invalid playlist entry reached."]; [SentrySDK captureMessage:@"Invalid playlist entry reached"];
[player setNextStream:nil]; [player setNextStream:nil];
pe.error = YES; pe.error = YES;
pe.errorMessage = NSLocalizedStringFromTableInBundle(@"ErrorMessageBadFile", nil, [NSBundle bundleForClass:[self class]], @""); pe.errorMessage = NSLocalizedStringFromTableInBundle(@"ErrorMessageBadFile", nil, [NSBundle bundleForClass:[self class]], @"");
} else { } else {
//[[FIRCrashlytics crashlytics] log:@"End of playlist reached."]; //[SentrySDK captureMessage:@"End of playlist reached"];
[player setNextStream:nil]; [player setNextStream:nil];
} }
} }
@ -786,7 +788,7 @@ NSDictionary *makeRGInfo(PlaylistEntry *pe) {
// Delay the action until this function has returned to the audio thread // Delay the action until this function has returned to the audio thread
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_MSEC), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 5 * NSEC_PER_MSEC), dispatch_get_main_queue(), ^{
if(pe) { if(pe) {
//[[FIRCrashlytics crashlytics] logWithFormat:@"Updating UI with track: %@", pe.url]; //[SentrySDK captureMessage:[NSString stringWithFormat:@"Updating UI with track: %@", pe.url]];
} }
[self->playlistController setCurrentEntry:pe]; [self->playlistController setCurrentEntry:pe];
@ -817,7 +819,7 @@ NSDictionary *makeRGInfo(PlaylistEntry *pe) {
} }
if(status == CogStatusStopped) { if(status == CogStatusStopped) {
//[[FIRCrashlytics crashlytics] log:@"Stopped."]; //[SentrySDK captureMessage:@"Playback stopped"];
[self setPosition:0]; [self setPosition:0];
[self setSeekable:NO]; // the player stopped, disable the slider [self setSeekable:NO]; // the player stopped, disable the slider
@ -825,11 +827,11 @@ NSDictionary *makeRGInfo(PlaylistEntry *pe) {
[[NSNotificationCenter defaultCenter] postNotificationName:CogPlaybackDidStopNotificiation object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:CogPlaybackDidStopNotificiation object:nil];
} else // paused } else // paused
{ {
//[[FIRCrashlytics crashlytics] log:@"Paused."]; //[SentrySDK captureMessage:@"Playback paused"];
[[NSNotificationCenter defaultCenter] postNotificationName:CogPlaybackDidPauseNotificiation object:nil]; [[NSNotificationCenter defaultCenter] postNotificationName:CogPlaybackDidPauseNotificiation object:nil];
} }
} else if(status == CogStatusPlaying) { } else if(status == CogStatusPlaying) {
//[[FIRCrashlytics crashlytics] log:@"Started playing."]; //[SentrySDK captureMessage:@"Playback started"];
if(!positionTimer) { if(!positionTimer) {
positionTimer = [NSTimer timerWithTimeInterval:0.2 target:self selector:@selector(updatePosition:) userInfo:nil repeats:YES]; positionTimer = [NSTimer timerWithTimeInterval:0.2 target:self selector:@selector(updatePosition:) userInfo:nil repeats:YES];
@ -865,7 +867,7 @@ NSDictionary *makeRGInfo(PlaylistEntry *pe) {
- (void)audioPlayer:(AudioPlayer *)player didStopNaturally:(id)userInfo { - (void)audioPlayer:(AudioPlayer *)player didStopNaturally:(id)userInfo {
if([[NSUserDefaults standardUserDefaults] boolForKey:@"quitOnNaturalStop"]) { if([[NSUserDefaults standardUserDefaults] boolForKey:@"quitOnNaturalStop"]) {
//[[FIRCrashlytics crashlytics] log:@"Terminating due to natural stop."]; //[SentrySDK captureMessage:@"Playback stopped naturally, terminating app"];
[NSApp terminate:nil]; [NSApp terminate:nil];
} }
} }
@ -880,7 +882,7 @@ NSDictionary *makeRGInfo(PlaylistEntry *pe) {
- (void)audioPlayer:(AudioPlayer *)player restartPlaybackAtCurrentPosition:(id)userInfo { - (void)audioPlayer:(AudioPlayer *)player restartPlaybackAtCurrentPosition:(id)userInfo {
PlaylistEntry *pe = [playlistController currentEntry]; PlaylistEntry *pe = [playlistController currentEntry];
BOOL paused = playbackStatus == CogStatusPaused; BOOL paused = playbackStatus == CogStatusPaused;
//[[FIRCrashlytics crashlytics] logWithFormat:@"Restarting playback of track: %@", pe.url]; //[SentrySDK captureMessage:[NSString stringWithFormat:@"Playback restarting for track: %@", pe.url]];
[player performSelectorOnMainThread:@selector(playBG:withUserInfo:withRGInfo:startPaused:andSeekTo:) withObjects:pe.url, pe, makeRGInfo(pe), @(paused), @(pe.seekable ? pe.currentPosition : 0.0), nil]; [player performSelectorOnMainThread:@selector(playBG:withUserInfo:withRGInfo:startPaused:andSeekTo:) withObjects:pe.url, pe, makeRGInfo(pe), @(paused), @(pe.seekable ? pe.currentPosition : 0.0), nil];
} }

335
Playlist/PlaylistLoader.m
View file

@ -41,6 +41,8 @@
#import "SandboxBroker.h" #import "SandboxBroker.h"
@import Sentry;
extern NSMutableDictionary<NSString *, AlbumArtwork *> *kArtworkDictionary; extern NSMutableDictionary<NSString *, AlbumArtwork *> *kArtworkDictionary;
@implementation PlaylistLoader @implementation PlaylistLoader
@ -363,36 +365,52 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
double progressstep = [urls count] ? 100.0 / (double)([urls count]) : 0; double progressstep = [urls count] ? 100.0 / (double)([urls count]) : 0;
id<SentrySpan> mainTask = [SentrySDK startTransactionWithName:@"Loading playlist entries" operation:@"Main task"];
id<SentrySpan> sandboxTask = [mainTask startChildWithOperation:@"Initial Sandbox sweep" description:@"Attempt load the files into the Sandbox storage, or locate them if they're already in storage"];
NSURL *url; NSURL *url;
for(url in urls) { for(url in urls) {
if([url isFileURL]) { id<SentrySpan> pathTask = [sandboxTask startChildWithOperation:@"Process one folder" description:[NSString stringWithFormat:@"Processing file or folder: %@", url]];
BOOL isDir; @try {
if([[NSFileManager defaultManager] fileExistsAtPath:[url path] isDirectory:&isDir]) { if([url isFileURL]) {
if(isDir == YES) { BOOL isDir;
// Get subpaths if([[NSFileManager defaultManager] fileExistsAtPath:[url path] isDirectory:&isDir]) {
[[SandboxBroker sharedSandboxBroker] addFolderIfMissing:url]; if(isDir == YES) {
[expandedURLs addObjectsFromArray:[self fileURLsAtPath:[url path]]]; // Get subpaths
} else if(addOtherFilesInFolder) { [[SandboxBroker sharedSandboxBroker] addFolderIfMissing:url];
NSURL *folderUrl = [url URLByDeletingLastPathComponent]; [expandedURLs addObjectsFromArray:[self fileURLsAtPath:[url path]]];
if(![folderURLs containsObject:folderUrl]) { } else if(addOtherFilesInFolder) {
[[SandboxBroker sharedSandboxBroker] requestFolderForFile:url]; NSURL *folderUrl = [url URLByDeletingLastPathComponent];
[expandedURLs addObjectsFromArray:[self fileURLsAtPath:[folderUrl path]]]; if(![folderURLs containsObject:folderUrl]) {
[folderURLs addObject:folderUrl]; [[SandboxBroker sharedSandboxBroker] requestFolderForFile:url];
[expandedURLs addObjectsFromArray:[self fileURLsAtPath:[folderUrl path]]];
[folderURLs addObject:folderUrl];
}
} else {
[[SandboxBroker sharedSandboxBroker] addFileIfMissing:url];
[expandedURLs addObject:[NSURL fileURLWithPath:[url path]]];
} }
} else {
[[SandboxBroker sharedSandboxBroker] addFileIfMissing:url];
[expandedURLs addObject:[NSURL fileURLWithPath:[url path]]];
} }
} else {
// Non-file URL..
[expandedURLs addObject:url];
} }
} else {
// Non-file URL.. [pathTask finish];
[expandedURLs addObject:url]; }
@catch(id anException) {
DLog(@"Exception caught while processing path: %@", anException);
[SentrySDK captureException:anException];
[pathTask finishWithStatus:kSentrySpanStatusInternalError];
} }
progress += progressstep; progress += progressstep;
[self setProgressJobStatus:progress]; [self setProgressJobStatus:progress];
} }
[sandboxTask finish];
[self completeProgressJob]; [self completeProgressJob];
@ -412,54 +430,73 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
progressstep = [sortedURLs count] ? 100.0 / (double)([sortedURLs count]) : 0; progressstep = [sortedURLs count] ? 100.0 / (double)([sortedURLs count]) : 0;
id<SentrySpan> containerTask = [mainTask startChildWithOperation:@"Process paths for containers"];
for(url in sortedURLs) { for(url in sortedURLs) {
// Container vs non-container url // Container vs non-container url
if([[self acceptableContainerTypes] containsObject:[[url pathExtension] lowercaseString]]) { id<SentrySpan> pathTask = nil;
NSArray *urls = [AudioContainer urlsForContainerURL:url]; @try {
pathTask = [containerTask startChildWithOperation:@"Process path as container" description:[NSString stringWithFormat:@"Checking if file is container: %@", url]];
if(urls != nil && [urls count] != 0) { if([[self acceptableContainerTypes] containsObject:[[url pathExtension] lowercaseString]]) {
[containedURLs addObjectsFromArray:urls]; id<SentrySpan> innerTask = [pathTask startChildWithOperation:@"Container, processing"];
// Make sure the container isn't added twice.
[uniqueURLs addObject:url];
// Find the dependencies NSArray *urls = [AudioContainer urlsForContainerURL:url];
NSArray *depURLs = [AudioContainer dependencyUrlsForContainerURL:url];
if(urls != nil && [urls count] != 0) {
BOOL localFound = NO; [containedURLs addObjectsFromArray:urls];
for(NSURL *u in urls) {
if([u isFileURL]) { // Make sure the container isn't added twice.
localFound = YES; [uniqueURLs addObject:url];
break;
} // Find the dependencies
} NSArray *depURLs = [AudioContainer dependencyUrlsForContainerURL:url];
if(depURLs) {
[dependencyURLs addObjectsFromArray:depURLs]; BOOL localFound = NO;
for(NSURL *u in urls) {
for(NSURL *u in depURLs) {
if([u isFileURL]) { if([u isFileURL]) {
localFound = YES; localFound = YES;
break; break;
} }
} }
if(depURLs) {
[dependencyURLs addObjectsFromArray:depURLs];
for(NSURL *u in depURLs) {
if([u isFileURL]) {
localFound = YES;
break;
}
}
}
if(localFound) {
[[SandboxBroker sharedSandboxBroker] requestFolderForFile:url];
}
} else {
/* Fall back on adding the raw file if all container parsers have failed. */
[fileURLs addObject:url];
} }
if(localFound) { [innerTask finish];
[[SandboxBroker sharedSandboxBroker] requestFolderForFile:url]; } else if([[[url pathExtension] lowercaseString] isEqualToString:@"xml"]) {
} xmlData = [XmlContainer entriesForContainerURL:url];
} else { } else {
/* Fall back on adding the raw file if all container parsers have failed. */
[fileURLs addObject:url]; [fileURLs addObject:url];
} }
} else if([[[url pathExtension] lowercaseString] isEqualToString:@"xml"]) { [pathTask finish];
xmlData = [XmlContainer entriesForContainerURL:url]; }
} else { @catch(id anException) {
[fileURLs addObject:url]; DLog(@"Exception caught while processing for containers: %@", anException);
[SentrySDK captureException:anException];
if(pathTask) {
[pathTask finishWithStatus:kSentrySpanStatusInternalError];
}
} }
progress += progressstep; progress += progressstep;
[self setProgressJobStatus:progress]; [self setProgressJobStatus:progress];
} }
[containerTask finish];
progress = 0.0; progress = 0.0;
[self completeProgressJob]; [self completeProgressJob];
@ -469,6 +506,8 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
[self setProgressStatus:60.0]; [self setProgressStatus:60.0];
} }
id<SentrySpan> filterTask = [mainTask startChildWithOperation:@"Filtering URLs for dupes and supported tracks"];
// Deduplication of contained URLs // Deduplication of contained URLs
[fileURLs removeObjectsInArray:containedURLs]; [fileURLs removeObjectsInArray:containedURLs];
[fileURLs removeObjectsInArray:dependencyURLs]; [fileURLs removeObjectsInArray:dependencyURLs];
@ -489,34 +528,54 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
progressstep = [fileURLs count] ? 100.0 / (double)([fileURLs count]) : 0; progressstep = [fileURLs count] ? 100.0 / (double)([fileURLs count]) : 0;
for(url in fileURLs) { for(url in fileURLs) {
progress += progressstep; id<SentrySpan> fileTask = nil;
if(![[AudioPlayer schemes] containsObject:[url scheme]]) @try {
continue; fileTask = [filterTask startChildWithOperation:@"Filtering individual path" description:[NSString stringWithFormat:@"File path: %@", url]];
progress += progressstep;
if(![[AudioPlayer schemes] containsObject:[url scheme]])
continue;
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])
continue;
if(![uniqueURLs containsObject:url]) {
[validURLs addObject:url];
[uniqueURLs addObject:url];
}
NSString *ext = [[url pathExtension] lowercaseString]; [fileTask finish];
}
// Need a better way to determine acceptable file types than basing it on extensions. @catch(id anException) {
if([url isFileURL] && ![[AudioPlayer fileTypes] containsObject:ext]) DLog(@"Exception caught while filtering paths: %@", anException);
continue; [SentrySDK captureException:anException];
if(fileTask) {
if(![uniqueURLs containsObject:url]) { [fileTask finishWithStatus:kSentrySpanStatusInternalError];
[validURLs addObject:url]; }
[uniqueURLs addObject:url];
} }
[self setProgressJobStatus:progress]; [self setProgressJobStatus:progress];
} }
[filterTask finish];
progress = 0.0; progress = 0.0;
if([fileURLs count] > 0) { if([fileURLs count] > 0) {
[self completeProgressJob]; [self completeProgressJob];
} }
id<SentrySpan> containedTask = nil;
if([containedURLs count] > 0) { if([containedURLs count] > 0) {
[self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderFilteringContainedFiles", @"") percentOfTotal:20.0]; [self beginProgressJob:NSLocalizedString(@"ProgressSubActionLoaderFilteringContainedFiles", @"") percentOfTotal:20.0];
containedTask = [mainTask startChildWithOperation:@"Filtering contained URLs for supported tracks"];
} else { } else {
[self setProgressStatus:80.0]; [self setProgressStatus:80.0];
} }
@ -526,18 +585,41 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
progressstep = [containedURLs count] ? 100.0 / (double)([containedURLs count]) : 0; progressstep = [containedURLs count] ? 100.0 / (double)([containedURLs count]) : 0;
for(url in containedURLs) { for(url in containedURLs) {
progress += progressstep; id<SentrySpan> containedUrlTask = nil;
if(![[AudioPlayer schemes] containsObject:[url scheme]]) @try {
continue; containedUrlTask = [containedTask startChildWithOperation:@"Filtering contained URL" description:[NSString stringWithFormat:@"Track URL: %@", url]];
// Need a better way to determine acceptable file types than basing it on extensions. progress += progressstep;
if([url isFileURL] && ![[AudioPlayer fileTypes] containsObject:[[url pathExtension] lowercaseString]])
continue;
[validURLs addObject:url]; if(![[AudioPlayer schemes] containsObject:[url scheme]]) {
[containedUrlTask finish];
continue;
}
[self setProgressJobStatus:progress]; // Need a better way to determine acceptable file types than basing it on extensions.
if([url isFileURL] && ![[AudioPlayer fileTypes] containsObject:[[url pathExtension] lowercaseString]]) {
[containedUrlTask finish];
continue;
}
[validURLs addObject:url];
[self setProgressJobStatus:progress];
[containedUrlTask finish];
}
@catch(id anException) {
DLog(@"Exception caught filtering contained URL: %@", anException);
[SentrySDK captureException:anException];
if(containedUrlTask) {
[containedUrlTask finishWithStatus:kSentrySpanStatusInternalError];
}
}
}
if(containedTask) {
[containedTask finish];
} }
progress = 0.0; progress = 0.0;
@ -559,17 +641,24 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
progressstep = 100.0 / (double)(count); progressstep = 100.0 / (double)(count);
__block id<SentrySpan> addTask = [mainTask startChildWithOperation:@"Add entries to playlist" description:[NSString stringWithFormat:@"Adding %lu entries to the playlist", [validURLs count]]];
NSInteger i = 0; NSInteger i = 0;
__block NSMutableArray *entries = [NSMutableArray arrayWithCapacity:count]; __block NSMutableArray *entries = [NSMutableArray arrayWithCapacity:count];
for(NSURL *url in validURLs) { for(NSURL *url in validURLs) {
__block PlaylistEntry *pe; __block PlaylistEntry *pe;
dispatch_sync_reentrant(dispatch_get_main_queue(), ^{ dispatch_sync_reentrant(dispatch_get_main_queue(), ^{
id<SentrySpan> addItemTask = nil;
if(addTask) {
addItemTask = [addTask startChildWithOperation:@"Add individual item on main queue" description:[NSString stringWithFormat:@"Track URL: %@", url]];
}
pe = [NSEntityDescription insertNewObjectForEntityForName:@"PlaylistEntry" inManagedObjectContext:self->playlistController.persistentContainer.viewContext]; pe = [NSEntityDescription insertNewObjectForEntityForName:@"PlaylistEntry" inManagedObjectContext:self->playlistController.persistentContainer.viewContext];
pe.url = url; pe.url = url;
pe.index = index + i; pe.index = index + i;
pe.rawTitle = [[url path] lastPathComponent]; pe.rawTitle = [[url path] lastPathComponent];
pe.queuePosition = -1; pe.queuePosition = -1;
[addItemTask finish];
}); });
[entries addObject:pe]; [entries addObject:pe];
@ -580,6 +669,8 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
[self setProgressJobStatus:progress]; [self setProgressJobStatus:progress];
} }
[addTask finish];
NSInteger j = index + i; NSInteger j = index + i;
if(xmlData) { if(xmlData) {
@ -624,6 +715,8 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
} }
}); });
} }
[mainTask finish];
// Clear the selection // Clear the selection
dispatch_sync_reentrant(dispatch_get_main_queue(), ^{ dispatch_sync_reentrant(dispatch_get_main_queue(), ^{
@ -738,6 +831,8 @@ NSURL *_Nullable urlForPath(NSString *_Nullable path);
__block NSMutableDictionary *uniquePathsEntries = [[NSMutableDictionary alloc] init]; __block NSMutableDictionary *uniquePathsEntries = [[NSMutableDictionary alloc] init];
__block id<SentrySpan> mainTask = [SentrySDK startTransactionWithName:@"Loading tags" operation:@"Main tag operation"];
{ {
for(NSString *key in queueThisJob) { for(NSString *key in queueThisJob) {
NSBlockOperation *op = [[NSBlockOperation alloc] init]; NSBlockOperation *op = [[NSBlockOperation alloc] init];
@ -745,27 +840,44 @@ NSURL *_Nullable urlForPath(NSString *_Nullable path);
[op addExecutionBlock:^{ [op addExecutionBlock:^{
@autoreleasepool { @autoreleasepool {
DLog(@"Loading metadata for %@", url); NSString *message = [NSString stringWithFormat:@"Loading metadata for %@", url];
//[[FIRCrashlytics crashlytics] logWithFormat:@"Loading metadata for %@", url]; DLog(@"%@", message);
id<SentrySpan> childTask = nil;
NSDictionary *entryProperties = [AudioPropertiesReader propertiesForURL:url]; if(mainTask) {
if(entryProperties == nil) childTask = [mainTask startChildWithOperation:@"Load single tag" description:message];
return; }
NSDictionary *entryMetadata = [AudioMetadataReader metadataForURL:url]; @try {
NSDictionary *entryProperties = [AudioPropertiesReader propertiesForURL:url];
NSDictionary *entryInfo = [NSDictionary dictionaryByMerging:entryProperties with:entryMetadata]; if(entryProperties == nil)
return;
[weakLock lock];
@autoreleasepool { NSDictionary *entryMetadata = [AudioMetadataReader metadataForURL:url];
entryInfo = [weakDataStore coalesceEntryInfo:entryInfo];
NSDictionary *entryInfo = [NSDictionary dictionaryByMerging:entryProperties with:entryMetadata];
[weakLock lock];
@autoreleasepool {
entryInfo = [weakDataStore coalesceEntryInfo:entryInfo];
}
[weakArray addObject:key];
[weakArray addObject:entryInfo];
[uniquePathsEntries setObject:[[NSMutableArray alloc] init] forKey:key];
progress += progressstep;
[self setProgressJobStatus:progress];
[weakLock unlock];
if(childTask) {
[childTask finish];
}
}
@catch(id anException) {
DLog(@"Exception thrown while reading tags: %@", anException);
[SentrySDK captureException:anException];
if(childTask) {
[childTask finishWithStatus:kSentrySpanStatusInternalError];
}
} }
[weakArray addObject:key];
[weakArray addObject:entryInfo];
[uniquePathsEntries setObject:[[NSMutableArray alloc] init] forKey:key];
progress += progressstep;
[self setProgressJobStatus:progress];
[weakLock unlock];
} }
}]; }];
@ -780,6 +892,8 @@ NSURL *_Nullable urlForPath(NSString *_Nullable path);
[self beginProgressJob:NSLocalizedString(@"ProgressSubActionMetadataApply", @"") percentOfTotal:50.0]; [self beginProgressJob:NSLocalizedString(@"ProgressSubActionMetadataApply", @"") percentOfTotal:50.0];
id<SentrySpan> finalTask = [mainTask startChildWithOperation:@"Apply tags to storage"];
progressstep = 200.0 / (double)([outArray count]); progressstep = 200.0 / (double)([outArray count]);
NSManagedObjectContext *moc = playlistController.persistentContainer.viewContext; NSManagedObjectContext *moc = playlistController.persistentContainer.viewContext;
@ -851,6 +965,9 @@ NSURL *_Nullable urlForPath(NSString *_Nullable path);
[self completeProgress]; [self completeProgress];
metadataLoadInProgress = NO; metadataLoadInProgress = NO;
[finalTask finish];
[mainTask finish];
} }
// To be called on main thread only // To be called on main thread only
@ -876,22 +993,42 @@ NSURL *_Nullable urlForPath(NSString *_Nullable path);
[self->playlistController updateTotalTime]; [self->playlistController updateTotalTime];
return; return;
} }
__block id<SentrySpan> mainTask = [SentrySDK startTransactionWithName:@"Load tags synchronously" operation:@"Main task"];
[load_info_indexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *_Nonnull stop) { [load_info_indexes enumerateIndexesUsingBlock:^(NSUInteger idx, BOOL *_Nonnull stop) {
PlaylistEntry *pe = [entries objectAtIndex:idx]; PlaylistEntry *pe = [entries objectAtIndex:idx];
DLog(@"Loading metadata for %@", pe.url); DLog(@"Loading metadata for %@", pe.url);
//[[FIRCrashlytics crashlytics] logWithFormat:@"Loading metadata for %@", pe.url]; id<SentrySpan> childTask = nil;
if(mainTask) {
childTask = [mainTask startChildWithOperation:@"Load single tag" description:[NSString stringWithFormat:@"Loading tag for: %@", pe.urlString]];
}
NSDictionary *entryProperties = [AudioPropertiesReader propertiesForURL:pe.url]; @try {
if(entryProperties == nil) NSDictionary *entryProperties = [AudioPropertiesReader propertiesForURL:pe.url];
return; if(entryProperties == nil)
return;
NSDictionary *entryInfo = [NSDictionary dictionaryByMerging:entryProperties with:[AudioMetadataReader metadataForURL:pe.url]];
NSDictionary *entryInfo = [NSDictionary dictionaryByMerging:entryProperties with:[AudioMetadataReader metadataForURL:pe.url]];
[pe setMetadata:entryInfo];
[playlistController firstSawTrack:pe]; [pe setMetadata:entryInfo];
[playlistController firstSawTrack:pe];
if(childTask) {
[childTask finish];
}
}
@catch(id anException) {
DLog(@"Exception thrown while reading tag synchronously: %@", anException);
[SentrySDK captureException:anException];
if(childTask) {
[childTask finishWithStatus:kSentrySpanStatusInternalError];
}
}
}]; }];
[mainTask finish];
[self->playlistController updateTotalTime]; [self->playlistController updateTotalTime];

4
Playlist/PlaylistView.m
View file

@ -16,6 +16,8 @@
#import "Logging.h" #import "Logging.h"
@import Sentry;
static NSString *playlistSavedColumnsID = @"Playlist Saved Columns v0"; static NSString *playlistSavedColumnsID = @"Playlist Saved Columns v0";
@implementation PlaylistView @implementation PlaylistView
@ -119,7 +121,7 @@ static NSString *playlistSavedColumnsID = @"Playlist Saved Columns v0";
// Reset to defaults // Reset to defaults
NSString *message = @"Reset playlist columns to default"; NSString *message = @"Reset playlist columns to default";
DLog(@"%@", message); DLog(@"%@", message);
//[[FIRCrashlytics crashlytics] logWithFormat:@"%@", message]; [SentrySDK captureMessage:message];
for(NSTableColumn *col in columns) { for(NSTableColumn *col in columns) {
[self removeTableColumn:col]; [self removeTableColumn:col];
} }