Basic database access is working

Limelight/Database/DataManager.h

@@ -7,23 +7,22 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "Settings.h"
 #import "AppDelegate.h"
-#import "Host.h"
-#import "App.h"
+#import "TemporaryHost.h"
 #import "TemporaryApp.h"
+#import "TemporarySettings.h"
 
 @interface DataManager : NSObject
 
-@property (strong, nonatomic) AppDelegate* appDelegate;
-
 - (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls;
-- (Settings*) retrieveSettings;
-- (NSArray*) retrieveHosts;
-- (void) saveData;
-- (Host*) createHost;
-- (void) removeHost:(Host*)host;
-- (App*) addAppFromTemporaryApp:(TemporaryApp*)tempApp;
-- (void) removeAppFromHost:(App*)app;
+
+- (NSArray*) getHosts;
+- (void) updateHost:(TemporaryHost*)host;
+- (void) removeHost:(TemporaryHost*)host;
+
+- (TemporarySettings*) getSettings;
+
+- (void) updateUniqueId:(NSString*)uniqueId;
+- (NSString*) getUniqueId;
 
 @end

Limelight/Database/DataManager.m

@@ -8,45 +8,87 @@
 
 #import "DataManager.h"
 #import "TemporaryApp.h"
+#import "TemporarySettings.h"
+#import "Settings.h"
 
-@implementation DataManager
-
-+ (NSObject *)databaseLock {
-    static NSObject *lock = nil;
-    if (lock == nil) {
-        lock = [[NSObject alloc] init];
-    }
-    return lock;
+@implementation DataManager {
+    NSManagedObjectContext *_managedObjectContext;
+    AppDelegate *_appDelegate;
 }
 
 - (id) init {
     self = [super init];
-    self.appDelegate = [[UIApplication sharedApplication] delegate];
+    
+    _appDelegate = [[UIApplication sharedApplication] delegate];
+    _managedObjectContext = [[NSManagedObjectContext alloc] initWithConcurrencyType:NSPrivateQueueConcurrencyType];
+    [_managedObjectContext setPersistentStoreCoordinator:_appDelegate.persistentStoreCoordinator];
+    
     return self;
 }
 
-- (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls {
-    Settings* settingsToSave = [self retrieveSettings];
-    settingsToSave.framerate = [NSNumber numberWithInteger:framerate];
-    // Bitrate is persisted in kbps
-    settingsToSave.bitrate = [NSNumber numberWithInteger:bitrate];
-    settingsToSave.height = [NSNumber numberWithInteger:height];
-    settingsToSave.width = [NSNumber numberWithInteger:width];
-    settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls];
+- (void) updateUniqueId:(NSString*)uniqueId {
+    [_managedObjectContext performBlockAndWait:^{
+        [self retrieveSettings].uniqueId = uniqueId;
+        [self saveData];
+    }];
+}
 
-    NSError* error;
-    if (![[self.appDelegate managedObjectContext] save:&error]) {
-        Log(LOG_E, @"Unable to save settings to database: %@", error);
-    }
-    [self.appDelegate saveContext];
+- (NSString*) getUniqueId {
+    __block NSString *uid;
+    
+    [_managedObjectContext performBlockAndWait:^{
+        uid = [self retrieveSettings].uniqueId;
+    }];
+
+    return uid;
+}
+
+- (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls {
+    
+    [_managedObjectContext performBlockAndWait:^{
+        Settings* settingsToSave = [self retrieveSettings];
+        settingsToSave.framerate = [NSNumber numberWithInteger:framerate];
+        // Bitrate is persisted in kbps
+        settingsToSave.bitrate = [NSNumber numberWithInteger:bitrate];
+        settingsToSave.height = [NSNumber numberWithInteger:height];
+        settingsToSave.width = [NSNumber numberWithInteger:width];
+        settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls];
+        
+        [self saveData];
+    }];
+}
+
+- (void) updateHost:(TemporaryHost *)host {
+    [_managedObjectContext performBlockAndWait:^{
+        // Add a new persistent managed object if one doesn't exist
+        if (host.parent == nil) {
+            NSEntityDescription* entity = [NSEntityDescription entityForName:@"Host" inManagedObjectContext:_managedObjectContext];
+            host.parent = [[Host alloc] initWithEntity:entity insertIntoManagedObjectContext:_managedObjectContext];
+        }
+        
+        // Push changes from the temp host to the persistent one
+        [host propagateChangesToParent];
+        
+        [self saveData];
+    }];
+}
+
+- (TemporarySettings*) getSettings {
+    __block TemporarySettings *tempSettings;
+    
+    [_managedObjectContext performBlockAndWait:^{
+        tempSettings = [[TemporarySettings alloc] initFromSettings:[self retrieveSettings]];
+    }];
+    
+    return tempSettings;
 }
 
 - (Settings*) retrieveSettings {
     NSArray* fetchedRecords = [self fetchRecords:@"Settings"];
     if (fetchedRecords.count == 0) {
         // create a new settings object with the default values
-        NSEntityDescription* entity = [NSEntityDescription entityForName:@"Settings" inManagedObjectContext:[self.appDelegate managedObjectContext]];
-        Settings* settings = [[Settings alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
+        NSEntityDescription* entity = [NSEntityDescription entityForName:@"Settings" inManagedObjectContext:_managedObjectContext];
+        Settings* settings = [[Settings alloc] initWithEntity:entity insertIntoManagedObjectContext:_managedObjectContext];
         
         return settings;
     } else {
@@ -55,74 +97,51 @@
     }
 }
 
-- (Host*) createHost {
-    NSEntityDescription* entity = [NSEntityDescription entityForName:@"Host" inManagedObjectContext:[self.appDelegate managedObjectContext]];
-    return [[Host alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
-}
-
-- (void) removeHost:(Host*)host {
-    [[self.appDelegate managedObjectContext] deleteObject:host];
-    [self saveData];
+- (void) removeHost:(TemporaryHost*)host {
+    if (host.parent == nil) {
+        // Not inserted into the DB
+        return;
+    }
+    
+    [_managedObjectContext performBlockAndWait:^{
+        [_managedObjectContext deleteObject:host.parent];
+        [self saveData];
+    }];
 }
 
 - (void) saveData {
-    @synchronized([DataManager databaseLock]) {
-        NSError* error;
-        if (![[self.appDelegate managedObjectContext] save:&error]) {
-            Log(LOG_E, @"Unable to save hosts to database: %@", error);
+    NSError* error;
+    if (![_managedObjectContext save:&error]) {
+        Log(LOG_E, @"Unable to save hosts to database: %@", error);
+    }
+
+    [_appDelegate saveContext];
+}
+
+- (NSArray*) getHosts {
+    __block NSMutableArray *tempHosts = [[NSMutableArray alloc] init];
+    
+    [_managedObjectContext performBlockAndWait:^{
+        NSArray *hosts = [self fetchRecords:@"Host"];
+        
+        for (Host* host in hosts) {
+            [tempHosts addObject:[[TemporaryHost alloc] initFromHost:host]];
         }
-        [self.appDelegate saveContext];
-    }
-}
-
-- (NSArray*) retrieveHosts {
-    return [self fetchRecords:@"Host"];
-}
-
-- (App*) addAppFromTemporaryApp:(TemporaryApp*)tempApp {
+    }];
     
-    App* managedApp;
-    
-    @synchronized([DataManager databaseLock]) {
-        NSEntityDescription* entity = [NSEntityDescription entityForName:@"App" inManagedObjectContext:[self.appDelegate managedObjectContext]];
-        managedApp = [[App alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
-        
-        assert(tempApp.host != nil);
-        
-        managedApp.id = tempApp.id;
-        managedApp.image = tempApp.image;
-        managedApp.name = tempApp.name;
-        managedApp.isRunning = tempApp.isRunning;
-        managedApp.host = tempApp.host;
-        
-        [managedApp.host addAppListObject:managedApp];
-    }
-    
-    return managedApp;
-}
-
-- (void) removeAppFromHost:(App*)app {
-    @synchronized([DataManager databaseLock]) {
-        assert(app.host != nil);
-        
-        [app.host removeAppListObject:app];
-        [[self.appDelegate managedObjectContext] deleteObject:app];
-    }
+    return tempHosts;
 }
 
 - (NSArray*) fetchRecords:(NSString*)entityName {
     NSArray* fetchedRecords;
     
-    @synchronized([DataManager databaseLock]) {
-        NSFetchRequest* fetchRequest = [[NSFetchRequest alloc] init];
-        NSEntityDescription* entity = [NSEntityDescription entityForName:entityName inManagedObjectContext:[self.appDelegate managedObjectContext]];
-        [fetchRequest setEntity:entity];
-        [fetchRequest setAffectedStores:[NSArray arrayWithObjects:[[self.appDelegate persistentStoreCoordinator] persistentStoreForURL:[self.appDelegate getStoreURL]], nil]];
-        
-        NSError* error;
-        fetchedRecords = [[self.appDelegate managedObjectContext] executeFetchRequest:fetchRequest error:&error];
-        //TODO: handle errors
-    }
+    NSFetchRequest* fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription* entity = [NSEntityDescription entityForName:entityName inManagedObjectContext:_managedObjectContext];
+    [fetchRequest setEntity:entity];
+    
+    NSError* error;
+    fetchedRecords = [_managedObjectContext executeFetchRequest:fetchRequest error:&error];
+    //TODO: handle errors
     
     return fetchedRecords;
 }

Limelight/Database/TemporaryApp.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "TemporaryHost.h"
+#import "App.h"
 
 @interface TemporaryApp : NSObject
 
@@ -17,10 +18,16 @@
 @property (nonatomic) BOOL isRunning;
 @property (nullable, nonatomic, retain) TemporaryHost *host;
 
+@property (nullable, nonatomic) App* parent;
+
 NS_ASSUME_NONNULL_BEGIN
 
+- (id) initFromApp:(App*)app withTempHost:(TemporaryHost*)tempHost;
+
 - (NSComparisonResult)compareName:(TemporaryApp *)other;
 
+- (void) propagateChangesToParent;
+
 NS_ASSUME_NONNULL_END
 
 @end

Limelight/Database/TemporaryApp.m

@@ -7,9 +7,30 @@
 //
 
 #import "TemporaryApp.h"
+#import "App.h"
 
 @implementation TemporaryApp
 
+- (id) initFromApp:(App*)app withTempHost:(TemporaryHost*)tempHost {
+    self = [self init];
+    
+    self.parent = app;
+    
+    self.id = app.id;
+    self.image = app.image;
+    self.name = app.name;
+    self.host = tempHost;
+    
+    return self;
+}
+
+- (void) propagateChangesToParent {
+    self.parent.id = self.id;
+    self.parent.image = self.image;
+    self.parent.name = self.name;
+    self.parent.host = self.host.parent;
+}
+
 - (NSComparisonResult)compareName:(TemporaryApp *)other {
     return [self.name caseInsensitiveCompare:other.name];
 }

Limelight/Database/TemporaryHost.h

@@ -8,6 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "Utils.h"
+#import "Host.h"
 
 @interface TemporaryHost : NSObject
 
@@ -15,18 +16,24 @@
 @property (nonatomic) PairState pairState;
 @property (nonatomic, nullable) NSString * activeAddress;
 
-@property (nullable, nonatomic, retain) NSString *address;
-@property (nullable, nonatomic, retain) NSString *externalAddress;
-@property (nullable, nonatomic, retain) NSString *localAddress;
-@property (nullable, nonatomic, retain) NSString *mac;
-@property (nullable, nonatomic, retain) NSString *name;
-@property (nullable, nonatomic, retain) NSString *uuid;
-@property (nullable, nonatomic, retain) NSSet *appList;
+@property (nullable, nonatomic) Host* parent;
 
 NS_ASSUME_NONNULL_BEGIN
 
+@property (nonatomic, retain) NSString *address;
+@property (nonatomic, retain) NSString *externalAddress;
+@property (nonatomic, retain) NSString *localAddress;
+@property (nonatomic, retain) NSString *mac;
+@property (nonatomic, retain) NSString *name;
+@property (nonatomic, retain) NSString *uuid;
+@property (nonatomic, retain) NSSet *appList;
+
+- (id) initFromHost:(Host*)host;
+
 - (NSComparisonResult)compareName:(TemporaryHost *)other;
 
+- (void) propagateChangesToParent;
+
 NS_ASSUME_NONNULL_END
 
 @end

Limelight/Database/TemporaryHost.m

@@ -7,9 +7,60 @@
 //
 
 #import "TemporaryHost.h"
+#import "Host.h"
+#import "TemporaryApp.h"
+#import "App.h"
 
 @implementation TemporaryHost
 
+- (id) initFromHost:(Host*)host {
+    self = [self init];
+    
+    self.parent = host;
+    
+    self.address = host.address;
+    self.externalAddress = host.externalAddress;
+    self.localAddress = host.localAddress;
+    self.mac = host.mac;
+    self.name = host.name;
+    self.uuid = host.uuid;
+    
+    NSMutableSet *appList = [[NSMutableSet alloc] init];
+
+    for (App* app in host.appList) {
+        TemporaryApp *tempApp = [[TemporaryApp alloc] initFromApp:app withTempHost:self];
+        [appList addObject:tempApp];
+    }
+    
+    self.appList = appList;
+    
+    return self;
+}
+
+- (void) propagateChangesToParent {
+    self.parent.address = self.address;
+    self.parent.externalAddress = self.externalAddress;
+    self.parent.localAddress = self.localAddress;
+    self.parent.mac = self.mac;
+    self.parent.name = self.name;
+    self.parent.uuid = self.uuid;
+    
+    NSMutableSet *applist = [[NSMutableSet alloc] init];
+    for (TemporaryApp* app in self.appList) {
+        // Add a new persistent managed object if one doesn't exist
+        if (app.parent == nil) {
+            NSEntityDescription* entity = [NSEntityDescription entityForName:@"App" inManagedObjectContext:self.parent.managedObjectContext];
+            app.parent = [[App alloc] initWithEntity:entity insertIntoManagedObjectContext:self.parent.managedObjectContext];
+        }
+        
+        [app propagateChangesToParent];
+        
+        [applist addObject:app.parent];
+    }
+    
+    self.parent.appList = applist;
+}
+
 - (NSComparisonResult)compareName:(TemporaryHost *)other {
     return [self.name caseInsensitiveCompare:other.name];
 }

Limelight/Database/TemporarySettings.h

@@ -0,0 +1,25 @@
+//
+//  TemporarySettings.h
+//  Moonlight
+//
+//  Created by Cameron Gutman on 12/1/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Settings.h"
+
+@interface TemporarySettings : NSObject
+
+@property (nonatomic, retain) Settings * parent;
+
+@property (nonatomic, retain) NSNumber * bitrate;
+@property (nonatomic, retain) NSNumber * framerate;
+@property (nonatomic, retain) NSNumber * height;
+@property (nonatomic, retain) NSNumber * width;
+@property (nonatomic, retain) NSNumber * onscreenControls;
+@property (nonatomic, retain) NSString * uniqueId;
+
+- (id) initFromSettings:(Settings*)settings;
+
+@end

Limelight/Database/TemporarySettings.m

@@ -0,0 +1,28 @@
+//
+//  TemporarySettings.m
+//  Moonlight
+//
+//  Created by Cameron Gutman on 12/1/15.
+//  Copyright © 2015 Moonlight Stream. All rights reserved.
+//
+
+#import "TemporarySettings.h"
+
+@implementation TemporarySettings
+
+- (id) initFromSettings:(Settings*)settings {
+    self = [self init];
+    
+    self.parent = settings;
+    
+    self.bitrate = settings.bitrate;
+    self.framerate = settings.framerate;
+    self.height = settings.height;
+    self.width = settings.width;
+    self.onscreenControls = settings.onscreenControls;
+    self.uniqueId = settings.uniqueId;
+    
+    return self;
+}
+
+@end