X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=ConfigsController.m;h=969398515b4a5d235e41d48da9dca73dd2035c14;hp=8870fab6d0aa3715c7fe1a9fde681601b38e7759;hb=51336622a1df8de5dd8aaec0972b9b04292fd88d;hpb=62aa5b73be6ec1e499e6b155cd0e7687c338cbaa

diff --git a/ConfigsController.m b/ConfigsController.m
index 8870fab..9693985 100644
--- a/ConfigsController.m
+++ b/ConfigsController.m
@@ -113,21 +113,14 @@
 
 - (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
@@ -145,7 +138,7 @@
     }
     
     if (newConfigs.count) {
-        unsigned current = [envelope[@"selectedConfiguration"] unsignedIntValue];
+        unsigned current = [envelope[@"selected"] unsignedIntValue];
         if (current >= newConfigs.count)
             current = 0;
         _configs = newConfigs;
@@ -155,4 +148,95 @@
     }
 }
 
+- (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];
+    }
+}
+
 @end