Add basic file read/write capabilities. Currently supports text/string based files, images will be added soon.

rawcreative · rawcreative · commit 5117ff6d7c0d · 2014-06-08T15:07:16.000-04:00
diff --git a/MG.xcodeproj/project.pbxproj b/MG.xcodeproj/project.pbxproj
@@ -12,6 +12,7 @@
 		2237E680192B018D001E1393 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2237E67F192B018D001E1393 /* JavaScriptCore.framework */; };
 		2237E6EF192BAF85001E1393 /* public in Resources */ = {isa = PBXBuildFile; fileRef = 2237E6EE192BAF85001E1393 /* public */; };
 		226AE65D193AA8FC00B15FB7 /* Sound.m in Sources */ = {isa = PBXBuildFile; fileRef = 226AE65C193AA8FC00B15FB7 /* Sound.m */; };
+		22A676E71944B140002F81FB /* File.m in Sources */ = {isa = PBXBuildFile; fileRef = 22A676E61944B140002F81FB /* File.m */; };
 		22B1CF2B1937734B00D2C294 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 22B1CEF51937734B00D2C294 /* AppDelegate.m */; };
 		22B1CF2C1937734B00D2C294 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22B1CEF61937734B00D2C294 /* MainMenu.xib */; };
 		22B1CF2D1937734B00D2C294 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22B1CEF81937734B00D2C294 /* MainWindow.xib */; };
@@ -53,6 +54,8 @@
 		2237E6EE192BAF85001E1393 /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
 		226AE65B193AA8FC00B15FB7 /* Sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Sound.h; sourceTree = "<group>"; };
 		226AE65C193AA8FC00B15FB7 /* Sound.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Sound.m; sourceTree = "<group>"; };
+		22A676E51944B140002F81FB /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = "<group>"; };
+		22A676E61944B140002F81FB /* File.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = File.m; sourceTree = "<group>"; };
 		22B1CEF41937734B00D2C294 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		22B1CEF51937734B00D2C294 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
 		22B1CEF71937734B00D2C294 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -232,6 +235,8 @@
 				226AE65C193AA8FC00B15FB7 /* Sound.m */,
 				22BE36EB193B7F8800D8199F /* Defaults.h */,
 				22BE36EC193B7F8800D8199F /* Defaults.m */,
+				22A676E51944B140002F81FB /* File.h */,
+				22A676E61944B140002F81FB /* File.m */,
 			);
 			path = Commands;
 			sourceTree = "<group>";
@@ -333,6 +338,7 @@
 				22B1CF381937734B00D2C294 /* MenuItem.m in Sources */,
 				22B1CF301937734B00D2C294 /* App.m in Sources */,
 				22B1CF371937734B00D2C294 /* Menu.m in Sources */,
+				22A676E71944B140002F81FB /* File.m in Sources */,
 				22B1CF3C1937734B00D2C294 /* Window.m in Sources */,
 				22B1CF3F1937734B00D2C294 /* WindowController.m in Sources */,
 				22B1CF3D1937734B00D2C294 /* Utils.m in Sources */,
diff --git a/MG.xcodeproj/project.xcworkspace/xcuserdata/Tim.xcuserdatad/WorkspaceSettings.xcsettings b/MG.xcodeproj/project.xcworkspace/xcuserdata/Tim.xcuserdatad/WorkspaceSettings.xcsettings
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
+	<true/>
+	<key>SnapshotAutomaticallyBeforeSignificantChanges</key>
+	<true/>
+</dict>
+</plist>
diff --git a/MacGap/Classes/Commands/Event.h b/MacGap/Classes/Commands/Event.h
@@ -19,6 +19,6 @@
 + (void) triggerEvent:(NSString *)event forWebView:(WebView *)webView;
 + (void) triggerEvent:(NSString *)event withArgs:(NSDictionary *)args forWebView:(WebView *)webView;
 + (void) triggerEvent:(NSString *)event withArgs:(NSDictionary *)args forObject:(NSString *)objName forWebView:(WebView *)webView;
-
++ (void) triggerDomEvent:(NSString *)event withArgs:(NSDictionary *)args forWebView:(WebView *)webView;
 
 @end
