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

SQLite store: Internal database cache now uses copied objects, and returns copies to the caller

CQTexperiment
Christopher Snowhill 2022-01-19 23:23:52 -08:00
parent ba5f5b8694
commit 34942a0ffa
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Utils/SQLiteStore.m
View File

@ -1294,7 +1294,7 @@ static SQLiteStore *g_sharedStore = NULL;
return; return;
} }
[databaseMirror replaceObjectAtIndex:[track index] withObject:track]; [databaseMirror replaceObjectAtIndex:[track index] withObject:[track copy]];
} }
} }
@ -1539,7 +1539,13 @@ static SQLiteStore *g_sharedStore = NULL;
return; return;
} }
[databaseMirror insertObjects:tracks atIndexes:indexes]; NSMutableArray * tracksCopy = [[NSMutableArray alloc] init];
for (PlaylistEntry * pe in tracks)
{
[tracksCopy addObject:[pe copy]];
}
[databaseMirror insertObjects:tracksCopy atIndexes:indexes];
__block int64_t total_count = 0; __block int64_t total_count = 0;
[indexes enumerateRangesUsingBlock:^(NSRange range, BOOL * _Nonnull stop) { [indexes enumerateRangesUsingBlock:^(NSRange range, BOOL * _Nonnull stop) {
@ -1554,7 +1560,7 @@ static SQLiteStore *g_sharedStore = NULL;
double progresschunk = (double)range.length / (double)total_count; double progresschunk = (double)range.length / (double)total_count;
double progressbase = progress; double progressbase = progress;
NSRange trackRange = NSMakeRange(i, range.length); NSRange trackRange = NSMakeRange(i, range.length);
NSArray *trackSet = (i == 0 && range.length == [tracks count]) ? tracks : [tracks subarrayWithRange:trackRange]; NSArray *trackSet = (i == 0 && range.length == [tracksCopy count]) ? tracksCopy : [tracksCopy subarrayWithRange:trackRange];
[self playlistInsertTracks:trackSet atIndex:range.location progressCall:^(double _progress){ [self playlistInsertTracks:trackSet atIndex:range.location progressCall:^(double _progress){
if (_progress < 0) return; if (_progress < 0) return;
callback(progressbase + progresschunk * _progress); callback(progressbase + progresschunk * _progress);
@ -1684,7 +1690,7 @@ static SQLiteStore *g_sharedStore = NULL;
- (PlaylistEntry *)playlistGetCachedItem:(int64_t)index - (PlaylistEntry *)playlistGetCachedItem:(int64_t)index
{ {
if (index >= 0 && index < [databaseMirror count]) if (index >= 0 && index < [databaseMirror count])
return [databaseMirror objectAtIndex:index]; return [[databaseMirror objectAtIndex:index] copy];
else else
return nil; return nil;
} }
@ -1888,7 +1894,7 @@ static SQLiteStore *g_sharedStore = NULL;
return; return;
} }
[databaseMirror replaceObjectAtIndex:i withObject:newpe]; [databaseMirror replaceObjectAtIndex:i withObject:[newpe copy]];
callback(progress); callback(progress);
} }