Changeset 16 for trunk

Timestamp:

02/27/08 13:53:42 (10 months ago)

Author:

mgorbach

Message:

Error handling and further on the menuling UI

Location:

trunk

Files:

• MFClient.h (modified) (3 diffs)
• MFClient.m (modified) (14 diffs)
• MFClientFS.m (modified) (4 diffs)
• MFClientRecent.h (added)
• MFClientRecent.m (added)
• MFCommunicationServer.h (modified) (2 diffs)
• MFCommunicationServer.m (modified) (6 diffs)
• MFConstants.h (modified) (4 diffs)
• MFError.h (modified) (1 diff)
• MFError.m (modified) (3 diffs)
• MFFSDelegateProtocol.h (modified) (1 diff)
• MFFilesystem.h (modified) (1 diff)
• MFFilesystem.m (modified) (4 diffs)
• MFFilesystemController.h (modified) (3 diffs)
• MFFilesystemController.m (modified) (12 diffs)
• MFMainController.m (modified) (1 diff)
• MFPluginController.m (modified) (1 diff)
• MFServerFS.h (modified) (2 diffs)
• MFServerFS.m (modified) (6 diffs)
• MFServerProtocol.h (modified) (1 diff)
• MGNSImage.h (added)
• MGNSImage.m (added)
• MacFusion2.xcodeproj/project.pbxproj (modified) (25 diffs)
• MacfusionMenuling-Info.plist (modified) (1 diff)
• Menuling/MFMenulingAppDelegate.h (modified) (1 diff)
• Menuling/MFMenulingAppDelegate.m (modified) (4 diffs)
• Menuling/MFQuickMountController.h (added)
• Menuling/MFQuickMountController.m (added)
• Menuling/QuickMount.xib (added)
• SSHFS/SSHFSDelegate.m (modified) (4 diffs)
• SSHFS/sshfsConfiguration.xib (modified) (19 diffs)
• Settings/MFFSCollectionView.h (deleted)
• Settings/MFFSCollectionView.m (deleted)
• Settings/MFFSItemView.h (deleted)
• Settings/MFFSItemView.m (deleted)
• Settings/MFFilesystemCell.m (modified) (3 diffs)
• Settings/MFSettingsController.m (modified) (2 diffs)
• Settings/NSEmptyGradientView.h (deleted)
• Settings/NSEmptyGradientView.m (deleted)
• Settings/TestView.h (deleted)
• Settings/TestView.m (deleted)
• Settings/main.xib (modified) (86 diffs)

trunk/MFClient.h

@@ -17 +17 @@
         NSMutableDictionary* pluginsDictionary;
         NSMutableArray* plugins;
+        NSMutableArray* recents;
         id <MFServerProtocol> server;
         id delegate;
@@ -24 +25 @@
 - (BOOL)setup;
 
-- (NSArray*)filesystems;
-- (NSArray*)plugins;
-
 // Action methods
 - (MFClientFS*)newFilesystemWithPlugin:(MFClientPlugin*)plugin;
+- (MFClientFS*)quickMountFilesystemWithURL:(NSURL*)url
+                                                                         error:(NSError**)error;
 
 // Accessors
@@ -36 +36 @@
 @property(retain) id delegate;
 
+// All filesystems, including temporary ones
+@property(readonly) NSArray* filesystems;
+
+// Only filesystems that are not temporary
+@property(readonly) NSArray* persistentFilesystems;
+@property(readonly) NSArray* mountedFilesystems;
+
+// All plugins
+@property (readonly) NSArray* plugins;
+@property(readonly) NSArray* recents;
+
 @end

trunk/MFClient.m

@@ -11 +11 @@
 #import "MFClientPlugin.h"
 #import "MFConstants.h"
+#import "MFClientRecent.h"
 
 @interface MFClient(PrivateAPI)
@@ -16 +17 @@
 - (void)storePlugin:(MFClientPlugin*)plugin;
 - (void)removeFilesystem:(MFClientFS*)fs;
+
+@property(readwrite, retain) NSMutableArray* filesystems;
+@property(readwrite, retain) NSMutableArray* plugins;
+@property(readwrite, retain) NSMutableArray* recents;
 @end
 