diff --git a/MacGap/Classes/Commands/Event.m b/MacGap/Classes/Commands/Event.m
@@ -25,4 +25,10 @@ + (void) triggerEvent:(NSString *)event withArgs:(NSDictionary *)args forObject:
     [webView stringByEvaluatingJavaScriptFromString:str];
 }
 
++ (void) triggerDomEvent:(NSString *)event withArgs:(NSDictionary *)args forWebView:(WebView *)webView {
+    
+    NSString * str = [NSString stringWithFormat:@"var e = new CustomEvent('%@', %@); document.dispatchEvent(e);", event, args.JSONString];
+    [webView stringByEvaluatingJavaScriptFromString:str];
+}
+
 @end
diff --git a/MacGap/Classes/Commands/File.h b/MacGap/Classes/Commands/File.h
@@ -0,0 +1,19 @@
+//
+//  File.h
+//  MG
+//
+//  Created by Tim Debo on 6/8/14.
+//
+//
+
+#import "Command.h"
+@protocol FileExports <JSExport>
+
+JSExportAs(write, - (void) writeFile:(NSString*)filePath withData: (JSValue*) data andType: (NSString*) type );
+JSExportAs(read, - (JSValue*) readFile:(NSString*)filePath ofType: (NSString*) type);
+
+@end
+
+@interface File : Command <FileExports>
+
+@end
diff --git a/MacGap/Classes/Commands/File.m b/MacGap/Classes/Commands/File.m
@@ -0,0 +1,89 @@
+//
+//  File.m
+//  MG
+//
+//  Created by Tim Debo on 6/8/14.
+//
+//
+
+#import "File.h"
+#import "WindowController.h"
+
+@interface File ()
+
+@property (nonatomic) NSArray* acceptedTypes;
+
+@end
+
+@implementation File
+
+- (id) initWithWindowController:(WindowController *)aWindowController
+{
+    self = [super init];
+    
+    if(self) {
+        self.windowController = aWindowController;
+        self.webView = aWindowController.webView;
+        _acceptedTypes = @[ @"string", @"json", @"image"];
+
+    }
+ 
+    return self;
+}
+
+
+- (void) writeFile:(NSString*)filePath withData: (JSValue*) data andType: (NSString*) type
+{
+    
+    if([_acceptedTypes containsObject:type]){
+        
+        if([type isEqualToString:@"string"]) {
+            NSString* valToWrite = [data toString];
+            [valToWrite writeToFile:filePath atomically:YES encoding:NSUTF8StringEncoding error:NULL];
+        } else if([type isEqualToString:@"json"]) {
+            
+            NSDictionary* dictData = [data toDictionary];
+            NSString* valToWrite = [dictData JSONString];
+            
+            [valToWrite writeToFile:filePath atomically:YES encoding:NSUTF8StringEncoding error:NULL];
+        } else {
+            //TODO
+//            NSString* base64Data = [data toString];
+//            NSData * valToWrite = [NSData dataFromBase64String:base64Data];
+        }
+    }
+    
+}
+
+- (JSValue*) readFile:(NSString*)filePath ofType: (NSString*) type
+{
+    
+    if([_acceptedTypes containsObject:type]) {
+         BOOL fileExists = [[NSFileManager defaultManager] fileExistsAtPath:filePath];
+        if([type isEqualToString:@"string"]) {
+            
+            if(fileExists) {
+                NSString* val = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:NULL];
+                return [JSValue valueWithObject:val inContext:[JSContext currentContext]];
+            }
+            
+        } else if([type isEqualToString:@"json"]) {
+            
+            if(fileExists) {
+                NSDictionary* val = [[NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:NULL] JSONObject];
+                return [JSValue valueWithObject:val inContext:[JSContext currentContext]];
+            }
+        } else {
+            //TODO
+//            if(fileExists) {
+//                NSDictionary* val = [[NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:NULL] JSONObject];
+//                return [JSValue valueWithObject:val inContext:[JSContext currentContext]];
+//            }
+        }
+    } else {
+        return nil;
+    }
+    return nil;
+}
+
+@end
diff --git a/public/config.json b/public/config.json
@@ -12,7 +12,8 @@
                 "StatusItem":"StatusItem",
                 "Task" : "Task",
                 "Sound" : "Sound",
-                "Defaults" : "Defaults"
+                "Defaults" : "Defaults",
+        "File" : "File"
                  },
     "window" : {
         "title" : "MacGap",
