Changeset 63 for trunk

Timestamp:

05/29/08 21:02:30 (7 months ago)

Author:

mgorbach

Message:

Some overall cleanup. Addressing of ticket 40 (upgrade case)

Location:

trunk

Files:

• MFClient.m (modified) (1 diff)
• MFClientFS.m (modified) (1 diff)
• MFCommunicationServer.m (modified) (2 diffs)
• MFCore.h (modified) (1 diff)
• MFCore.m (modified) (4 diffs)
• MFFilesystemController.m (modified) (1 diff)
• MFLogReader.m (modified) (1 diff)
• MFMainController.h (modified) (2 diffs)
• MFMainController.m (modified) (1 diff)
• MFPreferences.m (modified) (1 diff)
• MFServerFS.m (modified) (1 diff)
• Settings/MFSettingsController.m (modified) (1 diff)

trunk/MFClient.m

@@ -213 +213 @@
 {
         MFClientFS* fs = [self filesystemWithUUID: uuid];
-        MFLogSO(self, fs, @"Note status changed for fs %@", fs);
         [fs noteStatusInfoChanged];
+        MFLogSO(self, fs, @"Note status changed for fs %@ to %@", fs, fs.status);
 }
 

trunk/MFClientFS.m

@@ -122 +122 @@
                                                                                  to:(NSString*)newStatus
 {
-        MFLogS(self, @"Notifying for status %@ -> %@", previousStatus, newStatus);
         if ([previousStatus isEqualToString: newStatus])
         {

trunk/MFCommunicationServer.m

@@ -57 +57 @@
                   toObjectsAtIndexes:indexes
                                   forKeyPath:@"status"
-                                         options:NSKeyValueObservingOptionNew
+                                         options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld
                                          context:nil];
         [filesystems addObserver:self
@@ -111 +111 @@
                                                 context:(void *)context
 {
-        
-        // MFLogS(self, @"Observes: keypath %@ object %@, change %@", keyPath, object, change);
-        // TODO: We need to provide a way to call noteParametersChangedForFSWithUUID: here as well
-        
-        if ([keyPath isEqualToString:@"status"] && [object isKindOfClass: [MFFilesystem class]])
+        if ([keyPath isEqualToString:@"status"] && [object isKindOfClass: [MFFilesystem class]]
+                && ![[change objectForKey: NSKeyValueChangeOldKey] isEqualToString: [change objectForKey: NSKeyValueChangeNewKey]])
         {
                 MFFilesystem* fs = (MFFilesystem*)object;

trunk/MFCore.h

@@ -40 +40 @@
 // FUSE versioning
 NSString* mfcGetMacFuseVersion();
+
+// Trashing
+void mfcSetupTrashMonitoring();

trunk/MFCore.m

@@ -157 +157 @@
         CFStringRef processName;
         FSRef bundleFSRef;
-        OSErr getBundleError;
-        id runningAgentPath, runningMenulingPath;
+        OSErr error;
+        id runningAgentPath=nil, runningMenulingPath=nil;
         pid_t runningAgentPID, runningMenulingPID;
         
@@ -171 +171 @@
                          [ (NSString*)processName isEqualToString: @"macfusionMenuling"] )
                 {
-                        getBundleError = GetProcessBundleLocation( &currentPSN, &bundleFSRef);
+                        error = GetProcessBundleLocation( &currentPSN, &bundleFSRef);
                         GetProcessPID( &currentPSN , &processPID);
                         
-                        if (getBundleError == noErr)
+                        if (error == noErr)
                         {
                                 CFURLRef bundleURLRef = CFURLCreateFromFSRef( kCFAllocatorDefault, &bundleFSRef);
@@ -207 +207 @@
         {
                 // Agent is in the trash or running from the wrong path. Kill it & restart it.
+                MFLogS( self, @"Killing old or bad agent, and restarting." );
                 kill( runningAgentPID, SIGKILL);
                 mfcLaunchAgent();
@@ -215 +216 @@
         {
                 // Menuling is in the trash or running from the wrong path. Kill it & restart it.
+                MFLogS( self, @"Killing old or bad menuling, and restarting." );
                 kill( runningMenulingPID, SIGKILL );
                 mfcLaunchMenuling();
         }
 }
+
+# pragma mark Trashing
+
+void trashFSEventCallBack(ConstFSEventStreamRef streamRef, 
+                                                  void *clientCallBackInfo, 
+                                                  size_t numEvents, 
+                                                  void *eventPaths, 
+                                                  const FSEventStreamEventFlags eventFlags[], 
+                                                  const FSEventStreamEventId eventIds[])
+{
+        if (![[NSFileManager defaultManager] fileExistsAtPath: mfcMainBundlePath()])
+        {
+                MFLogS(self, @"I have been deleted. Goodbye!");
+                exit(0);
+        }
+}
+
+void mfcSetupTrashMonitoring()
+{
+        FSEventStreamRef eventStream = FSEventStreamCreate( NULL, trashFSEventCallBack, NULL,
+                                                                                                           (CFArrayRef)[NSArray arrayWithObject: 
+                                                                                                                                        [mfcMainBundlePath() stringByDeletingLastPathComponent]],
+                                                                                                           kFSEventStreamEventIdSinceNow,
+                                                                                                           0, kFSEventStreamCreateFlagUseCFTypes );
+        FSEventStreamScheduleWithRunLoop( eventStream,  [[NSRunLoop currentRunLoop] getCFRunLoop],
+                                                                         kCFRunLoopDefaultMode );
+        FSEventStreamStart( eventStream );
+}

trunk/MFFilesystemController.m

@@ -98 +98 @@
                 [self loadRecentFilesystems];
                 [self setUpVolumeMonitoring];
-                MFLogS(self, @"Init complete!");
 
         }

trunk/MFLogReader.m

@@ -75 +75 @@
         [self performSelectorOnMainThread:@selector(addASLEntries:)
                                                    withObject:logMessagesToAdd waitUntilDone:NO];
-        // NSLog(@"Read entries from ASL Done. Added %d", [logMessagesToAdd count]);
 }
 
 - (void)recordASLMessageDict:(NSDictionary*)messageDict
 {
-        // NSLog(@"Processing %@", messageDict);
-        
         [[self mutableArrayValueForKey: @"logMessages"] addObject:
          messageDict];

trunk/MFMainController.h

@@ -16 +16 @@
 
 #import <Cocoa/Cocoa.h>
-#define TEMP_SSHFS_PATH @"/Users/mgorbach/Library/Macfusion/Plugins/SSHFS.bundle"
 
 @interface MFMainController : NSObject {
@@ -24 +23 @@
 + (MFMainController*)sharedController;
 - (void)initialize;
-
-// - (void)loadPlugins;
 @end

trunk/MFMainController.m

@@ -59 +59 @@
 - (void)initialize
 {
+        mfcSetupTrashMonitoring();
         MFPluginController* pluginController = [MFPluginController sharedController];
         [pluginController loadPlugins];

trunk/MFPreferences.m

@@ -158 +158 @@
 - (id)valueForUndefinedKey:(NSString*)key
 {
-        NSLog(@"Value being called");
         return [self getValueForPreference: key];
 }

trunk/MFServerFS.m

@@ -732 +732 @@
 - (void)setStatus:(NSString*)newStatus
 {
-        if (newStatus)
+        if (newStatus && ![newStatus isEqualToString: self.status] )
         {
                 // Hack this a bit so that we can set an error on faliure
                 // Do this only if an error hasn't already been set
                 [statusInfo setObject: newStatus forKey:kMFSTStatusKey ];
-                
-                /*
-                if ([newStatus isEqualToString: kMFStatusFSMounted] )
-                        [self tagMountPoint];
-                 */
                         
                 if( [newStatus isEqualToString: kMFStatusFSFailed] )

trunk/Settings/MFSettingsController.m

@@ -95 +95 @@
 - (BOOL)setup
 {
+        mfcSetupTrashMonitoring();
         if ([client establishCommunication])
         {