Added the option during batch-write to skip or re-try when a write er…

…ror is encountered
kevinbrewster · Feb 7, 2013 · 6e16405 · 6e16405
1 parent cb19fc9
commit 6e16405
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 15 deletions.
diff --git a/Classes/AppDelegate/AppDelegate.m b/Classes/AppDelegate/AppDelegate.m
@@ -41,7 +41,6 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
     } else{
         [self ORSSerialPortWasDisconnected:nil];
     }
-
 }
 - (void)setView:(NSString*)name
 {

diff --git a/Classes/Controllers/WriteViewController.m b/Classes/Controllers/WriteViewController.m
@@ -18,14 +18,7 @@ @implementation WriteViewController
 - (void)awakeFromNib {
     [super awakeFromNib];
     self.actionButton.title = @"Write";
-
     self.trackString = [NSMutableDictionary dictionary];
-
-    //MSRDevice = 2;
-
-    //[self writeFromURL:@"file://localhost/Users/kevinbrewster/Desktop/good%20codes.txt" withTrack:nil];
-    //[self writeFromURL:[NSURL URLWithString:@"file://localhost/Users/kevinbrewster/Desktop/good%20codes.txt"] withTrack:nil];
-    //[self writeFromURL:[NSURL URLWithString:@"file://localhost/Users/kevinbrewster/Desktop/GoodCodes.csv"] withTrack:nil];
 }
 
 - (void)doAction:(NSButton *)button
@@ -54,14 +47,30 @@ - (void)doAction:(NSButton *)button
             if(data) trackData[key] = data;
         }
     }
+
     [self.MSRDevice writeTrackData:[NSDictionary dictionaryWithDictionary:trackData] withFormat:self.dataFormat andCompletionBlock:^(MSRStatus status) {
         [self endAction:self.actionButton withStatus:status];
 
         if(self.writeQueue.count){
-            self.completedWrites++;
-            [self.writeQueue removeObjectAtIndex:0];
-            if(self.writeQueue.count){
-                [self actionButtonPressed:button];
+            if(status == MagReadWriteOK){
+                self.completedWrites++;
+                [self.writeQueue removeObjectAtIndex:0];
+                if(self.writeQueue.count){
+                    [self actionButtonPressed:button];
+                }
+            } else{
+                // If we are batch-writing cards and one was not successful, give the option to re-try that card or move on
+                NSAlert *alert = [NSAlert alertWithMessageText:[self.MSRDevice statusDescription:status forAction:@"write"]
+                                                 defaultButton:@"Re-Try Card"
+                                               alternateButton:@"Skip This Card"
+                                                   otherButton:nil
+                                     informativeTextWithFormat:@""];
+
+                AppDelegate *appDelegate = (AppDelegate *) [[NSApplication sharedApplication] delegate];
+                [alert beginSheetModalForWindow:appDelegate.window
+                                  modalDelegate:self
+                                 didEndSelector:@selector(batchWriteAlertDidEnd:returnCode:contextInfo:)
+                                    contextInfo:nil];
             }
         }
     }];
@@ -86,6 +95,20 @@ - (void)cancelAction:(NSButton *)button
         [super cancelAction:button];
     }
 }
+- (void)batchWriteAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
+{
+    if(returnCode == NSAlertFirstButtonReturn){
+        // skip card
+        self.completedWrites++;
+        [self.writeQueue removeObjectAtIndex:0];
+        if(self.writeQueue.count){
+            [self actionButtonPressed:self.actionButton];
+        }
+    } else{
+        // re-try card
+        [self actionButtonPressed:self.actionButton];
+    }
+}
 - (void)cancelAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
 {
     if(returnCode == NSAlertFirstButtonReturn){

diff --git a/Classes/Models/MSR206Device.m b/Classes/Models/MSR206Device.m
@@ -321,8 +321,7 @@ - (void)writeTrackData:(NSDictionary *)trackData withFormat:(NSString *)format a
     [dataBlock appendBytes:"\x1B\x73" length:2];
     [dataBlock appendData:cardData];
     [dataBlock appendBytes:"\x3F\x1C" length:2];
-
-
+
     [self sendCommand:dataBlock withStopString:@"\x1B" andStopBytes:@1 andCompletionBlock:^(NSData *response){
         const unsigned char *bytes = [response bytes];
         MSRStatus status = bytes[response.length-1];

diff --git a/Resources/MagStriper-Info.plist b/Resources/MagStriper-Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>4</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>