fixing some issues while importing and better error display

README.markdown

@@ -23,6 +23,7 @@ Just build it, it should work (but let me know if you have an errors or warnings
 - Adding support for full screen in a connection window [issue #175](https://github.com/jeromelebel/MongoHub-Mac/issues/175)
 - Adding a preference for the default sort order in the Find tab [issue #129](https://github.com/jeromelebel/MongoHub-Mac/issues/129)
 - Adding a preference to present keys sorted in the Find tab [issue #77](https://github.com/jeromelebel/MongoHub-Mac/issues/77)
+- Display errors while import/export
 
 **3.1 Beta**
 

Sources/ConnectionWindow/MHConnectionWindowController.m

@@ -582,12 +582,18 @@ @implementation MHConnectionWindowController (ImportExport)
 
 - (void)importerExporterStopNotification:(NSNotification *)notification
 {
-    [NSNotificationCenter.defaultCenter removeObserver:self name:nil object:_importerExporter];
-    [_importerExporter autorelease];
-    _importerExporter = nil;
     [_importExportFeedback close];
     [_importExportFeedback autorelease];
     _importExportFeedback = nil;
+    if (_importerExporter.error) {
+        [self.delegate connectionWindowControllerLogMessage:_importerExporter.error.localizedDescription domain:[NSString stringWithFormat:@"%@.%@", self.connectionStore.alias, _importerExporter.identifier] level:@"error"];
+        NSBeginAlertSheet(_importerExporter.name, @"OK", nil, nil, self.window, nil, nil, nil, nil, @"%@", _importerExporter.error.localizedDescription);
+    } else {
+        [self.delegate connectionWindowControllerLogMessage:[NSString stringWithFormat:@"%lu documents processed", (unsigned long)_importerExporter.documentProcessedCount] domain:[NSString stringWithFormat:@"%@.importexport", self.connectionStore.alias] level:@"error"];
+    }
+    [NSNotificationCenter.defaultCenter removeObserver:self name:nil object:_importerExporter];
+    [_importerExporter autorelease];
+    _importerExporter = nil;
 }
 
 - (void)exportSelectedCollectionToFilePath:(NSString *)filePath

Sources/Exporter-Importer/MHExporterImporter.h

@@ -13,6 +13,9 @@ extern NSString *MHImporterExporterProgressNotification;
 extern NSString *MHImporterExporterNotificationProgressKey;
 
 @protocol MHImporterExporter <NSObject>
-@property (nonatomic, readonly, retain) NSError *error;
+@property (nonatomic, readonly, strong) NSError *error;
+@property (nonatomic, readonly, assign) NSUInteger documentProcessedCount;
+@property (nonatomic, readonly, weak) NSString *name;
+@property (nonatomic, readonly, weak) NSString *identifier;
 
 @end

Sources/Exporter-Importer/MHFileExporter.h

@@ -18,13 +18,14 @@
     int64_t                     _ii;
     NSError                     *_error;
     MODJsonKeySortOrder         _jsonKeySortOrder;
+    NSUInteger                  _documentProcessedCount;
 }
 
 - (instancetype)initWithCollection:(MODCollection *)collection exportPath:(NSString *)exportPath;
 - (void)export;
 
-@property (nonatomic, readonly, retain) NSString *exportPath;
-@property (nonatomic, readonly, retain) MODCollection *collection;
+@property (nonatomic, readonly, strong) NSString *exportPath;
+@property (nonatomic, readonly, strong) MODCollection *collection;
 @property (nonatomic, readwrite, assign) MODJsonKeySortOrder jsonKeySortOrder;
 
 @end

Sources/Exporter-Importer/MHFileExporter.m

@@ -8,7 +8,8 @@
 #import "MHFileExporter.h"
 
 @interface MHFileExporter ()
-@property (nonatomic, readwrite, retain) NSError *error;
+@property (nonatomic, readwrite, strong) NSError *error;
+@property (nonatomic, readwrite, assign) NSUInteger documentProcessedCount;
 
 @end
 
@@ -18,6 +19,7 @@ @implementation MHFileExporter
 @synthesize exportPath = _exportPath;
 @synthesize error = _error;
 @synthesize jsonKeySortOrder = _jsonKeySortOrder;
+@synthesize documentProcessedCount = _documentProcessedCount;
 
 - (instancetype)initWithCollection:(MODCollection *)collection exportPath:(NSString *)exportPath
 {
@@ -57,7 +59,7 @@ - (void)export
             if (step == 0) {
                 step = 1;
             }
-            _ii = 0;
+            self.documentProcessedCount = 0;
 
             cursor = [_collection cursorWithCriteria:nil fields:nil skip:0 limit:0 sort:nil];
             [cursor forEachDocumentWithCallbackDocumentCallback:^(uint64_t index, MODSortedMutableDictionary *document) {
@@ -68,9 +70,9 @@ - (void)export
                 cString = [jsonDocument UTF8String];
                 write(fileDescriptor, cString, strlen(cString));
                 write(fileDescriptor, "\n", 1);
-                _ii++;
-                if (_ii % step) {
-                    [NSNotificationCenter.defaultCenter postNotificationName:MHImporterExporterProgressNotification object:self userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithDouble:(double)_ii / count], MHImporterExporterNotificationProgressKey, nil]];
+                self.documentProcessedCount++;
+                if (self.documentProcessedCount % step) {
+                    [NSNotificationCenter.defaultCenter postNotificationName:MHImporterExporterProgressNotification object:self userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithDouble:(double)self.documentProcessedCount / count], MHImporterExporterNotificationProgressKey, nil]];
                 }
                 return YES;
             } endCallback:^(uint64_t documentCounts, BOOL cursorStopped, MODQuery *mongoQuery) {
@@ -82,4 +84,14 @@ - (void)export
     }
 }
 
+- (NSString *)identifier
+{
+    return @"fileexport";
+}
+
+- (NSString *)name
+{
+    return @"File Export";
+}
+
 @end

Sources/Exporter-Importer/MHFileImporter.h

@@ -15,7 +15,6 @@
     NSString                        *_importPath;
     MODCollection                   *_collection;
     MODQuery                        *_latestQuery;
-    NSUInteger                      _importedDocumentCount;
     NSUInteger                      _fileRead;
 
     NSMutableArray                  *_pendingDocuments;
@@ -24,14 +23,14 @@
     unsigned long long              _fileSize;
     unsigned long long              _dataRead;
     unsigned long long              _dataProcessed;
+    NSUInteger                      _documentProcessedCount;
 }
 
 - (instancetype)initWithCollection:(MODCollection *)collection importPath:(NSString *)importPath;
 - (void)import;
 
