Differences From Artifact [661d5ad21b]:
- File utils/ofhttp/OFHTTP.m — part of check-in [c554cd71da] at 2018-11-04 20:46:15 on branch trunk — ofhttp: Use OFSandbox's new unveiling (user: js, size: 26992) [annotate] [blame] [check-ins using]
To Artifact [31817d3b24]:
- File
utils/ofhttp/OFHTTP.m
— part of check-in
[d16ad96cbd]
at
2018-12-07 01:33:47
on branch trunk
— OFStream: Use a delegate for async operations
The target / selector approach had several drawbacks:
* It was inconvenient to use, as for every read or write, a target,
selector and context would need to be specified.
* It lacked any kind of type-safety and would not even warn about using
a callback method with the wrong number of parameters.
* It encouraged using a different callback method for each read or
write call, which results in code that is hard to follow and also
slower (as it needs to recreate the async operation with a new
callback every time). (user: js, size: 26966) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
49 50 51 52 53 54 55 | #import "ProgressBar.h" #define GIBIBYTE (1024 * 1024 * 1024) #define MEBIBYTE (1024 * 1024) #define KIBIBYTE (1024) | | > | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 |
#import "ProgressBar.h"
#define GIBIBYTE (1024 * 1024 * 1024)
#define MEBIBYTE (1024 * 1024)
#define KIBIBYTE (1024)
@interface OFHTTP: OFObject <OFApplicationDelegate, OFHTTPClientDelegate,
OFStreamDelegate>
{
OFArray OF_GENERIC(OFString *) *_URLs;
size_t _URLIndex;
int _errorCode;
OFString *_outputPath, *_currentFileName;
bool _continue, _force, _detectFileName, _detectedFileName;
bool _quiet, _verbose, _insecure;
|
| ︙ | ︙ | |||
648 649 650 651 652 653 654 | } else @throw e; [self performSelector: @selector(downloadNextURL) afterDelay: 0]; } | | < < < < < < < < < < < < < < < < < < < < < < < < < | > > | | > > > > > > > > > > > > > > > > > > > > > > < | 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 |
} else
@throw e;
[self performSelector: @selector(downloadNextURL)
afterDelay: 0];
}
- (bool)stream: (OF_KINDOF(OFStream *))response
didReadIntoBuffer: (void *)buffer
length: (size_t)length
{
_received += length;
[_output writeBuffer: buffer
length: length];
[_progressBar setReceived: _received];
if ([response isAtEndOfStream] ||
(_length >= 0 && _received >= _length)) {
[_progressBar stop];
[_progressBar draw];
[_progressBar release];
_progressBar = nil;
if (!_quiet) {
[of_stdout writeString: @"\n "];
[of_stdout writeLine:
OF_LOCALIZED(@"download_done", @"Done!")];
}
[self performSelector: @selector(downloadNextURL)
afterDelay: 0];
return false;
}
return true;
}
- (void)stream: (OF_KINDOF(OFStream *))response
didFailWithException: (id)exception
{
OFString *URL;
[_progressBar stop];
[_progressBar draw];
[_progressBar release];
_progressBar = nil;
if (!_quiet)
[of_stdout writeString: @"\n Error!\n"];
URL = [_URLs objectAtIndex: _URLIndex - 1];
[of_stderr writeLine: OF_LOCALIZED(
@"download_failed_exception",
@"%[prog]: Failed to download <%[url]>: %[exception]",
@"prog", [OFApplication programName],
@"url", URL,
@"exception", exception)];
_errorCode = 1;
[self performSelector: @selector(downloadNextURL)
afterDelay: 0];
}
- (void)client: (OFHTTPClient *)client
didReceiveHeaders: (OFDictionary OF_GENERIC(OFString *, OFString *) *)headers
statusCode: (int)statusCode
request: (OFHTTPRequest *)request
context: (id)context
|
| ︙ | ︙ | |||
863 864 865 866 867 868 869 870 | [_progressBar setReceived: _received]; [_progressBar draw]; } [_currentFileName release]; _currentFileName = nil; [response asyncReadIntoBuffer: _buffer | > | < < < < < | 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 | [_progressBar setReceived: _received]; [_progressBar draw]; } [_currentFileName release]; _currentFileName = nil; [response setDelegate: self]; [response asyncReadIntoBuffer: _buffer length: [OFSystemInfo pageSize]]; return; next: [_currentFileName release]; _currentFileName = nil; [self performSelector: @selector(downloadNextURL) |
| ︙ | ︙ |