X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=ConfigsController.m;h=969398515b4a5d235e41d48da9dca73dd2035c14;hp=4227d436a616bcbe43eb0229eba1b6a22486ecd6;hb=51336622a1df8de5dd8aaec0972b9b04292fd88d;hpb=320e3065d251e11370e571df5705675937b76521 diff --git a/ConfigsController.m b/ConfigsController.m index 4227d43..9693985 100644 --- a/ConfigsController.m +++ b/ConfigsController.m @@ -14,25 +14,22 @@ #import "TargetController.h" @implementation ConfigsController { - NSMutableArray *configs; + NSMutableArray *_configs; Config *manualConfig; } -@synthesize currentConfig; -@synthesize configs; - - (id)init { if ((self = [super init])) { - configs = [[NSMutableArray alloc] init]; - currentConfig = [[Config alloc] initWithName:@"(default)"]; - manualConfig = currentConfig; - [configs addObject:currentConfig]; + _configs = [[NSMutableArray alloc] init]; + _currentConfig = [[Config alloc] initWithName:@"(default)"]; + manualConfig = _currentConfig; + [_configs addObject:_currentConfig]; } return self; } - (Config *)objectForKeyedSubscript:(NSString *)name { - for (Config *config in configs) + for (Config *config in _configs) if ([name isEqualToString:config.name]) return config; return nil; @@ -47,37 +44,36 @@ - (void)activateConfig:(Config *)config { if (!config) config = manualConfig; - if (currentConfig == config) + if (_currentConfig == config) return; manualConfig = config; - currentConfig = config; - [targetController reset]; - [removeButton setEnabled:configs[0] != config]; - [targetController load]; + _currentConfig = config; + [removeButton setEnabled:_configs[0] != config]; + [targetController loadCurrent]; [(ApplicationController *)[[NSApplication sharedApplication] delegate] configChanged]; - [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[configs indexOfObject:config]] byExtendingSelection:NO]; + [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[_configs indexOfObject:config]] byExtendingSelection:NO]; } - (IBAction)addPressed:(id)sender { Config *newConfig = [[Config alloc] initWithName:@"Untitled"]; - [configs addObject:newConfig]; + [_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 selectRowIndexes:[NSIndexSet indexSetWithIndex:_configs.count - 1] byExtendingSelection:NO]; + [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 == _currentConfig) + _currentConfig = _configs[0]; if (toRemove == manualConfig) - manualConfig = configs[0]; + manualConfig = _configs[0]; [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; [tableView reloadData]; @@ -85,25 +81,24 @@ -(void)tableViewSelectionDidChange:(NSNotification *)notify { if (tableView.selectedRow >= 0) - [self activateConfig:configs[tableView.selectedRow]]; + [self activateConfig:_configs[tableView.selectedRow]]; } -- (id)tableView:(NSTableView *)view objectValueForTableColumn:(NSTableColumn *)column row:(int)index { - return [configs[index] name]; +- (id)tableView:(NSTableView *)view objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)index { + 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]; +- (void)tableView:(NSTableView *)view setObjectValue:(NSString *)obj forTableColumn:(NSTableColumn *)col row:(NSInteger)index { + [(Config *)_configs[index] setName:obj]; [tableView reloadData]; [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; } -- (int)numberOfRowsInTableView:(NSTableView*)table { - return [configs count]; +- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView { + return _configs.count; } -- (BOOL)tableView:(NSTableView *)view shouldEditTableColumn:(NSTableColumn *)column row:(int)index { +- (BOOL)tableView:(NSTableView *)view shouldEditTableColumn:(NSTableColumn *)column row:(NSInteger)index { return index > 0; } @@ -117,22 +112,15 @@ } - (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) }; + NSMutableArray *ary = [[NSMutableArray alloc] initWithCapacity:_configs.count]; + for (Config *config in _configs) + [ary addObject:[config serialize]]; + NSUInteger current = _currentConfig ? [_configs indexOfObject:_currentConfig] : 0; + return @{ @"configurations": ary, @"selected": @(current) }; } - (void)loadAllFrom:(NSDictionary*) envelope{ - NSArray *storedConfigs = envelope[@"configurationList"]; + NSArray *storedConfigs = envelope[@"configurations"]; NSMutableArray* newConfigs = [[NSMutableArray alloc] initWithCapacity:storedConfigs.count]; // have to do two passes in case config1 refers to config2 via a TargetConfig @@ -141,7 +129,7 @@ [newConfigs addObject:cfg]; } - for (int i = 0; i < storedConfigs.count; ++i) { + for (unsigned i = 0; i < storedConfigs.count; ++i) { NSDictionary *entries = storedConfigs[i][@"entries"]; Config *config = newConfigs[i]; for (id key in entries) @@ -150,13 +138,104 @@ } if (newConfigs.count) { - int current = [envelope[@"selectedConfiguration"] unsignedIntValue]; + unsigned current = [envelope[@"selected"] unsignedIntValue]; if (current >= newConfigs.count) current = 0; - configs = newConfigs; + _configs = newConfigs; [tableView reloadData]; [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; - [self activateConfig:configs[current]]; + [self activateConfig:_configs[current]]; + } +} + +- (void)importPressed:(id)sender { + NSOpenPanel *panel = [NSOpenPanel openPanel]; + panel.allowedFileTypes = @[ @"enjoyable", @"json", @"txt" ]; + if ([panel runModal] == NSFileHandlingPanelOKButton) { + NSError *error; + NSInputStream *stream = [NSInputStream inputStreamWithURL:panel.URL]; + [stream open]; + NSDictionary *serialization = !error + ? [NSJSONSerialization JSONObjectWithStream:stream options:0 error:&error] + : nil; + [stream close]; + + if (!([serialization isKindOfClass:[NSDictionary class]] + && serialization[@"entries"])) { + error = [NSError errorWithDomain:@"Enjoyable" + code:0 + description:@"This isn't a valid mapping file."]; + } + + + if (!error) { + NSDictionary *entries = serialization[@"entries"]; + Config *cfg = [[Config alloc] initWithName:serialization[@"name"]]; + Config *mergeInto = self[cfg.name]; + BOOL conflict = NO; + for (id key in entries) { + cfg.entries[key] = [Target targetDeserialize:entries[key] + withConfigs:_configs]; + if (mergeInto.entries[key]) + conflict = YES; + } + + if (conflict) { + NSAlert *conflictAlert = [[NSAlert alloc] init]; + conflictAlert.messageText = @"Replace existing mappings?"; + conflictAlert.informativeText = + [NSString stringWithFormat: + @"This file contains inputs you've already mapped in \"%@\". Do you " + @"want to merge them and replace your existing mappings, or import this " + @"as a separate mapping?", cfg.name]; + [conflictAlert addButtonWithTitle:@"Merge"]; + [conflictAlert addButtonWithTitle:@"Cancel"]; + [conflictAlert addButtonWithTitle:@"New Mapping"]; + NSInteger res = [conflictAlert runModal]; + if (res == NSAlertSecondButtonReturn) + return; + else if (res == NSAlertThirdButtonReturn) + mergeInto = nil; + } + + if (mergeInto) { + [mergeInto.entries addEntriesFromDictionary:cfg.entries]; + cfg = mergeInto; + } else { + [_configs addObject:cfg]; + [tableView reloadData]; + } + + [self save]; + [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; + [self activateConfig:cfg]; + [targetController loadCurrent]; + + if (conflict && !mergeInto) { + [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:_configs.count - 1] byExtendingSelection:NO]; + [tableView editColumn:0 row:_configs.count - 1 withEvent:nil select:YES]; + } + } + + if (error) + [[NSAlert alertWithError:error] runModal]; + } +} + +- (void)exportPressed:(id)sender { + NSSavePanel *panel = [NSSavePanel savePanel]; + panel.allowedFileTypes = @[ @"enjoyable" ]; + if ([panel runModal] == NSFileHandlingPanelOKButton) { + NSError *error; + NSDictionary *serialization = [_currentConfig serialize]; + NSData *json = [NSJSONSerialization dataWithJSONObject:serialization + options:NSJSONWritingPrettyPrinted + error:&error]; + if (!error) + [json writeToURL:panel.URL options:NSDataWritingAtomic error:&error]; + + if (error) + [[NSAlert alertWithError:error] runModal]; } }