@@ -33 +38 @@
 }
 
++ (NSSet*)keyPathsForValuesAffectingValueForKey:(NSString*)key
+{
+        if ([key isEqualToString:@"persistentFilesystems"]
+                || [key isEqualToString:@"mountedFilesystems"])
+                return [NSSet setWithObject:@"filesystems"];
+        else
+                return [super keyPathsForValuesAffectingValueForKey: key];
+}
+
+
 + (MFClient*)allocWithZone:(NSZone*)zone
 {
@@ -59 +74 @@
                         selector:@selector(handleFilesystemRemovedNotification:)
                                 name:kMFFilesystemRemovedNotification 
+                          object:kMFDNCObject];
+        [dnc addObserver:self
+                        selector:@selector(handleRecentsUpdatedNotification:)
+                                name:kMFRecentsUpdatedNotification 
                           object:kMFDNCObject];
 }
@@ -69 +88 @@
                 filesystems = [NSMutableArray array];
                 plugins = [NSMutableArray array];
+                recents = [NSMutableArray array];
         }
         return self;
@@ -97 +117 @@
                 [self storeFilesystem: fs];
         }
+        
+        // Fill Recents
+        NSMutableArray* recentsFromServer = [[server recents] mutableCopy];
+        for (NSDictionary* recent in recentsFromServer)
+                [[self mutableArrayValueForKey:@"recents"] addObject:
+                 [[MFClientRecent alloc] initWithParameterDictionary: recent]];
 }
 
@@ -140 +166 @@
         NSDictionary* info = [note userInfo];
         NSString* uuid = [info objectForKey:  KMFFSUUIDParameter];
-        MFLogS(self, @"Filesystem Added: uuid %@",
-                   uuid);
+ 
         id remoteFilesystem = [server filesystemWithUUID: uuid];
         if (![self filesystemWithUUID:uuid])
@@ -149 +174 @@
                                                                                          clientPlugin:plugin];
                 
-                
                 [self storeFilesystem:fs ];
         }
@@ -158 +182 @@
         NSDictionary* info = [note userInfo];
         NSString* uuid = [info objectForKey: KMFFSUUIDParameter];
-        MFLogS(self, @"Filesystem Deleted: uuid %@",
-                   uuid);
         MFClientFS* fs = [self filesystemWithUUID: uuid];
         [self removeFilesystem:fs];
@@ -175 +197 @@
 }
 
-#pragma Accessors and Setters
+- (MFClientFS*)quickMountFilesystemWithURL:(NSURL*)url
+                                                                         error:(NSError**)error
+{
+        id remoteFS = [server quickMountWithURL:url];
+        if (!remoteFS)
+        {
+                NSError* serverError = [server recentError];
+                if (serverError)
+                        *error = serverError;
+                return nil;
+        }
+        else
+        {
+                if ([self filesystemWithUUID:[remoteFS uuid]])
+                {
+                        return [self filesystemWithUUID: [remoteFS uuid]];
+                }
+                
+                MFClientPlugin* plugin = [self pluginWithID: [remoteFS pluginID]];
+                MFClientFS* newFS = [[MFClientFS alloc] initWithRemoteFS: remoteFS
+                                                                                                        clientPlugin: plugin ];
+                [self storeFilesystem: newFS];
+                return newFS;
+        }
+}
+
+#pragma mark Recents
+- (void)handleRecentsUpdatedNotification:(NSNotification*)note
+{
+        NSDictionary* recentParameterDict = [[note userInfo] objectForKey: kMFRecentKey ];
+        [[self mutableArrayValueForKey:@"recents"] addObject: 
+         [[MFClientRecent alloc] initWithParameterDictionary: recentParameterDict ]];
+        
+        if ([[self recents] count] > 10)
+                [[self mutableArrayValueForKey:@"recents"] removeObjectAtIndex: 0];
+}
+
+#pragma mark Accessors and Setters
+
+- (NSArray*)persistentFilesystems
+{
+        return [self.filesystems filteredArrayUsingPredicate:
+                        [NSPredicate predicateWithFormat:@"self.isPersistent == YES"]];
+}
+
+- (NSArray*)mountedFilesystems
+{
+        return [self.filesystems filteredArrayUsingPredicate:
+                        [NSPredicate predicateWithFormat:@"self.isMounted == YES"]];
+}
 
 - (void)storePlugin:(MFClientPlugin*)plugin
