Changeset 14

Timestamp:

02/23/08 15:24:45 (11 months ago)

Author:

mgorbach

Message:

Many, many changes. Moving along

Location:

trunk

Files:

• . (modified) (1 prop)
• MFClient.h (modified) (1 diff)
• MFClient.m (modified) (10 diffs)
• MFClientFS.h (modified) (2 diffs)
• MFClientFS.m (modified) (6 diffs)
• MFCommunicationServer.m (modified) (5 diffs)
• MFConstants.h (modified) (2 diffs)
• MFConstants.m (modified) (2 diffs)
• MFError.h (added)
• MFError.m (added)
• MFFSDelegateProtocol.h (modified) (1 diff)
• MFFilesystem.h (modified) (4 diffs)
• MFFilesystem.m (modified) (3 diffs)
• MFFilesystemController.h (modified) (2 diffs)
• MFFilesystemController.m (modified) (9 diffs)
• MFMainController.m (modified) (1 diff)
• MFPlugin.h (modified) (1 diff)
• MFPlugin.m (modified) (1 diff)
• MFServerFS.h (modified) (2 diffs)
• MFServerFS.m (modified) (13 diffs)
• MFServerFSProtocol.h (added)
• MFServerFSProtocol.m (added)
• MFServerPlugin.m (modified) (1 diff)
• MGUtilities.h (added)
• MGUtilities.m (added)
• MacFusion2.xcodeproj/project.pbxproj (modified) (24 diffs)
• SSHFS/SSHFSDelegate.m (modified) (10 diffs)
• SSHFS/sshfs.png (added)
• SSHFS/sshfsConfiguration.xib (modified) (13 diffs)
• SSHFS/sshfs_icon.icns (added)
• Settings/MFFilesystemCell.m (modified) (1 diff)
• Settings/MFSettingsController.h (modified) (1 diff)
• Settings/MFSettingsController.m (modified) (7 diffs)
• Settings/main.xib (modified) (96 diffs)
• mfctl.m (modified) (1 diff)

trunk/MFClient.h

@@ -21 +21 @@
 
 + (MFClient*)sharedClient;
-- (void)fillInitialStatus;
-- (BOOL)establishCommunication;
+- (BOOL)setup;
 
 - (NSArray*)filesystems;

trunk/MFClient.m

@@ -13 +13 @@
 
 @interface MFClient(PrivateAPI)
-- (void)storeFilesystem:(MFClientFS*)fs withUUID:(NSString*)uuid;
-- (void)storePlugin:(MFClientPlugin*)plugin withID:(NSString*)id;
+- (void)storeFilesystem:(MFClientFS*)fs;
+- (void)storePlugin:(MFClientPlugin*)plugin;
 - (void)removeFilesystem:(MFClientFS*)fs;
 @end
@@ -85 +85 @@
                 MFClientPlugin* plugin = [[MFClientPlugin alloc] initWithRemotePlugin: 
                                                                   remotePlugin];
-                [self storePlugin: plugin
-                                   withID: plugin.ID];
+                [self storePlugin: plugin];
         }
         
@@ -96 +95 @@
                 MFClientFS* fs = [MFClientFS clientFSWithRemoteFS: remoteFS
                                                                                          clientPlugin: plugin];
-                [self storeFilesystem: fs
-                                         withUUID: fs.uuid];
-        }
-        
+                [self storeFilesystem: fs];
+        }
 }
 
@@ -119 +116 @@
 }
 
+- (BOOL)setup
+{
+        if ([self establishCommunication])
+        {
+                [self fillInitialStatus];
+                return YES;
+        }
+        
+        return NO;
+}
+
 #pragma mark Notification handling
 - (void)handleStatusChangedNotification:(NSNotification*)note
 {
-//      MFLogS(self, @"Status changed in MFClient");
         NSDictionary* info = [note userInfo];
-        NSString* uuid = [info objectForKey: kMFFilesystemUUIDKey];
-        MFClientFS* fs = [filesystemsDictionary objectForKey:uuid];
-        if (fs)
-        {
-                [fs handleStatusInfoChangedNotification:note];
-        }
-        
-        if ([delegate respondsToSelector:@selector(clientStatusChanged)])
-        {
-                [delegate clientStatusChanged];
-        }
+        NSString* uuid = [info objectForKey: KMFFSUUIDParameter];
+        MFClientFS* fs = [self filesystemWithUUID: uuid];
+        [fs handleStatusInfoChangedNotification:note];
 }
 
