Skip to content

Added a convenience method to allow the NSStringEncoding to be passed #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
grasmeyer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added a convenience method to allow the NSStringEncoding to be passed #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
646e03d
Added a convenience method to allow the NSStringEncoding to be passed
grasmeyer Feb 27, 2016
7a56d6a
Merge remote-tracking branch 'upstream/master'
grasmeyer Apr 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions CHCSVParser/CHCSVParser/CHCSVParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,19 @@ typedef NS_OPTIONS(NSUInteger, CHCSVParserOptions) {
*/
+ (instancetype)arrayWithContentsOfDelimitedURL:(NSURL *)fileURL options:(CHCSVParserOptions)options delimiter:(unichar)delimiter error:(NSError *__autoreleasing *)error;

/**
* A convenience constructor to parse a delimited file
*
* @param fileURL The @c NSURL to the delimited file
* @param options A bitwise-OR of @c CHCSVParserOptions to control how parsing should occur
* @param usedEncoding A pointer to an @c NSStringEncoding. A nil value tells CHCSVParser to guess the encoding.
* @param delimiter The delimiter used in the file
* @param error A pointer to an @c NSError*, which will be filled in if parsing fails
*
* @return An @c NSArray of @c NSArrays of @c NSStrings, if parsing succeeds; @c nil otherwise.
*/
+ (instancetype)arrayWithContentsOfDelimitedURL:(NSURL *)fileURL options:(CHCSVParserOptions)options usedEncoding:(inout NSStringEncoding *)usedEncoding delimiter:(unichar)delimiter error:(NSError *__autoreleasing *)error;

/**
* If the receiver is an @c NSArray of @c NSArrays of objects, this will turn it into a comma-delimited string
* Returns the string of CSV, if writing succeeds; @c nil otherwise.
Expand Down
17 changes: 12 additions & 5 deletions CHCSVParser/CHCSVParser/CHCSVParser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,9 +774,9 @@ - (void)parser:(CHCSVParser *)parser didEndLine:(NSUInteger)recordNumber {

@end

NSArray *_CHCSVParserParse(NSInputStream *inputStream, CHCSVParserOptions options, unichar delimiter, NSError *__autoreleasing *error);
NSArray *_CHCSVParserParse(NSInputStream *inputStream, CHCSVParserOptions options, unichar delimiter, NSError *__autoreleasing *error) {
CHCSVParser *parser = [[CHCSVParser alloc] initWithInputStream:inputStream usedEncoding:nil delimiter:delimiter];
NSArray *_CHCSVParserParse(NSInputStream *inputStream, CHCSVParserOptions options, NSStringEncoding *usedEncoding, unichar delimiter, NSError *__autoreleasing *error);
NSArray *_CHCSVParserParse(NSInputStream *inputStream, CHCSVParserOptions options, NSStringEncoding *usedEncoding, unichar delimiter, NSError *__autoreleasing *error) {
CHCSVParser *parser = [[CHCSVParser alloc] initWithInputStream:inputStream usedEncoding:usedEncoding delimiter:delimiter];

BOOL usesFirstLineAsKeys = !!(options & CHCSVParserOptionsUsesFirstLineAsKeys);
_CHCSVAggregator *aggregator = usesFirstLineAsKeys ? [[_CHCSVKeyedAggregator alloc] init] : [[_CHCSVAggregator alloc] init];
Expand Down Expand Up @@ -822,7 +822,14 @@ + (instancetype)arrayWithContentsOfDelimitedURL:(NSURL *)fileURL options:(CHCSVP
NSParameterAssert(fileURL);
NSInputStream *stream = [NSInputStream inputStreamWithURL:fileURL];

return _CHCSVParserParse(stream, options, delimiter, error);
return _CHCSVParserParse(stream, options, nil, delimiter, error);
}

+ (instancetype)arrayWithContentsOfDelimitedURL:(NSURL *)fileURL options:(CHCSVParserOptions)options usedEncoding:(inout NSStringEncoding *)usedEncoding delimiter:(unichar)delimiter error:(NSError *__autoreleasing *)error {
NSParameterAssert(fileURL);
NSInputStream *stream = [NSInputStream inputStreamWithURL:fileURL];

return _CHCSVParserParse(stream, options, usedEncoding, delimiter, error);
}

- (NSString *)CSVString {
Expand Down Expand Up @@ -863,7 +870,7 @@ - (NSArray *)componentsSeparatedByDelimiter:(unichar)delimiter options:(CHCSVPar
NSData *csvData = [self dataUsingEncoding:NSUTF8StringEncoding];
NSInputStream *stream = [NSInputStream inputStreamWithData:csvData];

return _CHCSVParserParse(stream, options, delimiter, error);
return _CHCSVParserParse(stream, options, nil, delimiter, error);
}

@end
Expand Down