X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=ConfigsController.m;h=d38ada85fed674d0dc2fe8e2c93bc3959f8a11c1;hp=b4db790889fb9118a80b8aeec634631e463f3286;hb=aaab00fd866af505e9a5e454f1aeb3e298fd38e3;hpb=60710a84810cfbfa39ada9a9e44f61ceb2f144c5 diff --git a/ConfigsController.m b/ConfigsController.m index b4db790..d38ada8 100644 --- a/ConfigsController.m +++ b/ConfigsController.m @@ -50,33 +50,28 @@ _currentConfig = config; [removeButton setEnabled:_configs[0] != config]; [targetController loadCurrent]; - [(ApplicationController *)[[NSApplication sharedApplication] delegate] configChanged]; + [(ApplicationController *)NSApplication.sharedApplication.delegate configChanged]; [tableView selectRowIndexes:[NSIndexSet indexSetWithIndex:[_configs indexOfObject:config]] byExtendingSelection:NO]; } - (IBAction)addPressed:(id)sender { Config *newConfig = [[Config alloc] initWithName:@"Untitled"]; [_configs addObject:newConfig]; - [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; + [(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]; - - if (toRemove == _currentConfig) - _currentConfig = _configs[0]; - if (toRemove == manualConfig) - manualConfig = _configs[0]; - - [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; [tableView reloadData]; + [(ApplicationController *)NSApplication.sharedApplication.delegate configsChanged]; + [self activateConfig:_configs[0]]; + [self save]; } -(void)tableViewSelectionDidChange:(NSNotification *)notify { @@ -84,50 +79,43 @@ [self activateConfig:_configs[tableView.selectedRow]]; } -- (id)tableView:(NSTableView *)view objectValueForTableColumn:(NSTableColumn *)column row:(int)index { +- (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 { +- (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]; + [(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; } - (void)save { NSLog(@"Saving defaults."); - [[NSUserDefaults standardUserDefaults] setObject:[self dumpAll] forKey:@"configurations"]; + [NSUserDefaults.standardUserDefaults setObject:[self dumpAll] forKey:@"configurations"]; } - (void)load { - [self loadAllFrom:[[NSUserDefaults standardUserDefaults] objectForKey:@"configurations"]]; + [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, - }]; - } + for (Config *config in _configs) + [ary addObject:[config serialize]]; NSUInteger current = _currentConfig ? [_configs indexOfObject:_currentConfig] : 0; - return @{ @"configurationList": ary, - @"selectedConfiguration": @(current) }; + 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 @@ -136,23 +124,157 @@ [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) - config.entries[key] = [Target targetDeserialize:entries[key] - withConfigs:newConfigs]; + for (id key in entries) { + Target *target = [Target targetDeserialize:entries[key] + withConfigs:newConfigs]; + if (target) + config.entries[key] = target; + } } if (newConfigs.count) { - int current = [envelope[@"selectedConfiguration"] unsignedIntValue]; + unsigned current = [envelope[@"selected"] unsignedIntValue]; if (current >= newConfigs.count) current = 0; _configs = newConfigs; [tableView reloadData]; - [(ApplicationController *)[[NSApplication sharedApplication] delegate] configsChanged]; + [(ApplicationController *)NSApplication.sharedApplication.delegate configsChanged]; [self activateConfig:_configs[current]]; } } +- (Config *)configWithURL:(NSURL *)url error:(NSError **)error { + NSInputStream *stream = [NSInputStream inputStreamWithURL:url]; + [stream open]; + NSDictionary *serialization = !*error + ? [NSJSONSerialization JSONObjectWithStream:stream options:0 error:error] + : nil; + [stream close]; + + if (!([serialization isKindOfClass:NSDictionary.class] + && [serialization[@"name"] isKindOfClass:NSString.class] + && [serialization[@"entries"] isKindOfClass:NSDictionary.class])) { + *error = [NSError errorWithDomain:@"Enjoyable" + code:0 + description:@"This isn't a valid mapping file."]; + return nil; + } + + NSDictionary *entries = serialization[@"entries"]; + Config *cfg = [[Config alloc] initWithName:serialization[@"name"]]; + for (id key in entries) { + NSDictionary *value = entries[key]; + if ([key isKindOfClass:NSString.class]) { + Target *target = [Target targetDeserialize:value + withConfigs:_configs]; + if (target) + cfg.entries[key] = target; + } + } + return cfg; +} + +- (void)importPressed:(id)sender { + NSOpenPanel *panel = [NSOpenPanel openPanel]; + panel.allowedFileTypes = @[ @"enjoyable", @"json", @"txt" ]; + NSWindow *window = NSApplication.sharedApplication.keyWindow; + [panel beginSheetModalForWindow:window + completionHandler:^(NSInteger result) { + if (result != NSFileHandlingPanelOKButton) + return; + + [panel close]; + NSError *error; + Config *cfg = [self configWithURL:panel.URL error:&error]; + + if (!error) { + BOOL conflict; + Config *mergeInto = self[cfg.name]; + for (id key in cfg.entries) { + if (mergeInto.entries[key]) { + conflict = YES; + break; + } + } + + 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) { + [window presentError:error + modalForWindow:window + delegate:nil + didPresentSelector:nil + contextInfo:nil]; + } + }]; + +} + +- (void)exportPressed:(id)sender { + NSSavePanel *panel = [NSSavePanel savePanel]; + panel.allowedFileTypes = @[ @"enjoyable" ]; + Config *cfg = _currentConfig; + panel.nameFieldStringValue = cfg.name; + NSWindow *window = NSApplication.sharedApplication.keyWindow; + [panel beginSheetModalForWindow:window + completionHandler:^(NSInteger result) { + if (result != NSFileHandlingPanelOKButton) + return; + [panel close]; + NSError *error; + NSDictionary *serialization = [cfg serialize]; + NSData *json = [NSJSONSerialization dataWithJSONObject:serialization + options:NSJSONWritingPrettyPrinted + error:&error]; + if (!error) + [json writeToURL:panel.URL options:NSDataWritingAtomic error:&error]; + + if (error) { + [window presentError:error + modalForWindow:window + delegate:nil + didPresentSelector:nil + contextInfo:nil]; + } + }]; +} + @end