From 4ce3f2876a51400f7e3baa213bd23ecd0101398a Mon Sep 17 00:00:00 2001 From: Joe Wreschnig Date: Thu, 28 Feb 2013 18:29:55 +0100 Subject: [PATCH] Clean up save/restore. Write preferences immediately but continue relying on automatic/exit flush for disk persistence. Remember active configuration on exit. --- ApplicationController.m | 4 +- ConfigsController.m | 153 ++++++++++++++++++++-------------------- TargetController.m | 1 + 3 files changed, 79 insertions(+), 79 deletions(-) diff --git a/ApplicationController.m b/ApplicationController.m index 8fed5d6..2b122b6 100644 --- a/ApplicationController.m +++ b/ApplicationController.m @@ -39,9 +39,7 @@ } - (void)applicationWillTerminate:(NSNotification *)aNotification { - // TODO: Save immediately / shortly after changing and then enable - // sudden termination support. - [configsController save]; + [[NSUserDefaults standardUserDefaults] synchronize]; [[NSWorkspace sharedWorkspace].notificationCenter removeObserver:self name:NSWorkspaceDidActivateApplicationNotification diff --git a/ConfigsController.m b/ConfigsController.m index 67033d3..dbb2c6f 100644 --- a/ConfigsController.m +++ b/ConfigsController.m @@ -15,21 +15,21 @@ @implementation ConfigsController { NSMutableArray *configs; - Config *manualConfig; + Config *manualConfig; } @synthesize currentConfig; @synthesize configs; - (id)init { - if ((self = [super init])) { - configs = [[NSMutableArray alloc] init]; + if ((self = [super init])) { + configs = [[NSMutableArray alloc] init]; currentConfig = [[Config alloc] init]; currentConfig.name = @"(default)"; manualConfig = currentConfig; - [configs addObject:currentConfig]; - } - return self; + [configs addObject:currentConfig]; + } + return self; } - (Config *)objectForKeyedSubscript:(NSString *)name { @@ -48,117 +48,118 @@ - (void)activateConfig:(Config *)config { if (!config) config = manualConfig; - if (currentConfig == config) - return; + if (currentConfig == config) + return; manualConfig = config; - currentConfig = config; + currentConfig = config; [targetController reset]; - [removeButton setEnabled:configs[0] != config]; - [targetController load]; - [(ApplicationController *)[[NSApplication sharedApplication] delegate] configChanged]; + [removeButton setEnabled:configs[0] != config]; + [targetController load]; + [(ApplicationController *)[[NSApplication sharedApplication] delegate] configChanged]; [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[configs indexOfObject:config]] byExtendingSelection:NO]; } - (IBAction)addPressed:(id)sender { - Config *newConfig = [[Config alloc] init]; + Config *newConfig = [[Config alloc] init]; newConfig.name = @"untitled"; - [configs addObject:newConfig]; - [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; - [tableView reloadData]; + [configs addObject:newConfig]; + [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; + [tableView reloadData]; [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:configs.count - 1] byExtendingSelection:NO]; - [tableView editColumn:0 row:[configs count] - 1 withEvent:nil select:YES]; + [tableView editColumn:0 row:[configs count] - 1 withEvent:nil select:YES]; } - (IBAction)removePressed:(id)sender { if (tableView.selectedRow == 0) return; - - Config *toRemove = configs[tableView.selectedRow]; - [configs removeObjectAtIndex:tableView.selectedRow]; + + Config *toRemove = configs[tableView.selectedRow]; + [configs removeObjectAtIndex:tableView.selectedRow]; if (toRemove == currentConfig) currentConfig = configs[0]; if (toRemove == manualConfig) manualConfig = configs[0]; - - [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; - [tableView reloadData]; + + [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; + [tableView reloadData]; } -(void)tableViewSelectionDidChange:(NSNotification *)notify { if (tableView.selectedRow >= 0) [self activateConfig:configs[tableView.selectedRow]]; } - + - (id)tableView:(NSTableView *)view objectValueForTableColumn:(NSTableColumn *)column row:(int)index { - return [configs[index] name]; + return [configs[index] name]; } - (void)tableView:(NSTableView *)view setObjectValue:(NSString *)obj forTableColumn:(NSTableColumn *)col row:(int)index { - [(Config *)configs[index] setName:obj]; - [targetController refreshConfigsPreservingSelection:YES]; - [tableView reloadData]; - [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; + [(Config *)configs[index] setName:obj]; + [targetController refreshConfigsPreservingSelection:YES]; + [tableView reloadData]; + [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; } - (int)numberOfRowsInTableView:(NSTableView*)table { - return [configs count]; + return [configs count]; } - (BOOL)tableView:(NSTableView *)view shouldEditTableColumn:(NSTableColumn *)column row:(int)index { - return index > 0; + return index > 0; } --(void) save { +- (void)save { + NSLog(@"Saving defaults."); [[NSUserDefaults standardUserDefaults] setObject:[self dumpAll] forKey:@"configurations"]; - [[NSUserDefaults standardUserDefaults] synchronize]; -} --(void) load { - [self loadAllFrom: [[NSUserDefaults standardUserDefaults] objectForKey:@"configurations"]]; -} - --(NSDictionary*) dumpAll { - NSMutableDictionary *envelope = [[NSMutableDictionary alloc] init]; - NSMutableArray* ary = [[NSMutableArray alloc] init]; - for(Config* config in configs) { - NSMutableDictionary* cfgInfo = [[NSMutableDictionary alloc] init]; - cfgInfo[@"name"] = [config name]; - NSMutableDictionary* cfgEntries = [[NSMutableDictionary alloc] init]; - for(id key in [config entries]) { - cfgEntries[key] = [[config entries][key] serialize]; - } - cfgInfo[@"entries"] = cfgEntries; - [ary addObject: cfgInfo]; - } - envelope[@"configurationList"] = ary; - return envelope; -} - --(void) loadAllFrom: (NSDictionary*) envelope{ - if(envelope == NULL) - return; - NSArray* ary = envelope[@"configurationList"]; - - NSMutableArray* newConfigs = [[NSMutableArray alloc] init]; - // have to do two passes in case config1 refers to config2 via a TargetConfig - for(int i=0; i<[ary count]; i++) { - Config* cfg = [[Config alloc] init]; - [cfg setName: ary[i][@"name"]]; - [newConfigs addObject: cfg]; - } - for(int i=0; i<[ary count]; i++) { - NSDictionary* dict = ary[i][@"entries"]; - for(id key in dict) { - [newConfigs[i] entries][key] = [Target targetDeserialize:dict[key] withConfigs:newConfigs]; - } - } - +} + +- (void)load { + [self loadAllFrom:[[NSUserDefaults standardUserDefaults] objectForKey:@"configurations"]]; +} + +- (NSDictionary *)dumpAll { + NSMutableArray *ary = [[NSMutableArray alloc] initWithCapacity:configs.count]; + for (Config *config in configs) { + NSMutableDictionary* cfgEntries = [[NSMutableDictionary alloc] initWithCapacity:config.entries.count]; + for (id key in config.entries) + cfgEntries[key] = [config.entries[key] serialize]; + [ary addObject:@{ @"name": config.name, + @"entries": cfgEntries, + }]; + } + NSUInteger current = currentConfig ? [configs indexOfObject:currentConfig] : 0; + return @{ @"configurationList": ary, + @"selectedConfiguration": @(current) }; +} + +- (void)loadAllFrom:(NSDictionary*) envelope{ + NSArray *storedConfigs = envelope[@"configurationList"]; + NSMutableArray* newConfigs = [[NSMutableArray alloc] initWithCapacity:storedConfigs.count]; + + // have to do two passes in case config1 refers to config2 via a TargetConfig + for (NSDictionary *storedConfig in storedConfigs) { + Config *cfg = [[Config alloc] init]; + cfg.name = storedConfig[@"name"]; + [newConfigs addObject:cfg]; + } + + for (int i = 0; i < storedConfigs.count; ++i) { + NSDictionary *entries = storedConfigs[i][@"entries"]; + Config *config = newConfigs[i]; + for (id key in entries) + config.entries[key] = [Target targetDeserialize:entries[key] + withConfigs:newConfigs]; + } + if (newConfigs.count) { + int current = [envelope[@"selectedConfiguration"] unsignedIntValue]; + if (current >= newConfigs.count) + current = 0; configs = newConfigs; [tableView reloadData]; - currentConfig = configs[0]; - manualConfig = configs[0]; [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; + [self activateConfig:configs[current]]; } } diff --git a/TargetController.m b/TargetController.m index b5c57b4..749feb2 100644 --- a/TargetController.m +++ b/TargetController.m @@ -131,6 +131,7 @@ - (void)commit { configsController.currentConfig[joystickController.selectedAction] = [self makeTarget]; + [configsController save]; } - (void)reset { -- 2.30.2