@@ -183 +254 @@
         if ([plugins indexOfObject: plugin] == NSNotFound)
         {
-                [self willChange:NSKeyValueChangeInsertion
-                 valuesAtIndexes: [NSIndexSet indexSetWithIndex: [plugins count]]
-                                  forKey:@"plugins"];
-                [plugins addObject: plugin];
-                [self didChange:NSKeyValueChangeInsertion
-                 valuesAtIndexes: [NSIndexSet indexSetWithIndex: [plugins count]]
-                                  forKey:@"plugins"];
+                [[self mutableArrayValueForKey:@"plugins"]
+                 addObject: plugin];
         }
 }
@@ -200 +266 @@
         if ([filesystems indexOfObject: fs] == NSNotFound)
         {
-                [self willChange:NSKeyValueChangeInsertion
-                 valuesAtIndexes: [NSIndexSet indexSetWithIndex: [filesystems count]]
-                                  forKey:@"filesystems"];
-                [filesystems addObject: fs];
-                [self didChange:NSKeyValueChangeInsertion
-                 valuesAtIndexes: [NSIndexSet indexSetWithIndex: [filesystems count]]
-                                  forKey:@"filesystems"];
+                [[self mutableArrayValueForKey:@"filesystems"]
+                 addObject: fs];
         }
 }
@@ -216 +277 @@
         if ([filesystems indexOfObject:fs] != NSNotFound)
         {
-                [self willChange:NSKeyValueChangeRemoval
-                 valuesAtIndexes:[NSIndexSet indexSetWithIndex:[filesystems indexOfObject: fs]]
-                                  forKey:@"filesystems"];
-                [filesystems removeObject: fs];
-                [self didChange:NSKeyValueChangeRemoval
-                 valuesAtIndexes:[NSIndexSet indexSetWithIndex:[filesystems indexOfObject: fs]]
-                                 forKey:@"filesystems"];
+                [[self mutableArrayValueForKey:@"filesystems"]
+                 removeObject: fs];
         }
 }
@@ -239 +295 @@
 }
 
-- (NSArray*)plugins
-{
-        return (NSArray*)plugins;
-}
-
-- (NSArray*)filesystems
-{
-        return (NSArray*)filesystems;
-}
-
-@synthesize delegate;
+@synthesize delegate, filesystems, plugins, recents;
 @end

trunk/MFClientFS.m

@@ -58 +58 @@
 - (void)registerNotifications
 {
-        /*
-        [self addObserver:self
-                   forKeyPath:kMFParameterDict
-                          options:NSKeyValueObservingOptionNew
-                          context:nil];
-         */
 }
 
@@ -93 +87 @@
 }
 
+#pragma mark Notifications To Clients
+- (void)sendNotificationForStatusChangeFrom:(NSString*)previousStatus
+                                                                                 to:(NSString*)newStatus
+{
+        NSNotificationCenter* nc = [NSNotificationCenter defaultCenter];
+        if ([previousStatus isEqualToString: newStatus])
+        {
+                // Send No Notification
+        }
+        if ([previousStatus isEqualToString: kMFStatusFSWaiting]
+                && [newStatus isEqualToString: kMFStatusFSMounted])
+        {
+                [nc postNotificationName: kMFClientFSMountedNotification
+                                                  object:self
+                                                userInfo:nil];
+        }
+        else if ([previousStatus isEqualToString: kMFStatusFSWaiting]
+                         && [newStatus isEqualToString: kMFStatusFSFailed])
+        {
+                [nc postNotificationName: kMFClientFSFailedNotification
+                                                  object:self
+                                                userInfo:nil];
+        }
+}
+
 #pragma mark Synchronization across IPC
 - (void)handleStatusInfoChangedNotification:(NSNotification*)note
 {
+        NSString* previousStatus = self.status;
         [self copyStatusInfo];
+        NSString* newStatus = self.status;
+        [self sendNotificationForStatusChangeFrom:previousStatus
+                                                                                   to:newStatus];
 }
 
