Overview
Comment: | Add -[stringWithContentsOfURL:encoding:]. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
d932adccc3afd9930f126d294feca3a8 |
User & Date: | js on 2011-02-17 18:29:09 |
Other Links: | manifest | tags |
Context
2011-02-17
| ||
19:56 | Add +[digestSize] and +[blockSize] to OFHash. check-in: 275744ecd3 user: js tags: trunk | |
18:29 | Add -[stringWithContentsOfURL:encoding:]. check-in: d932adccc3 user: js tags: trunk | |
17:23 | Add support for file:// to OFURL. check-in: 245f519a50 user: js tags: trunk | |
Changes
Modified src/OFString.h from [a14b03c49f] to [71d6e95663].
︙ | ︙ | |||
41 42 43 44 45 46 47 48 49 50 51 52 53 54 | extern size_t of_string_position_to_index(const char*, size_t); extern size_t of_string_index_to_position(const char*, size_t, size_t); #ifdef __cplusplus } #endif @class OFArray; /** * \brief A class for handling strings. */ @interface OFString: OFObject <OFCopying, OFMutableCopying, OFComparing> { char *string; | > | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | extern size_t of_string_position_to_index(const char*, size_t); extern size_t of_string_index_to_position(const char*, size_t, size_t); #ifdef __cplusplus } #endif @class OFArray; @class OFURL; /** * \brief A class for handling strings. */ @interface OFString: OFObject <OFCopying, OFMutableCopying, OFComparing> { char *string; |
︙ | ︙ | |||
146 147 148 149 150 151 152 153 154 155 156 157 158 159 | * \param path The path to the file * \param encoding The encoding of the file * \return A new autoreleased OFString */ + stringWithContentsOfFile: (OFString*)path encoding: (of_string_encoding_t)encoding; /** * Initializes an already allocated OFString from a UTF-8 encoded C string. * * \param str A UTF-8 encoded C string to initialize the OFString with * \return An initialized OFString */ - initWithCString: (const char*)str; | > > > > > > > > > > > > > > > > > > > > | 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 | * \param path The path to the file * \param encoding The encoding of the file * \return A new autoreleased OFString */ + stringWithContentsOfFile: (OFString*)path encoding: (of_string_encoding_t)encoding; /** * Creates a new OFString with the contents of the specified URL, assuming * UTF-8 encoding. * * \param url The URL to the contents for the string * \return A new autoreleased OFString */ + stringWithContentsOfURL: (OFURL*)url; /** * Creates a new OFString with the contents of the specified URL in the * specified encoding. * * \param url The URL to the contents for the string * \param encoding The encoding to assume * \return A new autoreleased OFString */ + stringWithContentsOfURL: (OFURL*)url encoding: (of_string_encoding_t)encoding; /** * Initializes an already allocated OFString from a UTF-8 encoded C string. * * \param str A UTF-8 encoded C string to initialize the OFString with * \return An initialized OFString */ - initWithCString: (const char*)str; |
︙ | ︙ | |||
257 258 259 260 261 262 263 264 265 266 267 268 269 270 | * \param path The path to the file * \param encoding The encoding of the file * \return An initialized OFString */ - initWithContentsOfFile: (OFString*)path encoding: (of_string_encoding_t)encoding; /** * \return The OFString as a UTF-8 encoded C string */ - (const char*)cString; /** * \return The length of the string in Unicode characters | > > > > > > > > > > > > > > > > > > > > | 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 | * \param path The path to the file * \param encoding The encoding of the file * \return An initialized OFString */ - initWithContentsOfFile: (OFString*)path encoding: (of_string_encoding_t)encoding; /** * Initializes an already allocated OFString with the contents of the specified * URL, assuming UTF-8 encoding. * * \param url The URL to the contents for the string * \return An initialized OFString */ - initWithContentsOfURL: (OFURL*)url; /** * Initializes an already allocated OFString with the contents of the specified * URL in the specified encoding. * * \param url The URL to the contents for the string * \param encoding The encoding to assume * \return An initialized OFString */ - initWithContentsOfURL: (OFURL*)url encoding: (of_string_encoding_t)encoding; /** * \return The OFString as a UTF-8 encoded C string */ - (const char*)cString; /** * \return The length of the string in Unicode characters |
︙ | ︙ |
Modified src/OFString.m from [365a738f41] to [b4df8282b2].
︙ | ︙ | |||
30 31 32 33 34 35 36 37 38 39 40 41 42 43 | #else # define madvise(addr, len, advise) #endif #import "OFString.h" #import "OFArray.h" #import "OFFile.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" #import "macros.h" #import "of_asprintf.h" #import "unicode.h" | > > | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | #else # define madvise(addr, len, advise) #endif #import "OFString.h" #import "OFArray.h" #import "OFFile.h" #import "OFURL.h" #import "OFHTTPRequest.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" #import "macros.h" #import "of_asprintf.h" #import "unicode.h" |
︙ | ︙ | |||
303 304 305 306 307 308 309 310 311 312 313 314 315 316 | + stringWithContentsOfFile: (OFString*)path encoding: (of_string_encoding_t)encoding { return [[[self alloc] initWithContentsOfFile: path encoding: encoding] autorelease]; } - init { self = [super init]; @try { string = [self allocMemoryWithSize: 1]; | > > > > > > > > > > > > | 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 | + stringWithContentsOfFile: (OFString*)path encoding: (of_string_encoding_t)encoding { return [[[self alloc] initWithContentsOfFile: path encoding: encoding] autorelease]; } + stringWithContentsOfURL: (OFURL*)url { return [[[self alloc] initWithContentsOfURL: url] autorelease]; } + stringWithContentsOfURL: (OFURL*)url encoding: (of_string_encoding_t)encoding { return [[[self alloc] initWithContentsOfURL: url encoding: encoding] autorelease]; } - init { self = [super init]; @try { string = [self allocMemoryWithSize: 1]; |
︙ | ︙ | |||
628 629 630 631 632 633 634 635 636 637 638 | return [self initWithContentsOfFile: path encoding: OF_STRING_ENCODING_UTF_8]; } - initWithContentsOfFile: (OFString*)path encoding: (of_string_encoding_t)encoding { self = [super init]; @try { OFFile *file; | > > > < < < < < < < < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 | return [self initWithContentsOfFile: path encoding: OF_STRING_ENCODING_UTF_8]; } - initWithContentsOfFile: (OFString*)path encoding: (of_string_encoding_t)encoding { char *tmp; struct stat s; self = [super init]; @try { OFFile *file; if (stat([path cString], &s) == -1) @throw [OFInitializationFailedException newWithClass: isa]; file = [[OFFile alloc] initWithPath: path mode: @"rb"]; @try { tmp = [self allocMemoryWithSize: s.st_size]; [file readExactlyNBytes: s.st_size intoBuffer: tmp]; } @finally { [file release]; } } @catch (id e) { [self release]; @throw e; } self = [self initWithCString: tmp encoding: encoding length: s.st_size]; [self freeMemory: tmp]; return self; } - initWithContentsOfURL: (OFURL*)url { return [self initWithContentsOfURL: url encoding: OF_STRING_ENCODING_UTF_8]; } - initWithContentsOfURL: (OFURL*)url encoding: (of_string_encoding_t)encoding { OFAutoreleasePool *pool; OFHTTPRequest *req; OFHTTPRequestResult *res; Class c; c = isa; [self release]; self = nil; pool = [[OFAutoreleasePool alloc] init]; if ([[url scheme] isEqual: @"file"]) { self = [[c alloc] initWithContentsOfFile: [url path] encoding: encoding]; [pool release]; return self; } req = [OFHTTPRequest request]; [req setURL: url]; res = [req result]; if ([res statusCode] != 200) @throw [OFHTTPRequestFailedException newWithClass: [req class] HTTPRequest: req statusCode: [res statusCode]]; self = [[c alloc] initWithCString: (char*)[[res data] cArray] encoding: encoding length: [[res data] count]]; [pool release]; return self; } - (const char*)cString { return string; } |
︙ | ︙ |
Modified tests/OFStringTests.m from [7424fc4c5b] to [77a4fe93c0].
︙ | ︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 | #include "config.h" #include <stdlib.h> #include <string.h> #import "OFString.h" #import "OFArray.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" #import "TestsAppDelegate.h" static OFString *module = @"OFString"; static OFString* whitespace[] = { | > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | #include "config.h" #include <stdlib.h> #include <string.h> #import "OFString.h" #import "OFArray.h" #import "OFURL.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" #import "TestsAppDelegate.h" static OFString *module = @"OFString"; static OFString* whitespace[] = { |
︙ | ︙ | |||
119 120 121 122 123 124 125 126 127 128 129 130 131 132 | length: 6]) && [s[0] isEqual: @"foo"]) TEST(@"+[stringWithContentsOfFile:encoding]", (s[1] = [OFString stringWithContentsOfFile: @"testfile.txt" encoding: OF_STRING_ENCODING_ISO_8859_1]) && [s[1] isEqual: @"testäöü"]) TEST(@"-[appendCStringWithLength:]", R([s[0] appendCString: "foobarqux" + 3 withLength: 3]) && [s[0] isEqual: @"foobar"]) EXPECT_EXCEPTION(@"Detection of invalid UTF-8 encoding #1", OFInvalidEncodingException, | > > > > > > | 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | length: 6]) && [s[0] isEqual: @"foo"]) TEST(@"+[stringWithContentsOfFile:encoding]", (s[1] = [OFString stringWithContentsOfFile: @"testfile.txt" encoding: OF_STRING_ENCODING_ISO_8859_1]) && [s[1] isEqual: @"testäöü"]) TEST(@"+[stringWithContentsOfURL:encoding]", (s[1] = [OFString stringWithContentsOfURL: [OFURL URLWithString: @"file://testfile.txt"] encoding: OF_STRING_ENCODING_ISO_8859_1]) && [s[1] isEqual: @"testäöü"]) TEST(@"-[appendCStringWithLength:]", R([s[0] appendCString: "foobarqux" + 3 withLength: 3]) && [s[0] isEqual: @"foobar"]) EXPECT_EXCEPTION(@"Detection of invalid UTF-8 encoding #1", OFInvalidEncodingException, |
︙ | ︙ |