Overview
Comment: | utils/ofhttp: Add support for Content-Disposition |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
25d6acad987ca573586dc3adf699e1e6 |
User & Date: | js on 2015-05-20 22:51:39 |
Other Links: | manifest | tags |
Context
2015-05-21
| ||
20:31 | utils/ofhttp: Change some Unicode characters check-in: 50de0da5bc user: js tags: trunk | |
2015-05-20
| ||
22:51 | utils/ofhttp: Add support for Content-Disposition check-in: 25d6acad98 user: js tags: trunk | |
22:26 | OFHTTPClient: Correctly handle keep-alive for HEAD check-in: a8184e90ae user: js tags: trunk | |
Changes
Modified utils/ofhttp/OFHTTP.m from [e352c0cdcc] to [e58ba69867].
︙ | ︙ | |||
50 51 52 53 54 55 56 | @interface OFHTTP: OFObject { OFArray *_URLs; size_t _URLIndex; int _errorCode; OFString *_outputPath; | | | | > | 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | @interface OFHTTP: OFObject { OFArray *_URLs; size_t _URLIndex; int _errorCode; OFString *_outputPath; bool _continue, _detectFileName, _quiet; OFDataArray *_entity; of_http_request_method_t _method; OFMutableDictionary *_clientHeaders; OFHTTPClient *_HTTPClient; char *_buffer; OFStream *_output; intmax_t _received, _length, _resumedFrom; ProgressBar *_progressBar; } @end OF_APPLICATION_DELEGATE(OFHTTP) static void help(OFStream *stream, bool full, int status) { [of_stderr writeFormat: @"Usage: %@ -[cehHmoOPq] url1 [url2 ...]\n", [OFApplication programName]]; if (full) [stream writeString: @"\nOptions:\n" @" -c Continue download of existing file\n" @" -e Specify the file to send as entity\n" @" -h Show this help\n" @" -H Add a header (e.g. X-Foo:Bar)\n" @" -m Set the method of the HTTP request\n" @" -o Specify output file name\n" @" -O Do a HEAD request to detect file name\n" @" -P Specify SOCKS5 proxy\n" @" -q Quiet mode (no output, except errors)\n"]; [OFApplication terminateWithStatus: status]; } @implementation OFHTTP |
︙ | ︙ | |||
199 200 201 202 203 204 205 | [OFApplication terminateWithStatus: 1]; } } - (void)applicationDidFinishLaunching { OFOptionsParser *optionsParser = | | | 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 | [OFApplication terminateWithStatus: 1]; } } - (void)applicationDidFinishLaunching { OFOptionsParser *optionsParser = [OFOptionsParser parserWithOptions: @"ce:hH:m:o:OP:q"]; of_unichar_t option; while ((option = [optionsParser nextOption]) != '\0') { switch (option) { case 'c': _continue = true; break; |
︙ | ︙ | |||
223 224 225 226 227 228 229 230 231 232 233 234 235 236 | case 'm': [self setMethod: [optionsParser argument]]; break; case 'o': [_outputPath release]; _outputPath = [[optionsParser argument] retain]; break; case 'P': [self setProxy: [optionsParser argument]]; break; case 'q': _quiet = true; break; case ':': | > > > | 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 | case 'm': [self setMethod: [optionsParser argument]]; break; case 'o': [_outputPath release]; _outputPath = [[optionsParser argument] retain]; break; case 'O': _detectFileName = true; break; case 'P': [self setProxy: [optionsParser argument]]; break; case 'q': _quiet = true; break; case ':': |
︙ | ︙ | |||
270 271 272 273 274 275 276 277 278 279 280 281 282 283 | { if (!_quiet) [of_stdout writeFormat: @" ➜ %d\n↻ %@", statusCode, [URL string]]; return true; } - (bool)stream: (OFHTTPResponse*)response didReadIntoBuffer: (void*)buffer length: (size_t)length exception: (OFException*)e { if (e != nil) { | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 274 275 276 277 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 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 | { if (!_quiet) [of_stdout writeFormat: @" ➜ %d\n↻ %@", statusCode, [URL string]]; return true; } - (OFHTTPResponse*)performRequest: (OFHTTPRequest*)request { OFHTTPResponse *response = nil; @try { response = [_HTTPClient performRequest: request]; } @catch (OFAddressTranslationFailedException *e) { if (!_quiet) [of_stdout writeString: @"\n"]; [of_stderr writeFormat: @"%@: Failed to download <%@>!\n" @" Address translation failed: %@\n", [OFApplication programName], [[request URL] string], e]; } @catch (OFConnectionFailedException *e) { if (!_quiet) [of_stdout writeString: @"\n"]; [of_stderr writeFormat: @"%@: Failed to download <%@>!\n" @" Connection failed: %@\n", [OFApplication programName], [[request URL] string], e]; } @catch (OFInvalidServerReplyException *e) { if (!_quiet) [of_stdout writeString: @"\n"]; [of_stderr writeFormat: @"%@: Failed to download <%@>!\n" @" Invalid server reply!\n", [OFApplication programName], [[request URL] string]]; } @catch (OFUnsupportedProtocolException *e) { if (!_quiet) [of_stdout writeString: @"\n"]; [of_stderr writeFormat: @"%@: No SSL library loaded!\n" @" In order to download via https, " @"you need to preload an SSL library " @"for ObjFW\n such as ObjOpenSSL!\n", [OFApplication programName]]; } @catch (OFReadOrWriteFailedException *e) { OFString *action = @"Read or write"; if (!_quiet) [of_stdout writeString: @"\n"]; if ([e isKindOfClass: [OFReadFailedException class]]) action = @"Read"; else if ([e isKindOfClass: [OFWriteFailedException class]]) action = @"Write"; [of_stderr writeFormat: @"%@: Failed to download <%@>!\n" @" %@ failed: %@\n", [OFApplication programName], [[request URL] string], action, e]; } @catch (OFHTTPRequestFailedException *e) { if (!_quiet) [of_stdout writeFormat: @" ➜ %d\n", [[e response] statusCode]]; [of_stderr writeFormat: @"%@: Failed to download <%@>!\n", [OFApplication programName], [[request URL] string]]; } if (!_quiet && response != nil) [of_stdout writeFormat: @" ➜ %d\n", [response statusCode]]; return response; } - (OFString*)fileNameFromContentDisposition: (OFString*)contentDisposition { void *pool; const char *UTF8String; size_t UTF8StringLength; enum { DISPOSITION_TYPE, DISPOSITION_TYPE_SEMICOLON, DISPOSITION_PARAM_NAME_SKIP_SPACE, DISPOSITION_PARAM_NAME, DISPOSITION_PARAM_VALUE, DISPOSITION_PARAM_QUOTED, DISPOSITION_EXPECT_SEMICOLON } state; size_t i, last; OFString *type = nil, *paramName = nil, *paramValue; OFMutableDictionary *params; OFString *fileName; if (contentDisposition == nil) return nil; pool = objc_autoreleasePoolPush(); UTF8String = [contentDisposition UTF8String]; UTF8StringLength = [contentDisposition UTF8StringLength]; state = DISPOSITION_TYPE; params = [OFMutableDictionary dictionary]; last = 0; for (i = 0; i < UTF8StringLength; i++) { switch (state) { case DISPOSITION_TYPE: if (UTF8String[i] == ';' || UTF8String[i] == ' ') { type = [OFString stringWithUTF8String: UTF8String length: i]; state = (UTF8String[i] == ';' ? DISPOSITION_PARAM_NAME_SKIP_SPACE : DISPOSITION_TYPE_SEMICOLON); last = i + 1; } break; case DISPOSITION_TYPE_SEMICOLON: if (UTF8String[i] == ';') { state = DISPOSITION_PARAM_NAME_SKIP_SPACE; last = i + 1; } else if (UTF8String[i] != ' ') { objc_autoreleasePoolPop(pool); return nil; } break; case DISPOSITION_PARAM_NAME_SKIP_SPACE: if (UTF8String[i] != ' ') { state = DISPOSITION_PARAM_NAME; last = i; i--; } break; case DISPOSITION_PARAM_NAME: if (UTF8String[i] == '=') { paramName = [OFString stringWithUTF8String: UTF8String + last length: i - last]; state = DISPOSITION_PARAM_VALUE; } break; case DISPOSITION_PARAM_VALUE: if (UTF8String[i] == '"') { state = DISPOSITION_PARAM_QUOTED; last = i + 1; } else { objc_autoreleasePoolPop(pool); return nil; } break; case DISPOSITION_PARAM_QUOTED: if (UTF8String[i] == '"') { paramValue = [OFString stringWithUTF8String: UTF8String + last length: i - last]; [params setObject: paramValue forKey: paramName]; state = DISPOSITION_EXPECT_SEMICOLON; } break; case DISPOSITION_EXPECT_SEMICOLON: if (UTF8String[i] == ';') { state = DISPOSITION_PARAM_NAME_SKIP_SPACE; last = i + 1; } else if (UTF8String[i] != ' ') { objc_autoreleasePoolPop(pool); return nil; } break; } } if (state != DISPOSITION_EXPECT_SEMICOLON) { objc_autoreleasePoolPop(pool); return nil; } if (![type isEqual: @"attachment"] || (fileName = [params objectForKey: @"filename"]) == nil) { objc_autoreleasePoolPop(pool); return nil; } fileName = [fileName lastPathComponent]; [fileName retain]; objc_autoreleasePoolPop(pool); return [fileName autorelease]; } - (bool)stream: (OFHTTPResponse*)response didReadIntoBuffer: (void*)buffer length: (size_t)length exception: (OFException*)e { if (e != nil) { |
︙ | ︙ | |||
331 332 333 334 335 336 337 | { OFString *URLString = nil; OFURL *URL; OFMutableDictionary *clientHeaders; OFHTTPRequest *request; OFHTTPResponse *response; OFDictionary *headers; | | | 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 | { OFString *URLString = nil; OFURL *URL; OFMutableDictionary *clientHeaders; OFHTTPRequest *request; OFHTTPResponse *response; OFDictionary *headers; OFString *fileName = nil, *lengthString, *type; _length = -1; _received = _resumedFrom = 0; if (_output != of_stdout) [_output release]; _output = nil; |
︙ | ︙ | |||
364 365 366 367 368 369 370 371 372 373 374 375 376 | [of_stderr writeFormat: @"%@: Invalid scheme: <%@:>!\n", [OFApplication programName], URLString]; _errorCode = 1; goto next; } if (!_quiet) [of_stdout writeFormat: @"⇣ %@", [URL string]]; if (_outputPath != nil) fileName = _outputPath; | > > > > > > > > > > > > > > > > > > > | > < < | 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 | [of_stderr writeFormat: @"%@: Invalid scheme: <%@:>!\n", [OFApplication programName], URLString]; _errorCode = 1; goto next; } clientHeaders = [[_clientHeaders mutableCopy] autorelease]; if (_detectFileName) { if (!_quiet) [of_stdout writeFormat: @"⁈ %@", [URL string]]; request = [OFHTTPRequest requestWithURL: URL]; [request setHeaders: clientHeaders]; [request setMethod: OF_HTTP_REQUEST_METHOD_HEAD]; if ((response = [self performRequest: request]) == nil) { _errorCode = 1; goto next; } fileName = [self fileNameFromContentDisposition: [[response headers] objectForKey: @"Content-Disposition"]]; } if (!_quiet) [of_stdout writeFormat: @"⇣ %@", [URL string]]; if (_outputPath != nil) fileName = _outputPath; if (fileName == nil) fileName = [[URL path] lastPathComponent]; if (_continue) { @try { of_offset_t size = [OFFile sizeOfFileAtPath: fileName]; OFString *range; if (size > INTMAX_MAX) |
︙ | ︙ | |||
398 399 400 401 402 403 404 | } request = [OFHTTPRequest requestWithURL: URL]; [request setHeaders: clientHeaders]; [request setMethod: _method]; [request setEntity: _entity]; | < | < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 | } request = [OFHTTPRequest requestWithURL: URL]; [request setHeaders: clientHeaders]; [request setMethod: _method]; [request setEntity: _entity]; if ((response = [self performRequest: request]) == nil) { _errorCode = 1; goto next; } headers = [response headers]; lengthString = [headers objectForKey: @"Content-Length"]; type = [headers objectForKey: @"Content-Type"]; if (lengthString != nil) _length = [lengthString decimalValue]; |
︙ | ︙ |