Differences From Artifact [c4c7ef8326]:
- File
utils/ofhttp/OFHTTP.m
— part of check-in
[064dbe5127]
at
2018-12-11 22:57:46
on branch trunk
— Include an exception in delegate methods
Otherwise, there would be two methods for every operation: One for
success and one for failure. It also makes it easy to forget about
handling failure, so it's better to always pass an optional exception. (user: js, size: 26963) [annotate] [blame] [check-ins using]
To Artifact [5aba4f761b]:
- File
utils/ofhttp/OFHTTP.m
— part of check-in
[eaf458c1e6]
at
2018-12-21 21:39:47
on branch trunk
— Remove context from OFHTTPClientDelegate
It was not very useful as for any OFHTTPClient there can only be one
active request. (user: js, size: 26839) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
56 57 58 59 60 61 62 |
@interface OFHTTP: OFObject <OFApplicationDelegate, OFHTTPClientDelegate,
OFStreamDelegate>
{
OFArray OF_GENERIC(OFString *) *_URLs;
size_t _URLIndex;
int _errorCode;
OFString *_outputPath, *_currentFileName;
| | | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 |
@interface OFHTTP: OFObject <OFApplicationDelegate, OFHTTPClientDelegate,
OFStreamDelegate>
{
OFArray OF_GENERIC(OFString *) *_URLs;
size_t _URLIndex;
int _errorCode;
OFString *_outputPath, *_currentFileName;
bool _continue, _force, _detectFileName, _detectFileNameRequest;
bool _detectedFileName, _quiet, _verbose, _insecure;
OFStream *_body;
of_http_request_method_t _method;
OFMutableDictionary *_clientHeaders;
OFHTTPClient *_HTTPClient;
char *_buffer;
OFStream *_output;
intmax_t _received, _length, _resumedFrom;
|
| ︙ | ︙ | |||
511 512 513 514 515 516 517 | [self performSelector: @selector(downloadNextURL) afterDelay: 0]; } - (void)client: (OFHTTPClient *)client didCreateSocket: (OF_KINDOF(OFTCPSocket *))sock request: (OFHTTPRequest *)request | < < < | 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 |
[self performSelector: @selector(downloadNextURL)
afterDelay: 0];
}
- (void)client: (OFHTTPClient *)client
didCreateSocket: (OF_KINDOF(OFTCPSocket *))sock
request: (OFHTTPRequest *)request
{
if (_insecure && [sock respondsToSelector:
@selector(setCertificateVerificationEnabled:)])
[sock setCertificateVerificationEnabled: false];
}
- (void)client: (OFHTTPClient *)client
wantsRequestBody: (OFStream *)body
request: (OFHTTPRequest *)request
{
/* TODO: Do asynchronously and print status */
while (![_body isAtEndOfStream]) {
char buffer[4096];
size_t length;
length = [_body readIntoBuffer: buffer
length: 4096];
[body writeBuffer: buffer
length: length];
}
}
- (bool)client: (OFHTTPClient *)client
shouldFollowRedirect: (OFURL *)URL
statusCode: (int)statusCode
request: (OFHTTPRequest *)request
response: (OFHTTPResponse *)response
{
if (_verbose) {
void *pool = objc_autoreleasePoolPush();
OFDictionary OF_GENERIC(OFString *, OFString *) *headers =
[response headers];
OFEnumerator *keyEnumerator = [headers keyEnumerator];
OFEnumerator *objectEnumerator =
|
| ︙ | ︙ | |||
565 566 567 568 569 570 571 | if (!_quiet) [of_stdout writeFormat: @"☇ %@", [URL string]]; return true; } | | | | < | 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 |
if (!_quiet)
[of_stdout writeFormat: @"☇ %@", [URL string]];
return true;
}
- (void)client: (OFHTTPClient *)client
didFailWithException: (id)e
request: (OFHTTPRequest *)request
{
if ([e isKindOfClass: [OFResolveHostFailedException class]]) {
if (!_quiet)
[of_stdout writeString: @"\n"];
[of_stderr writeLine:
OF_LOCALIZED(@"download_failed_resolve_host_failed",
|
| ︙ | ︙ | |||
711 712 713 714 715 716 717 | return true; } - (void)client: (OFHTTPClient *)client didReceiveHeaders: (OFDictionary OF_GENERIC(OFString *, OFString *) *)headers statusCode: (int)statusCode request: (OFHTTPRequest *)request | < | 707 708 709 710 711 712 713 714 715 716 717 718 719 720 |
return true;
}
- (void)client: (OFHTTPClient *)client
didReceiveHeaders: (OFDictionary OF_GENERIC(OFString *, OFString *) *)headers
statusCode: (int)statusCode
request: (OFHTTPRequest *)request
{
if (!_quiet) {
OFString *lengthString =
[headers objectForKey: @"Content-Length"];
OFString *type = [headers objectForKey: @"Content-Type"];
[of_stdout writeFormat: @" ➜ %d\n", statusCode];
|
| ︙ | ︙ | |||
801 802 803 804 805 806 807 | } } } - (void)client: (OFHTTPClient *)client didPerformRequest: (OFHTTPRequest *)request response: (OFHTTPResponse *)response | < | | 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 |
}
}
}
- (void)client: (OFHTTPClient *)client
didPerformRequest: (OFHTTPRequest *)request
response: (OFHTTPResponse *)response
{
if (_detectFileNameRequest) {
_currentFileName = [fileNameFromContentDisposition(
[[response headers] objectForKey: @"Content-Disposition"])
copy];
_detectedFileName = true;
/* Handle this URL on the next -[downloadNextURL] call */
_URLIndex--;
|
| ︙ | ︙ | |||
926 927 928 929 930 931 932 | if (!_quiet) [of_stdout writeFormat: @"⠒ %@", [URL string]]; request = [OFHTTPRequest requestWithURL: URL]; [request setHeaders: clientHeaders]; [request setMethod: OF_HTTP_REQUEST_METHOD_HEAD]; | > | < | 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 | if (!_quiet) [of_stdout writeFormat: @"⠒ %@", [URL string]]; request = [OFHTTPRequest requestWithURL: URL]; [request setHeaders: clientHeaders]; [request setMethod: OF_HTTP_REQUEST_METHOD_HEAD]; _detectFileNameRequest = true; [_HTTPClient asyncPerformRequest: request]; return; } [_currentFileName release]; _currentFileName = nil; _detectedFileName = false; |
| ︙ | ︙ | |||
967 968 969 970 971 972 973 | } } request = [OFHTTPRequest requestWithURL: URL]; [request setHeaders: clientHeaders]; [request setMethod: _method]; | > | < | 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 | } } request = [OFHTTPRequest requestWithURL: URL]; [request setHeaders: clientHeaders]; [request setMethod: _method]; _detectFileNameRequest = false; [_HTTPClient asyncPerformRequest: request]; return; next: [self performSelector: @selector(downloadNextURL) afterDelay: 0]; } @end |