Can also handle TAB delimiters

Author: p2

CSVDocument.h

@@ -14,12 +14,16 @@
 	NSString *separator;
 	NSArray *rows;
 	NSArray *columnKeys;
+	
+	BOOL autoDetectSeparator;
 }
 
 @property (nonatomic, retain) NSString *separator;
 @property (nonatomic, retain) NSArray *rows;
 @property (nonatomic, retain) NSArray *columnKeys;
 
+@property (nonatomic, assign) BOOL autoDetectSeparator;
+
 + (CSVDocument *) csvDoc;
 - (NSUInteger) numRowsFromCSVString:(NSString *)string error:(NSError **)error;
 - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRows error:(NSError **)error;

CSVDocument.m

@@ -13,7 +13,7 @@
 
 @implementation CSVDocument
 
-@synthesize separator, rows, columnKeys;
+@synthesize separator, rows, columnKeys, autoDetectSeparator;
 
 
 - (id) init
@@ -58,12 +58,18 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
 		NSMutableArray *thisRows = [NSMutableArray array];
 		NSMutableArray *thisColumnKeys = [NSMutableArray array];
 
-		// Check whether the file uses ";" as separator
-		if(![separator isEqualToString:@";"]) {
-			NSUInteger testStringLength = ([string length] > 100) ? 100 : [string length];
+		// Check whether the file uses ";" or TAB as separator by comparing relative occurrences in the first 200 chars
+		if(autoDetectSeparator) {
+			self.separator = @",";
+			
+			NSUInteger testStringLength = ([string length] > 200) ? 200 : [string length];
 			NSString *testString = [string substringToIndex:testStringLength];
-			if([[testString componentsSeparatedByString:@";"] count] > [[testString componentsSeparatedByString:separator] count]) {
-				self.separator = @";";
+			NSArray *possSeparators = [NSArray arrayWithObjects:@";", @"	", nil];
+			
+			for(NSString *s in possSeparators) {
+				if([[testString componentsSeparatedByString:s] count] > [[testString componentsSeparatedByString:separator] count]) {
+					self.separator = s;
+				}
 			}
 		}
 

GeneratePreviewForURL.m

@@ -58,6 +58,7 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
 	// Parse the data if still interested in the preview
 	if(false == QLPreviewRequestIsCancelled(preview)) {
 		CSVDocument *csvDoc = [CSVDocument csvDoc];
+		csvDoc.autoDetectSeparator = YES;
 		NSUInteger numRowsParsed = [csvDoc numRowsFromCSVString:fileString maxRows:MAX_ROWS error:NULL];
 
 
@@ -106,6 +107,7 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
 			}
 			[html appendString:@"</html>"];
 
+			// feed the HTML
 			CFDictionaryRef properties = (CFDictionaryRef)[NSDictionary dictionary];
 			QLPreviewRequestSetDataRepresentation(preview,
 												  (CFDataRef)[html dataUsingEncoding:stringEncoding],
@@ -196,9 +198,10 @@ void CancelPreviewGeneration(void* thisInterface, QLPreviewRequestRef preview)
 	while(bytes > 1000) {
 		bytes /= 1024;
 		i++;
-	}
-	if(i > 5) {		// we won't end up here anyway, but let's be sure
-		i = 5;
+		
+		if(i >= 5) {		// we most likely won't end up here, but let's be sure
+			break;
+		}
 	}
 
 	char formatString[9];

GenerateThumbnailForURL.m

@@ -55,6 +55,7 @@ OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thum
 		NSUInteger numRows = ceilf(THUMB_SIZE / rowHeight);
 
 		CSVDocument *csvDoc = [CSVDocument csvDoc];
+		csvDoc.autoDetectSeparator = YES;
 		NSUInteger gotRows = [csvDoc numRowsFromCSVString:fileString maxRows:numRows error:NULL];
 
 
@@ -67,7 +68,7 @@ OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thum
 			CGContextRef context = createRGBABitmapContext(maxBounds.size);
 			//CGContextRef context = createVectorContext(maxBounds.size);
 			if(context) {
-				CGPDFContextBeginPage(context, NULL);
+				//CGPDFContextBeginPage(context, NULL);
 
 				// Flip CoreGraphics coordinate system
 				CGContextScaleCTM(context, 1.0, -1.0);
@@ -176,12 +177,13 @@ OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thum
 					}
 				}
 
+				//CGPDFContextEndPage(context);
+				
 				CGColorRelease(borderColor);
 				CGColorRelease(rowBG);
 				CGColorRelease(altRowBG);
 
 				// Create a CGImage
-				CGPDFContextEndPage(context);
 				CGImageRef fullImage = CGBitmapContextCreateImage(context);
 				CGImageRef usedImage = CGImageCreateWithImageInRect(fullImage, usedBounds);
 				CGImageRelease(fullImage);
@@ -217,17 +219,17 @@ OSStatus GenerateThumbnailForURL(void *thisInterface, QLThumbnailRequestRef thum
 																							   badgeColor, NSForegroundColorAttributeName,
 																							   badgeShadow, NSShadowAttributeName, nil];
 					NSSize badgeSize = [badgeString sizeWithAttributes:badgeAttributes];
-					NSRect badgeRect = NSMakeRect((usedBounds.size.width / 2) - (badgeSize.width / 2), 0.25 * badgeFontSize, 0.0, 0.0);
+					NSRect badgeRect = NSMakeRect((usedBounds.size.width / 2) - (badgeSize.width / 2), 0.2 * badgeFontSize, 0.0, 0.0);
 					badgeRect.size = badgeSize;
 
 					[badgeString drawWithRect:badgeRect options:NSStringDrawingUsesLineFragmentOrigin attributes:badgeAttributes];
 				}
 
 
 				// Clean up
-				CGContextRelease(context);
 				QLThumbnailRequestFlushContext(thumbnail, thumbContext);
 				CGContextRelease(thumbContext);
+				CGContextRelease(context);
 			}
 		}
 	}