Changeset 1313

Timestamp:

08/21/10 20:40:52 (21 months ago)

Author:

gbooker

Message:

If all importer is run and returns result without backgrounding, informer should be told.

Files:

• trunk/SapphireFrappliance/FRAppliance/SapphireImportHelper.m (modified) (2 diffs)

trunk/SapphireFrappliance/FRAppliance/SapphireImportHelper.m

@@ -108 +108 @@
                 [serverobj setClient:(SapphireImportHelperClient *)shared];
                 server = serverobj;
-                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(connectionDidDie:) name:NSConnectionDidDieNotification object:nil];           
+                [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(connectionDidDie:) name:NSConnectionDidDieNotification object:nil];
         }
         @catch (NSException * e) {
+                [SapphireApplianceController logException:e];
                 keepRunning = NO;
         }
@@ -305 +306 @@
 - (void)importAllData:(SapphireFileMetaData *)file inform:(id <SapphireImporterBackgroundProtocol>)inform;
 {
-        [informers setObject:inform forKey:[file path]];
-        [allImporter importMetaData:file path:[file path]];
+        NSString *path = [file path];
+        [informers setObject:inform forKey:path];
+        ImportState result = [allImporter importMetaData:file path:[file path]];
+        switch (result) {
+                case ImportStateNotUpdated:
+                case ImportStateUpdated:
+                        [inform informComplete:result == ImportStateUpdated onPath:path];
+                        [informers removeObjectForKey:path];
+                        break;
+                default:
+                        break;
+        }
 }