Tweaked the thumbnail (icon)

Author: p2

CSVDocument.m

@@ -19,7 +19,7 @@ @implementation CSVDocument
 - (id) init
 {
 	self = [super init];
-	if(nil != self) {
+	if (nil != self) {
 		self.separator = @",";
 	}
 
@@ -54,20 +54,20 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
 	NSUInteger numRows = 0;
 
 	// String is non-empty
-	if([string length] > 0) {
+	if ([string length] > 0) {
 		NSMutableArray *thisRows = [NSMutableArray array];
 		NSMutableArray *thisColumnKeys = [NSMutableArray array];
 
 		// Check whether the file uses ";" or TAB as separator by comparing relative occurrences in the first 200 chars
-		if(autoDetectSeparator) {
+		if (autoDetectSeparator) {
 			self.separator = @",";
 
 			NSUInteger testStringLength = ([string length] > 200) ? 200 : [string length];
 			NSString *testString = [string substringToIndex:testStringLength];
 			NSArray *possSeparators = [NSArray arrayWithObjects:@";", @"	", nil];
 
-			for(NSString *s in possSeparators) {
-				if([[testString componentsSeparatedByString:s] count] > [[testString componentsSeparatedByString:separator] count]) {
+			for (NSString *s in possSeparators) {
+				if ([[testString componentsSeparatedByString:s] count] > [[testString componentsSeparatedByString:separator] count]) {
 					self.separator = s;
 				}
 			}
@@ -87,6 +87,7 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
 		BOOL insideQuotes = NO;				// needed to determine whether we're inside doublequotes
 		BOOL finishedRow = NO;				// used for the inner while loop
 		BOOL isNewColumn = NO;
+		BOOL skipWhitespace = (NSNotFound == [separator rangeOfCharacterFromSet:[NSCharacterSet whitespaceCharacterSet]].location);
 		NSMutableDictionary *columns = nil;
 		NSMutableString *currentCellString = [NSMutableString string];
 		NSUInteger colIndex = 0;
@@ -106,7 +107,7 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
 			while(!finishedRow) {
 				NSString *tempString;
 				NSString *colKey;
-				if([thisColumnKeys count] > colIndex) {
+				if ([thisColumnKeys count] > colIndex) {
 					colKey = [thisColumnKeys objectAtIndex:colIndex];
 					isNewColumn = NO;
 				}
@@ -117,25 +118,25 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
 
 
 				// Scan characters into our string
-				if([scanner scanUpToCharactersFromSet:importantCharactersSet intoString:&tempString] ) {
+				if ([scanner scanUpToCharactersFromSet:importantCharactersSet intoString:&tempString] ) {
 					[currentCellString appendString:tempString];
 				}
 
 
 				// found the separator
-				if([scanner scanString:separator intoString:NULL]) {
-					if(insideQuotes) {		// Separator character inside double quotes
+				if ([scanner scanString:separator intoString:NULL]) {
+					if (insideQuotes) {		// Separator character inside double quotes
 						[currentCellString appendString:separator];
 					}
 					else {					// This is a column separating comma
 						[columns setObject:[currentCellString copy] forKey:colKey];
-						if(isNewColumn) {
+						if (isNewColumn) {
 							[thisColumnKeys addObject:colKey];
 						}
 
 						// on to the next column/cell!
 						[currentCellString setString:@""];
-						if (NSNotFound == [separator rangeOfCharacterFromSet:[NSCharacterSet whitespaceCharacterSet]].location) {
+						if (skipWhitespace) {
 							[scanner scanCharactersFromSet:[NSCharacterSet whitespaceCharacterSet] intoString:NULL];
 						}
 						colIndex++;
@@ -144,8 +145,8 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
 
 
 				// found a doublequote (")
-				else if([scanner scanString:@"\"" intoString:NULL]) {
-					if(insideQuotes && [scanner scanString:@"\"" intoString:NULL]) { // Replace double - doublequotes with a single doublequote in our string.
+				else if ([scanner scanString:@"\"" intoString:NULL]) {
+					if (insideQuotes && [scanner scanString:@"\"" intoString:NULL]) { // Replace double - doublequotes with a single doublequote in our string.
 						[currentCellString appendString:@"\""]; 
 					}
 					else {					// Start or end of a quoted string.
@@ -155,13 +156,13 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
 
 
 				// found a newline
-				else if([scanner scanCharactersFromSet:newlineCharacterSet intoString:&tempString]) {
-					if(insideQuotes) {		// We're inside quotes - add line break to column text
+				else if ([scanner scanCharactersFromSet:newlineCharacterSet intoString:&tempString]) {
+					if (insideQuotes) {		// We're inside quotes - add line break to column text
 						[currentCellString appendString:tempString];
 					}
 					else {					// End of row
 						[columns setObject:[currentCellString copy] forKey:colKey];
-						if(isNewColumn) {
+						if (isNewColumn) {
 							[thisColumnKeys addObject:colKey];
 						}
 
@@ -171,9 +172,9 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
 
 
 				// found the end
-				else if([scanner isAtEnd]) {
+				else if ([scanner isAtEnd]) {
 					[columns setObject:[currentCellString copy] forKey:colKey];
-					if(isNewColumn) {
+					if (isNewColumn) {
 						[thisColumnKeys addObject:colKey];
 					}
 
@@ -183,13 +184,13 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
 
 
 			// one row scanned - add to the lines array
-			if([columns count] > 0) {
+			if ([columns count] > 0) {
 				CSVRowObject *newRow = [CSVRowObject rowFromDict:columns];
 				[thisRows addObject:newRow];
 			}
 
 			numRows++;
-			if((maxRows > 0) && (numRows > maxRows)) {
+			if ((maxRows > 0) && (numRows > maxRows)) {
 				break;
 			}
 		}
@@ -200,7 +201,7 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
 	}
 
 	// empty string
-	else if(nil != error) {
+	else if (nil != error) {
 		NSDictionary *errorDict = [NSDictionary dictionaryWithObject:@"Cannot parse an empty string" forKey:@"userInfo"];
 		*error = [NSError errorWithDomain:NSCocoaErrorDomain code:1 userInfo:errorDict];
 	}
@@ -214,7 +215,7 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
 #pragma mark Document Properties
 - (BOOL) isFirstColumn:(NSString *)columnKey
 {
-	if((nil != columnKeys) && ([columnKeys count] > 0)) {
+	if ((nil != columnKeys) && ([columnKeys count] > 0)) {
 		return [columnKey isEqualToString:[columnKeys objectAtIndex:0]];
 	}
 

CSVRowObject.m

@@ -25,7 +25,7 @@ + (CSVRowObject *) rowFromDict:(NSMutableDictionary *)dict
 {
 	CSVRowObject *row = [CSVRowObject row];
 
-	if(dict) {
+	if (dict) {
 		row.columns = dict;
 	}
 
@@ -47,7 +47,7 @@ - (NSString *) columns:(NSArray *)columnKeys combinedByString:(NSString *)sepStr
 {
 	NSString *rowString = nil;
 
-	if((nil != columnKeys) && (nil != columns)) {
+	if ((nil != columnKeys) && (nil != columns)) {
 		rowString = [[columns objectsForKeys:columnKeys notFoundMarker:@""] componentsJoinedByString:sepString];
 	}
 
@@ -58,7 +58,7 @@ - (NSString *) columnForKey:(NSString *)columnKey
 {
 	NSString *cellString = nil;
 
-	if((nil != columnKey) && (nil != columns)) {
+	if ((nil != columnKey) && (nil != columns)) {
 		cellString = [columns objectForKey:columnKey];
 	}
 

English.lproj/InfoPlist.strings

@@ -39,13 +39,13 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
 	NSString *fileString = [NSString stringWithContentsOfURL:myURL usedEncoding:&stringEncoding error:&theErr];
 
 	// We could not open the file, probably unknown encoding; try ISO-8859-1
-	if(nil == fileString) {
+	if (nil == fileString) {
 		stringEncoding = NSISOLatin1StringEncoding;
 		fileString = [NSString stringWithContentsOfURL:myURL encoding:stringEncoding error:&theErr];
 
 		// Still no success, give up
-		if(nil == fileString) {
-			if(nil != theErr) {
+		if (nil == fileString) {
+			if (nil != theErr) {
 				NSLog(@"Error opening the file: %@", theErr);
 			}
 
@@ -56,14 +56,14 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
 
 
 	// Parse the data if still interested in the preview
-	if(false == QLPreviewRequestIsCancelled(preview)) {
+	if (false == QLPreviewRequestIsCancelled(preview)) {
 		CSVDocument *csvDoc = [CSVDocument csvDoc];
 		csvDoc.autoDetectSeparator = YES;
 		NSUInteger numRowsParsed = [csvDoc numRowsFromCSVString:fileString maxRows:MAX_ROWS error:NULL];
 
 
 		// Create HTML of the data if still interested in the preview
-		if(false == QLPreviewRequestIsCancelled(preview)) {
+		if (false == QLPreviewRequestIsCancelled(preview)) {
 			NSBundle *myBundle = [NSBundle bundleForClass:[CSVDocument class]];
 
 			NSString *cssPath = [myBundle pathForResource:@"Style" ofType:@"css"];
@@ -77,7 +77,7 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
 			[html appendString:@"<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\"><head>\n"];
 			[html appendFormat:@"<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%s\" />\n", htmlReadableFileEncoding(stringEncoding)];
 			[html appendString:@"<style>\n"];
-			if(nil != css) {
+			if (nil != css) {
 				[html appendString:css];
 				[css release];
 			}
@@ -90,7 +90,7 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
 
 			// add the table rows
 			BOOL altRow = NO;
-			for(CSVRowObject *row in csvDoc.rows) {
+			for (CSVRowObject *row in csvDoc.rows) {
 				[html appendFormat:@"<tr%@><td>", altRow ? @" class=\"alt_row\"" : @""];
 				[html appendString:[row columns:csvDoc.columnKeys combinedByString:@"</td><td>"]];
 				[html appendString:@"</td></tr>\n"];
@@ -101,7 +101,7 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
 			[html appendString:@"</table>\n"];
 
 			// not all rows were parsed, show hint
-			if(numRowsParsed > MAX_ROWS) {
+			if (numRowsParsed > MAX_ROWS) {
 				NSString *rowsHint = [NSString stringWithFormat:NSLocalizedString(@"Only the first %i rows are being displayed", nil), MAX_ROWS];
 				[html appendFormat:@"<div class=\"truncated_rows\">%@</div>", rowsHint];
 			}
@@ -131,24 +131,24 @@ void CancelPreviewGeneration(void* thisInterface, QLPreviewRequestRef preview)
 // to be used for the generated HTML
 static char* htmlReadableFileEncoding(NSStringEncoding stringEncoding)
 {
-	if(NSUTF8StringEncoding == stringEncoding ||
+	if (NSUTF8StringEncoding == stringEncoding ||
 	   NSUnicodeStringEncoding == stringEncoding) {
 		return "utf-8";
 	}
-	if(NSASCIIStringEncoding == stringEncoding) {
+	if (NSASCIIStringEncoding == stringEncoding) {
 		return "ascii";
 	}
-	if(NSISOLatin1StringEncoding == stringEncoding) {
+	if (NSISOLatin1StringEncoding == stringEncoding) {
 		return "iso-8859-1";
 	}
-	if(NSMacOSRomanStringEncoding == stringEncoding) {
+	if (NSMacOSRomanStringEncoding == stringEncoding) {
 		return "x-mac-roman";
 	}
-	if(NSUTF16BigEndianStringEncoding == stringEncoding ||
+	if (NSUTF16BigEndianStringEncoding == stringEncoding ||
 	   NSUTF16LittleEndianStringEncoding == stringEncoding) {
 		return "utf-16";
 	}
-	if(NSUTF32StringEncoding == stringEncoding ||
+	if (NSUTF32StringEncoding == stringEncoding ||
 	   NSUTF32BigEndianStringEncoding == stringEncoding ||
 	   NSUTF32LittleEndianStringEncoding == stringEncoding) {
 		return "utf-32";
@@ -160,24 +160,24 @@ void CancelPreviewGeneration(void* thisInterface, QLPreviewRequestRef preview)
 
 static char* humanReadableFileEncoding(NSStringEncoding stringEncoding)
 {
-	if(NSUTF8StringEncoding == stringEncoding ||
+	if (NSUTF8StringEncoding == stringEncoding ||
 	   NSUnicodeStringEncoding == stringEncoding) {
 		return "UTF-8";
 	}
-	if(NSASCIIStringEncoding == stringEncoding) {
+	if (NSASCIIStringEncoding == stringEncoding) {
 		return "ASCII-text";
 	}
-	if(NSISOLatin1StringEncoding == stringEncoding) {
+	if (NSISOLatin1StringEncoding == stringEncoding) {
 		return "ISO-8859-1";
 	}
-	if(NSMacOSRomanStringEncoding == stringEncoding) {
+	if (NSMacOSRomanStringEncoding == stringEncoding) {
 		return "Mac-Roman";
 	}
-	if(NSUTF16BigEndianStringEncoding == stringEncoding ||
+	if (NSUTF16BigEndianStringEncoding == stringEncoding ||
 	   NSUTF16LittleEndianStringEncoding == stringEncoding) {
 		return "UTF-16";
 	}
-	if(NSUTF32StringEncoding == stringEncoding ||
+	if (NSUTF32StringEncoding == stringEncoding ||
 	   NSUTF32BigEndianStringEncoding == stringEncoding ||
 	   NSUTF32LittleEndianStringEncoding == stringEncoding) {
 		return "UTF-32";
@@ -188,7 +188,7 @@ void CancelPreviewGeneration(void* thisInterface, QLPreviewRequestRef preview)
 
 
 static char* formatFilesize(float bytes) {
-	if(bytes < 1) {
+	if (bytes < 1) {
 		return "";
 	}
 
@@ -199,7 +199,7 @@ void CancelPreviewGeneration(void* thisInterface, QLPreviewRequestRef preview)
 		bytes /= 1024;
 		i++;
 
-		if(i >= 5) {		// we most likely won't end up here, but let's be sure
+		if (i >= 5) {		// we most likely won't end up here, but let's be sure
 			break;
 		}
 	}