kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Playlist] Correctly handle deleted items 

The member that I set myself to indicate deletion has one capital letter
to differentiate it from the built-in "delete" property of managed
objects, which doesn't do what I want, so I had to dodge it with that
capitalization thing.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
swiftingly
Christopher Snowhill 2022-06-17 04:34:17 -07:00
parent 0b3e7e3ac3
commit d972a6eaf5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Playlist/PlaylistController.m
View File

@ -1079,7 +1079,7 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
} else { } else {
NSInteger i; NSInteger i;
if(pe.deleted) // Was a current entry, now removed. if(pe.deLeted) // Was a current entry, now removed.
{ {
if(nextEntryAfterDeleted) if(nextEntryAfterDeleted)
i = nextEntryAfterDeleted.index; i = nextEntryAfterDeleted.index;
@ -1295,7 +1295,7 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
NSMutableIndexSet *refreshSet = [[NSMutableIndexSet alloc] init]; NSMutableIndexSet *refreshSet = [[NSMutableIndexSet alloc] init];
if(currentEntry != nil && !currentEntry.deleted) [refreshSet addIndex:currentEntry.index]; if(currentEntry != nil && !currentEntry.deLeted) [refreshSet addIndex:currentEntry.index];
if(pe != nil) [refreshSet addIndex:pe.index]; if(pe != nil) [refreshSet addIndex:pe.index];
// Refresh entire row to refresh tooltips // Refresh entire row to refresh tooltips

4
Playlist/PlaylistLoader.m
View File

@ -640,7 +640,7 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
NSBlockOperation *op = [[NSBlockOperation alloc] init]; NSBlockOperation *op = [[NSBlockOperation alloc] init];
[op addExecutionBlock:^{ [op addExecutionBlock:^{
if(weakPe.deleted) { if(weakPe.deLeted) {
[weakLock lock]; [weakLock lock];
progress += progressstep; progress += progressstep;
[self setProgressJobStatus:progress]; [self setProgressJobStatus:progress];
@ -684,7 +684,7 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
__block PlaylistEntry *weakPe = [outArray objectAtIndex:i]; __block PlaylistEntry *weakPe = [outArray objectAtIndex:i];
__block NSDictionary *entryInfo = [outArray objectAtIndex:i + 1]; __block NSDictionary *entryInfo = [outArray objectAtIndex:i + 1];
dispatch_sync_reentrant(dispatch_get_main_queue(), ^{ dispatch_sync_reentrant(dispatch_get_main_queue(), ^{
if(!weakPe.deleted) { if(!weakPe.deLeted) {
[weakPe setMetadata:entryInfo]; [weakPe setMetadata:entryInfo];
} }
progress += progressstep; progress += progressstep;