moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2026-04-07 08:26:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce usage of DataManager

Browse Source
This commit is contained in:
Cameron Gutman
2015-12-01 20:56:08 -08:00
parent bfa4856bbe
commit fe616d86c5
5 changed files with 12 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
Limelight/ViewControllers/MainFrameViewController.m
View File

@@ -140,7 +140,7 @@ static NSMutableSet* hostList;
});
} else {
dispatch_async(dispatch_get_main_queue(), ^{
[self mergeAppLists:[appListResp getAppList] forHost:host];
[self updateApplist:[appListResp getAppList] forHost:host];
if (host != _selectedHost) {
return;
@@ -158,47 +158,13 @@ static NSMutableSet* hostList;
});
}
- (void) mergeAppLists:(NSArray*) newList forHost:(TemporaryHost*)host {
- (void) updateApplist:(NSSet*) newList forHost:(TemporaryHost*)host {
DataManager* database = [[DataManager alloc] init];
for (TemporaryApp* app in newList) {
BOOL appAlreadyInList = NO;
for (TemporaryApp* savedApp in host.appList) {
if ([app.id isEqualToString:savedApp.id]) {
savedApp.name = app.name;
savedApp.isRunning = app.isRunning;
appAlreadyInList = YES;
break;
}
}
if (!appAlreadyInList) {
app.host = host;
[database addAppFromTemporaryApp:app];
}
}
BOOL appWasRemoved;
do {
appWasRemoved = NO;
for (TemporaryApp* app in host.appList) {
appWasRemoved = YES;
for (TemporaryApp* mergedApp in newList) {
if ([mergedApp.id isEqualToString:app.id]) {
appWasRemoved = NO;
break;
}
}
if (appWasRemoved) {
// Removing the app mutates the list we're iterating (which isn't legal).
// We need to jump out of this loop and restart enumeration.
[database removeAppFromHost:app];
break;
}
}
// Keep looping until the list is no longer being mutated
} while (appWasRemoved);
host.appList = newList;
[database updateHost:host];
[database saveData];
}
@@ -346,8 +312,6 @@ static NSMutableSet* hostList;
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
[_discMan discoverHost:hostAddress withCallback:^(TemporaryHost* host, NSString* error){
if (host != nil) {
DataManager* dataMan = [[DataManager alloc] init];
[dataMan saveData];
dispatch_async(dispatch_get_main_queue(), ^{
@synchronized(hostList) {
[hostList addObject:host];