-@property (nonatomic, retain, readonly) NSString *importPath;
-@property (nonatomic, retain, readonly) MODCollection *collection;
-@property (nonatomic, assign, readonly) NSUInteger importedDocumentCount;
-@property (nonatomic, assign, readonly) NSUInteger fileRead;
+@property (nonatomic, readonly, strong) NSString *importPath;
+@property (nonatomic, readonly, strong) MODCollection *collection;
+@property (nonatomic, readonly, assign) NSUInteger fileRead;
 
 @end

Sources/Exporter-Importer/MHFileImporter.m

@@ -10,17 +10,23 @@
 #import "MHExporterImporter.h"
 
 @interface MHFileImporter()
-@property (nonatomic, readwrite, retain) NSError *error;
-@property (nonatomic, assign, readwrite) NSUInteger importedDocumentCount;
-@property (nonatomic, assign, readwrite) NSUInteger fileRead;
+@property (nonatomic, readwrite, strong) NSError *error;
+@property (nonatomic, readwrite, assign) NSUInteger documentProcessedCount;
+@property (nonatomic, readwrite, assign) NSUInteger fileRead;
 
-@property (nonatomic, strong, readwrite) NSMutableArray *pendingDocuments;
-@property (nonatomic, assign, readwrite) FILE *fileDescriptor;
+@property (nonatomic, readwrite, strong) NSMutableArray *pendingDocuments;
+@property (nonatomic, readwrite, assign) FILE *fileDescriptor;
 @end
 
 @implementation MHFileImporter
 