@@ -143 +166 @@
         {
                 [[NSException exceptionWithName:kMFBadAPIUsageException
-                                                                 reason:@"endEditing without beginEditing"
+                                                                 reason:@"Calling endEditing without previous call to beginEditing"
                                                            userInfo:nil] raise];
         }
@@ -173 +196 @@
         if ([key isLike:@"parameters.*"] && !isEditing)
         {
-                [[NSException exceptionWithName:@"MFBadAPIUsage"
+                [[NSException exceptionWithName:kMFBadAPIUsageException
                                                                 reason:@"Trying to modify parameters without beginEditing"
                                                           userInfo:nil] raise];

trunk/MFCommunicationServer.h

@@ -14 +14 @@
 @interface MFCommunicationServer : NSObject <MFServerProtocol>
 {
-        
+        NSError* recentError;
 }
 
@@ -22 +22 @@
 - (MFPluginController*)pluginController;
 - (void)startServingRunloop;
+- (NSError*)recentError;
 
 @end

trunk/MFCommunicationServer.m

@@ -62 +62 @@
                                                                                                    options: NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld
                                                                                                    context: nil];
+        [[MFFilesystemController sharedController] addObserver: self
+                                                                                                forKeyPath: @"recents"
+                                                                                                   options: NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld
+                                                                                                   context: nil];
 }
 
@@ -79 +83 @@
         if ([connection registerName:kMFDistributedObjectName] == YES)
         {
-                MFLogS(self, @"Now Vending distributed object");
         }
         else
@@ -93 +96 @@
                                                 context:(void *)context
 {
-//      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
         // We need to observe filesystems itself, and add/remove observations on filesystems as they appear and dissapear
         NSDistributedNotificationCenter* dnc = [NSDistributedNotificationCenter defaultCenter];
+        
+        // MFLogS(self, @"Observes: keypath %@ object %@, change %@", keyPath, object, change);
         
         if ([keyPath isEqualToString:@"status"] && [object isKindOfClass: [MFFilesystem class]])
@@ -143 +147 @@
                                 [fs removeObserver: self
                                                 forKeyPath:@"parameters"];
+                                NSDictionary* userInfoDict = [NSDictionary dictionaryWithObject: [fs uuid]
+                                                                                                                                                forKey: KMFFSUUIDParameter ];
+                                [dnc postNotificationName:kMFFilesystemRemovedNotification
+                                                                   object:kMFDNCObject
+                                                                 userInfo:userInfoDict];
                         }
                 }
         }
         
-        
+        if ([keyPath isEqualToString:@"recents"] && object == [MFFilesystemController sharedController])
+        {
+                NSUInteger changeKind = [[change objectForKey: NSKeyValueChangeKindKey] intValue];
+                if (changeKind == NSKeyValueChangeInsertion)
+                {
+                        NSArray*  newRecent = [change objectForKey:NSKeyValueChangeNewKey];
+                        NSDictionary* userInfoDict = [NSDictionary dictionaryWithObject:[newRecent objectAtIndex:0]
+                                                                                                                                         forKey:kMFRecentKey];
+                        [dnc postNotificationName:kMFRecentsUpdatedNotification
+                                                           object:kMFDNCObject
+                                                         userInfo:userInfoDict ];
+                }
+        }
+}
+
+- (NSArray*)recents
+{
+        return [[MFFilesystemController sharedController] recents];
 }
 
@@ -185 +211 @@
         return [[MFFilesystemController sharedController] filesystemWithUUID:uuid];
 }
+
+- (MFServerFS*)quickMountWithURL:(NSURL*)url
+{
+        NSError* error;
+        MFServerFS* fs = [[MFFilesystemController sharedController] quickMountWithURL: url error:&error];
+        if (error)
+                recentError = error;
+        return fs;
+}
                                  
 
@@ -198 +233 @@
 }
 