@@ -140 +139 @@
 {
         NSDictionary* info = [note userInfo];
-        NSString* uuid = [info objectForKey: kMFFilesystemUUIDKey];
+        NSString* uuid = [info objectForKey:  KMFFSUUIDParameter];
         MFLogS(self, @"Filesystem Added: uuid %@",
                    uuid);
@@ -151 +150 @@
                 
                 
-                [self storeFilesystem:fs
-                                         withUUID:uuid];
+                [self storeFilesystem:fs ];
         }
 }
@@ -159 +157 @@
 {
         NSDictionary* info = [note userInfo];
-        NSString* uuid = [info objectForKey: kMFFilesystemUUIDKey];
+        NSString* uuid = [info objectForKey: KMFFSUUIDParameter];
         MFLogS(self, @"Filesystem Deleted: uuid %@",
                    uuid);
@@ -169 +167 @@
 - (MFClientFS*)newFilesystemWithPlugin:(MFClientPlugin*)plugin
 {
-        NSAssert(plugin, @"Asked to make new filesystem with nil plugin, MFClient");
+        NSAssert(plugin, @"MFClient asked to make new filesystem with nil plugin");
         id newRemoteFS = [server newFilesystemWithPluginName: plugin.ID];
         MFClientFS* newFS = [[MFClientFS alloc] initWithRemoteFS: newRemoteFS
                                                                                                 clientPlugin: plugin];
-        [self storeFilesystem:newFS
-                                 withUUID:newFS.uuid];
+        [self storeFilesystem:newFS ];
         return newFS;
 }
@@ -180 +177 @@
 #pragma Accessors and Setters
 
-- (void)storePlugin:(MFClientPlugin*)plugin withID:(NSString*)id
-{
-        NSAssert(id, @"ID null when storing plugin in MfClient");
-        [pluginsDictionary setObject: plugin forKey:id];
+- (void)storePlugin:(MFClientPlugin*)plugin
+{
+        NSAssert(plugin && plugin.ID, @"plugin or ID null when storing plugin in MfClient");
+        [pluginsDictionary setObject: plugin forKey: plugin.ID ];
         if ([plugins indexOfObject: plugin] == NSNotFound)
         {
@@ -196 +193 @@
 }
 
-- (void)storeFilesystem:(MFClientFS*)fs withUUID:(NSString*)uuid
-{
-        NSAssert(fs && uuid, @"FS or UUID is nill when storing fs in MFClient");
+- (void)storeFilesystem:(MFClientFS*)fs
+{
+        NSAssert(fs && fs.uuid, @"FS or fs.uuid is nil when storing fs in MFClient");
         [filesystemsDictionary setObject: fs
-                                                          forKey: uuid];
+                                                          forKey: fs.uuid];
         if ([filesystems indexOfObject: fs] == NSNotFound)
         {

trunk/MFClientFS.h

@@ -9 +9 @@
 #import <Cocoa/Cocoa.h>
 #import "MFFilesystem.h"
+#import "MFServerFSProtocol.h"
 
 @class MFClientPlugin;
 
 @interface MFClientFS : MFFilesystem {
-        id remoteFilesystem;
+        id<MFServerFSProtocol> remoteFilesystem;
         MFClientPlugin* plugin;
+        NSDictionary* backupParameters;
+        BOOL isEditing;
 }
 
@@ -29 +32 @@
 - (void)handleParametersChangedNotification:(NSNotification*)note;
 
+// Editing
+- (NSError*)endEditingAndCommitChanges:(BOOL)commit;
+- (void)beginEditing;
+- (NSDictionary*)displayDictionary;
+
 @end

trunk/MFClientFS.m

@@ -14 +14 @@
 - (void)fillInitialData;
 - (void)registerNotifications;
+- (void)copyParameters;
+- (void)copyStatusInfo;
 @end
 
@@ -22 +24 @@
 {
         MFClientFS* fs = nil;
-        NSBundle* bundle = plugin.bundle;
-        NSString* filesystemClassName = [bundle objectForInfoDictionaryKey:
-                                                                         @"MFClientFSClassName"];
-        if (filesystemClassName == nil)
-        {
-                MFLogS(self, @"Failed to instantiate filesystem with remote fs %@. No Client Filesystem class specified.",
-                           remoteFS);
-        }
+        
+        fs = [[MFClientFS alloc] initWithRemoteFS: remoteFS
+                                                                 clientPlugin: plugin];
+        return fs;
+}
+
++ (NSSet*)keyPathsForValuesAffectingValueForKey:(NSString*)key
+{
+        if ([key isEqualToString: @"displayDictionary"])
+                return [NSSet setWithObjects: 
+                                KMFStatusDict, kMFParameterDict, nil];
         else
-        {
-                BOOL success = [bundle load];
-                if (success)
-                {
-                        Class filesystemClass = NSClassFromString(filesystemClassName);
-                        if ([filesystemClass isSubclassOfClass: [MFClientFS class]])
-                        {
-                                fs = [[filesystemClass alloc] initWithRemoteFS: remoteFS 
-                                                                                                  clientPlugin: plugin];
-                        }
-                        else
-                        {
-                                MFLogS(self, @"Client filesystem class %@ is not a subclass of MFClientFS",
-                                           filesystemClass);
-                        }
-                }
-        }
-        
-        return fs;
+                return [super keyPathsForValuesAffectingValueForKey: key];
 }
 
@@ -60 +47 @@
                 remoteFilesystem = remoteFS;
                 plugin = p;
+                delegate = [plugin delegate];
                 [self fillInitialData];
                 [self registerNotifications];
@@ -70 +58 @@
 - (void)registerNotifications
 {
+        /*
         [self addObserver:self
-                   forKeyPath:@"parameters"
+                   forKeyPath:kMFParameterDict
                           options:NSKeyValueObservingOptionNew
                           context:nil];
+         */
+}
+
+- (void)copyStatusInfo
+{
+        [self willChangeValueForKey:KMFStatusDict];
+        statusInfo = [[remoteFilesystem statusInfo] mutableCopy];
+        NSAssert(![statusInfo isProxy], @"Status Info from DO is a Proxy. Oh shit.");
+        [self didChangeValueForKey:KMFStatusDict];
+}
+
+- (void)copyParameters
+{
+        [self willChangeValueForKey:kMFParameterDict];
+        parameters = [[remoteFilesystem parameters] mutableCopy];
+        NSAssert(![parameters isProxy], @"Parameters from DO is a Proxy. Oh shit.");
+        [self didChangeValueForKey:kMFParameterDict];
 }
 
 - (void)fillInitialData
 {
-        [self willChangeValueForKey:@"parameters"];
-        parameters = [[remoteFilesystem parameters] mutableCopy];
-        [self didChangeValueForKey:@"parameters"];
-        [self willChangeValueForKey:@"statusInfo"];
-        statusInfo = [[remoteFilesystem statusInfo] mutableCopy];
-        [self didChangeValueForKey:@"statusInfo"];
+        [self copyStatusInfo];
+        [self copyParameters];
 }
 
@@ -94 +96 @@
 - (void)handleStatusInfoChangedNotification:(NSNotification*)note
 {
-//      NSDictionary* info = [note userInfo];
-        [self willChangeValueForKey: @"status"];
-        statusInfo = [[remoteFilesystem statusInfo] mutableCopy];
-        [self didChangeValueForKey: @"status"];
+        [self copyStatusInfo];
 }
 
 - (void)handleParametersChangedNotification:(NSNotification*)note
 {
-        
+        [self copyParameters];
 }
 
-- (void) observeValueForKeyPath:(NSString *)keyPath 
-                                           ofObject:(id)object 
-                                                 change:(NSDictionary *)change 
-                                                context:(void *)context
+- (NSDictionary*)displayDictionary
 {
-        NSLog(@"Change detected on keypath %@, object %@, change %@",
-                  keyPath, object, change);
+        NSMutableDictionary* dict = [NSMutableDictionary dictionary];
+        [dict addEntriesFromDictionary: parameters];
+        [dict addEntriesFromDictionary: statusInfo];
+        return [dict copy];
 }
 
-// Hack to make sure we are notified if any parameters change
-- (void)setValue:(id)value 
-          forKeyPath:(NSString*)keyPath
-{
-        if ([keyPath isLike:@"parameters.*"])
-        {
-                [self willChangeValueForKey:@"parameters"];
-        }
-        [super setValue:value
-                 forKeyPath:keyPath];
-        if ([keyPath isLike:@"parameters.*"])
-        {
-                [self didChangeValueForKey:@"parameters"];
-                [remoteFilesystem setValue:value
-                                                forKeyPath:keyPath];
-        }
-}
-
+# pragma mark Action Methods
 - (void)mount
 {
@@ -142 +123 @@
 }
 
-- (NSMutableDictionary*)parameters
+
+#pragma mark Editing
+
+- (void)setParameters:(NSMutableDictionary*)p
 {
-        return parameters;
+        parameters = p;
+}
+
+- (void)beginEditing
+{
+        isEditing = YES;
+        backupParameters = [NSDictionary dictionaryWithDictionary: 
+                                                [self parameters]];
+}
+
+- (NSError*)endEditingAndCommitChanges:(BOOL)commit
+{
+        if (!isEditing)
+        {
+                [[NSException exceptionWithName:kMFBadAPIUsageException
+                                                                 reason:@"endEditing without beginEditing"
+                                                           userInfo:nil] raise];
+        }
+        
+        if (commit)
+        {
+                NSError* result = [remoteFilesystem validateAndSetParameters: parameters];
+                if (result)
+                {
+                        return result;
+                }
+                else
+                {
+                        isEditing = NO;
+                        return nil;
+                }
+        }
+        else
+        {
+                isEditing = NO;
+                [self setParameters: [backupParameters mutableCopy] ];
+        }
+        
+        return nil;
+}
+
+- (void)willChangeValueForKey:(NSString*)key
+{
+        if ([key isLike:@"parameters.*"] && !isEditing)
+        {
+                [[NSException exceptionWithName:@"MFBadAPIUsage"
+                                                                reason:@"Trying to modify parameters without beginEditing"
+                                                          userInfo:nil] raise];
+        }
+        
+        [super willChangeValueForKey:key];
 }
 

trunk/MFCommunicationServer.m

@@ -93 +93 @@
                                                 context:(void *)context
 {
-        MFLogS(self, @"Observe triggered on keypath %@, object %@ change %@", keyPath, object, change);
+//      MFLogS(self, @"Observe triggered on keypath %@, object %@", keyPath, object);
         
         // TODO: This observation method will not be called on objects added to filesystems after registerNotifications is called
@@ -103 +103 @@
                 MFFilesystem* fs = (MFFilesystem*)object;
                 NSDictionary* userInfoDict = [NSDictionary dictionaryWithObjectsAndKeys: 
-                                                                          fs.uuid, kMFFilesystemUUIDKey,
-                                                                          fs.status, kMFFilesystemStatusKey,
+                                                                          fs.uuid, KMFFSUUIDParameter,
+                                                                          fs.status, kMFSTStatusKey,
                                                                           nil];
                 [dnc postNotificationName:kMFStatusChangedNotification
@@ -128 +128 @@
 
                                 NSDictionary* userInfoDict = [NSDictionary dictionaryWithObject: [fs uuid]
-                                                                                                                                                 forKey: kMFFilesystemUUIDKey];
+                                                                                                                                                 forKey: KMFFSUUIDParameter];
                                 [dnc postNotificationName:kMFFilesystemAddedNotification
                                                                    object:kMFDNCObject
@@ -171 +171 @@
 - (MFServerFS*)newFilesystemWithPluginName:(NSString*)pluginName
 {
+        NSAssert(pluginName, @"MFCommunicationServer: Asked for new filesystem with nil plugin name");
         MFServerPlugin* plugin = [[[MFPluginController sharedController] pluginsDictionary]
                                                 objectForKey:pluginName];
-        if (plugin)
-        {
-                MFServerFS* fs = [[MFFilesystemController sharedController] 
+        NSAssert(plugin, @"MFCommunicationServer: Asked for FS with invalid plugin name");
+        MFServerFS* fs = [[MFFilesystemController sharedController] 
                                                   newFilesystemWithPlugin: plugin];
-                return fs;
-        }
-        else
-        {
-                MFLogS(self, @"Request failed to create new filesystem. Now plugin named %@", 
-                           pluginName);
-                return nil;
-        }
+        return fs;
 }
                                  
@@ -190 +183 @@
 {
         NSAssert(uuid, @"Filesystem requested with nil uuid in server");
-        return [[MFFilesystemController sharedController] 
-                        filesystemWithUUID:uuid];
+        return [[MFFilesystemController sharedController] filesystemWithUUID:uuid];
 }
                                  

trunk/MFConstants.h

@@ -9 +9 @@
 
 // Status values for filesystems
+/*
 extern NSString* kMFStatusFSMounted;
 extern NSString* kMFStatusFSUnmounted;
@@ -27 +28 @@
 extern NSString* kMFFilesystemUUIDKey;
 extern NSString* kMFFilesystemStatusKey;
+*/
+ 
+// Status
+#define kMFStatusFSMounted @"Mounted"
+#define kMFStatusFSUnmounted @"Unmounted"
+#define kMFStatusFSWaiting @"Waiting to Mount"
+#define kMFStatusFSFailed @"Failed to Mount"
+
+// IPC Distribution Notifications
+#define kMFStatusChangedNotification @"org.mgorbach.macfusion.notifications.statusChanged"
+#define kMFFilesystemAddedNotification @"org.mgorbach.macfusion.notifications.fsAdded"
+#define kMFFilesystemRemovedNotification @"org.mgorbach.macfusion.notifications.fsRemoved"
+
+// IPC Object Names
+#define kMFDNCObject @"org.mgorbach.macfusion"
+#define kMFDistributedObjectName @"org.mgorbach.macfusion.do"
+
+// Keys for Notifications
+#define kMFFilesystemNameKey @"Name"
+#define kMFFilesystemStatusKey @"Status"
+
+// Parameters Common to All FUSE Filesystems
+#define kMFFSNameParameter @"Name"
+#define kMFFSTypeParameter @"Type"
+#define kMFFSVolumeNameParameter @"Volume Name"
+#define kMFFSVolumeIconPathParameter @"Icon Path"
+#define kMFFSMountPathParameter @"Mount Path"
+#define KMFFSUUIDParameter @"UUID"
+#define kMFFSFilePathParameter @"File Path"
+#define kMFFSPersistentParameter @"Is Persistent"
+
+// Status keys
+#define KMFStatusDict @"statusInfo"
+#define kMFParameterDict @"parameters"
+
+#define kMFSTErrorKey @"error"
+#define kMFSTStatusKey @"status"
+#define kMFSTOutputKey @"output"
 
 // More key Names
 #define kMFPluginShortNameKey @"MFPluginShortName"
 #define kMFPluginLongNameKey @"MFPluginLongName"
+
+// Error handling
+#define kMFErrorDomain @"org.mgorbach.macfusion.errordomain"
+enum macfusionErrorCodes {
+        kMFErrorCodeInvalidPath,
+        kMFErrorCodeDataCannotBeRead,
+        kMFErrorCodeMissingParameter,
+        kMFErrorInvalidParameterValue
+};
+
+#define kMFErrorParameterKey @"parameter"
+#define kMFErrorFilesystemKey @"filesystem"
+#define KMFErrorPluginKey @"plugin"
+#define kMFErrorValueKey @"value"
+
+// Exceptions
+#define kMFBadAPIUsageException @"Bad API Usage In Macfusion"
+
+

trunk/MFConstants.m

@@ -9 +9 @@
 #import "MFConstants.h"
 
+/*
 NSString* kMFStatusFSMounted = @"Mounted";
 NSString* kMFStatusFSUnmounted = @"Unmounted";
@@ -26 +27 @@
 NSString* kMFFilesystemStatusKey = @"status";
 NSString* kMFFilesystemUUIDKey = @"status";
+
+*/

trunk/MFFSDelegateProtocol.h

@@ -13 +13 @@
 - (NSArray*)taskArgumentsForParameters:(NSDictionary*)parameters;
 
+- (NSArray*)parameterList;
 - (NSDictionary*)defaultParameterDictionary;
 

trunk/MFFilesystem.h

@@ -8 +8 @@
 
 #import <Cocoa/Cocoa.h>
+#import "MFFSDelegateProtocol.h"
+
 @class MFPlugin;
 
@@ -13 +15 @@
         NSMutableDictionary* parameters;
         NSMutableDictionary* statusInfo;
+        id <MFFSDelegateProtocol> delegate;
 }
 
@@ -24 +27 @@
 - (BOOL)isWaiting;
 - (BOOL)isUnmounted;
+- (BOOL)isFailedToMount;
+- (BOOL)isPersistent;
+
+- (NSMutableDictionary*)parametersWithImpliedValues;
+- (NSArray*)parameterList;
+- (id)valueForParameterNamed:(NSString*)paramName;
+- (NSMutableDictionary*)fillParametersWithImpliedValues:(NSDictionary*)params;