-@synthesize collection = _collection, importPath = _importPath, importedDocumentCount = _importedDocumentCount, fileRead = _fileRead, pendingDocuments = _pendingDocuments, fileDescriptor = _fileDescriptor, error = _error;
+@synthesize collection = _collection;
+@synthesize importPath = _importPath;
+@synthesize documentProcessedCount = _documentProcessedCount;
+@synthesize fileRead = _fileRead;
+@synthesize pendingDocuments = _pendingDocuments;
+@synthesize fileDescriptor = _fileDescriptor;
+@synthesize error = _error;
 
 - (instancetype)initWithCollection:(MODCollection *)collection importPath:(NSString *)importPath
 {
@@ -46,7 +52,7 @@ - (void)_appendDocumentToParse:(NSString *)stringDocument flush:(BOOL)flush
         [self.pendingDocuments addObject:stringDocument];
     }
     if (self.pendingDocuments.count >= 100 || (flush && self.pendingDocuments.count > 0)) {
-        NSUInteger importedDocumentCount = self.importedDocumentCount;
+        NSUInteger documentProcessedCount = self.documentProcessedCount;
 
         [_latestQuery waitUntilFinished];
         [_latestQuery release];
@@ -56,12 +62,12 @@ - (void)_appendDocumentToParse:(NSString *)stringDocument flush:(BOOL)flush
                 NSMutableDictionary *userInfo;
 
                 userInfo = [query.error.userInfo.mutableCopy autorelease];
-                [userInfo setObject:[NSNumber numberWithUnsignedInteger:[[userInfo objectForKey:@"documentIndex"] unsignedIntegerValue] + importedDocumentCount] forKey:@"documentIndex"];
+                [userInfo setObject:[NSNumber numberWithUnsignedInteger:[[userInfo objectForKey:@"documentIndex"] unsignedIntegerValue] + documentProcessedCount] forKey:@"documentIndex"];
                 self.error = [NSError errorWithDomain:query.error.domain code:query.error.code userInfo:userInfo];
             }
-            [NSNotificationCenter.defaultCenter postNotificationName:MHImporterExporterProgressNotification object:self userInfo:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithDouble:(double)_dataProcessed / _fileSize], MHImporterExporterNotificationProgressKey, nil]];
+            [self performSelectorOnMainThread:@selector(sendNotification:) withObject:@{ @"name" :MHImporterExporterProgressNotification, @"userinfo": @{ MHImporterExporterNotificationProgressKey: @(_dataProcessed / _fileSize) } } waitUntilDone:NO];
         }] retain];
-        self.importedDocumentCount += self.pendingDocuments.count;
+        self.documentProcessedCount += self.pendingDocuments.count;
         // to avoid changing the content of the array while trying to import all the documents
         // it is better to create a new one (instead of remove all its content)
         self.pendingDocuments = [NSMutableArray array];
@@ -80,7 +86,7 @@ - (void)sendNotification:(NSDictionary *)info
 
 - (void)_threadImport
 {
-    [self performSelectorOnMainThread:@selector(sendNotification:) withObject:[NSDictionary dictionaryWithObjectsAndKeys:MHImporterExporterStartNotification, @"name", nil] waitUntilDone:NO];
+    [self performSelectorOnMainThread:@selector(sendNotification:) withObject:@{ @"name" :MHImporterExporterStartNotification } waitUntilDone:NO];
     _dataRead = 0;
     _fileSize = [[[NSFileManager defaultManager] attributesOfItemAtPath:_importPath error:nil] fileSize];
     self.fileDescriptor = fopen([_importPath fileSystemRepresentation], "r");
@@ -94,13 +100,11 @@ - (void)_threadImport
         self.pendingDocuments = nil;
         fclose(self.fileDescriptor);
         [_latestQuery waitUntilFinished];
-        NSLog(@"%@", self.error);
     }
     if (self.error) {
-        [NSNotificationCenter.defaultCenter postNotificationName:MHImporterExporterStopNotification object:self userInfo:[NSDictionary dictionaryWithObjectsAndKeys:self.error, @"error", nil]];
-        [self performSelectorOnMainThread:@selector(sendNotification:) withObject:[NSDictionary dictionaryWithObjectsAndKeys:MHImporterExporterStopNotification, @"name", [NSDictionary dictionaryWithObjectsAndKeys:self.error, @"error", nil], @"userinfo", nil] waitUntilDone:NO];
+        [self performSelectorOnMainThread:@selector(sendNotification:) withObject:@{ @"name" :MHImporterExporterStopNotification, @"userinfo": @{ @"error": self.error } } waitUntilDone:NO];
     } else {
-        [self performSelectorOnMainThread:@selector(sendNotification:) withObject:[NSDictionary dictionaryWithObjectsAndKeys:MHImporterExporterStopNotification, @"name", nil] waitUntilDone:NO];
+        [self performSelectorOnMainThread:@selector(sendNotification:) withObject:@{ @"name" :MHImporterExporterStopNotification } waitUntilDone:NO];
     }
 }
 
@@ -120,4 +124,14 @@ - (void)_doImport
     [self _appendDocumentToParse:nil flush:YES];
 }
 
+- (NSString *)identifier
+{
+    return @"fileimport";
+}
+
+- (NSString *)name
+{
+    return @"File Import";
+}
+
 @end