+- (NSError*)recentError
+{
+        return recentError;
+}
+
 @end

trunk/MFConstants.h

@@ -40 +40 @@
 #define kMFFilesystemAddedNotification @"org.mgorbach.macfusion.notifications.fsAdded"
 #define kMFFilesystemRemovedNotification @"org.mgorbach.macfusion.notifications.fsRemoved"
+#define kMFRecentsUpdatedNotification @"org.mgorbach.macfusion.notifications.recentsUpdated"
+
+// Client Notifications (Non-distributed)
+#define kMFClientFSMountedNotification @"org.mgorbach.macfusion.mfclient.fsMounted"
+#define kMFClientFSUnmountedNotification @"org.mgorbach.macfusion.mfclient.fsUnmounted"
+#define kMFClientFSFailedNotification @"org.mgorbach.macfusion.mfclient.fsFailed"
 
 // IPC Object Names
@@ -48 +54 @@
 #define kMFFilesystemNameKey @"Name"
 #define kMFFilesystemStatusKey @"Status"
+#define kMFRecentKey @"recent"
 
 // Parameters Common to All FUSE Filesystems
@@ -58 +65 @@
 #define kMFFSFilePathParameter @"File Path"
 #define kMFFSPersistentParameter @"Is Persistent"
+#define kMFFSDescriptionParameter @"Description"
 
 // Status keys
@@ -77 +85 @@
         kMFErrorCodeDataCannotBeRead,
         kMFErrorCodeMissingParameter,
-        kMFErrorInvalidParameterValue
+        kMFErrorCodeInvalidParameterValue,
+        kMFErrorCodeNoPluginFound,
+        kMFErrorCodeMountFaliure
 };
 

trunk/MFError.h

@@ -20 +20 @@
                                                                                         description:(NSString*)description;
 
++ (MFError*)errorWithErrorCode:(NSInteger)code 
+                                   description:(NSString*)description;
+
 @end

trunk/MFError.m

@@ -31 +31 @@
                                                            nil];
         return [MFError errorWithDomain: kMFErrorDomain
-                                                           code:kMFErrorInvalidParameterValue
+                                                           code: kMFErrorCodeInvalidParameterValue
                                                    userInfo: errorDict];
 }
@@ -48 +48 @@
                                          paramName ];
                 }
-                if ([self code] == kMFErrorInvalidParameterValue)
+                if ([self code] == kMFErrorCodeInvalidParameterValue)
                 {
                         return [NSString stringWithFormat: @"Invalid value for %@\n%@",
@@ -59 +59 @@
 }
 
++ (MFError*)errorWithErrorCode:(NSInteger)code 
+                                   description:(NSString*)description
+{
+        return [MFError errorWithDomain:kMFErrorDomain
+                                                           code:code
+                                                   userInfo: [NSDictionary dictionaryWithObject: description
+                                                                                                                                 forKey: NSLocalizedDescriptionKey ] ];
+}
+
 @end

trunk/MFFSDelegateProtocol.h

@@ -29 +29 @@
 
 - (NSString*)executablePath;
+- (NSArray*)urlSchemesHandled;
  
 @optional
 - (NSDictionary*)taskEnvironmentForParameters:(NSDictionary*)parameters;
-
+- (NSDictionary*)parameterDictionaryForURL:(NSURL*)url
+                                                                         error:(NSError**)error;
+- (NSError*)errorForParameters:(NSDictionary*)parameters 
+                                                output:(NSString*)output;
 @end

trunk/MFFilesystem.h

@@ -34 +34 @@
 - (id)valueForParameterNamed:(NSString*)paramName;
 - (NSMutableDictionary*)fillParametersWithImpliedValues:(NSDictionary*)params;
+- (NSError*)error;
 
 @property(readwrite, assign) NSString* status;

trunk/MFFilesystem.m

@@ -78 +78 @@
         if (status)
         {
-                [statusInfo setObject:status
-                                           forKey:kMFSTStatusKey];
+                [statusInfo setObject:status forKey:kMFSTStatusKey];
         }
 }