Overview
Comment: | ofhttp: Refactor for asynchronous OFHTTPClient |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
c26c8ca746e493fccab21dbc779dbc20 |
User & Date: | js on 2017-09-23 20:35:31 |
Other Links: | manifest | tags |
Context
2017-09-23
| ||
22:07 | Support for passing a context to async IO handlers check-in: 958da109d3 user: js tags: trunk | |
20:35 | ofhttp: Refactor for asynchronous OFHTTPClient check-in: c26c8ca746 user: js tags: trunk | |
19:02 | OFHTTPClient: Add request performed callback check-in: d3d4d34dad user: js tags: trunk | |
Changes
Modified src/OFHTTPClient.m from [aa3131b9d1] to [d20461a0e1].
︙ | ︙ | |||
731 732 733 734 735 736 737 | if (status / 100 != 2) @throw [OFHTTPRequestFailedException exceptionWithRequest: request response: response]; if ([_delegate respondsToSelector: @selector(client:didPerformRequest: | | > > > > > | 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 | if (status / 100 != 2) @throw [OFHTTPRequestFailedException exceptionWithRequest: request response: response]; if ([_delegate respondsToSelector: @selector(client:didPerformRequest: response:)]) { pool = objc_autoreleasePoolPush(); [_delegate client: self didPerformRequest: request response: response]; objc_autoreleasePoolPop(pool); } return response; } - (void)close { [_socket close]; |
︙ | ︙ |
Modified utils/ofhttp/OFHTTP.m from [729b47a746] to [2ea2fa69f0].
︙ | ︙ | |||
53 54 55 56 57 58 59 | #define KIBIBYTE (1024) @interface OFHTTP: OFObject <OFHTTPClientDelegate> { OFArray OF_GENERIC(OFString *) *_URLs; size_t _URLIndex; int _errorCode; | | | > | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | #define KIBIBYTE (1024) @interface OFHTTP: OFObject <OFHTTPClientDelegate> { OFArray OF_GENERIC(OFString *) *_URLs; size_t _URLIndex; int _errorCode; OFString *_outputPath, *_currentFileName; bool _continue, _force, _detectFileName, _detectedFileName; bool _quiet, _verbose, _insecure; OFData *_body; of_http_request_method_t _method; OFMutableDictionary *_clientHeaders; OFHTTPClient *_HTTPClient; char *_buffer; OFStream *_output; intmax_t _received, _length, _resumedFrom; |
︙ | ︙ | |||
533 534 535 536 537 538 539 | if (!_quiet) [of_stdout writeFormat: @"☇ %@", [URL string]]; return true; } | | < < | > | 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 | if (!_quiet) [of_stdout writeFormat: @"☇ %@", [URL string]]; return true; } - (bool)performRequest: (OFHTTPRequest *)request { @try { [_HTTPClient performRequest: request]; return true; } @catch (OFAddressTranslationFailedException *e) { if (!_quiet) [of_stdout writeString: @"\n"]; [of_stderr writeLine: OF_LOCALIZED(@"download_failed_address_translation", @"%[prog]: Failed to download <%[url]>!\n" |
︙ | ︙ | |||
617 618 619 620 621 622 623 | [of_stderr writeLine: OF_LOCALIZED(@"download_failed", @"%[prog]: Failed to download <%[url]>!", @"prog", [OFApplication programName], @"url", [[request URL] string])]; } | > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > | 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 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 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 | [of_stderr writeLine: OF_LOCALIZED(@"download_failed", @"%[prog]: Failed to download <%[url]>!", @"prog", [OFApplication programName], @"url", [[request URL] string])]; } return false; } - (void)client: (OFHTTPClient *)client didPerformRequest: (OFHTTPRequest *)request response: (OFHTTPResponse *)response { OFDictionary OF_GENERIC(OFString *, OFString *) *headers; OFString *lengthString, *type; /* Was a request to retrieve the file name */ if (_detectFileName && _currentFileName == nil) { _currentFileName = [fileNameFromContentDisposition( [[response headers] objectForKey: @"Content-Disposition"]) copy]; _detectedFileName = true; if (!_quiet) [of_stdout writeFormat: @" ➜ %d\n", [response statusCode]]; [self performSelector: @selector(downloadNextURL) afterDelay: 0]; return; } if (!_quiet) [of_stdout writeFormat: @" ➜ %d\n", [response statusCode]]; headers = [response headers]; lengthString = [headers objectForKey: @"Content-Length"]; type = [headers objectForKey: @"Content-Type"]; if (lengthString != nil) _length = [lengthString decimalValue]; if (!_quiet) { if (type == nil) type = OF_LOCALIZED(@"type_unknown", @"unknown"); if (_length >= 0) { if (_resumedFrom + _length >= GIBIBYTE) { lengthString = [OFString stringWithFormat: @"%,.2f", (float)(_resumedFrom + _length) / GIBIBYTE]; lengthString = OF_LOCALIZED(@"size_gib", @"%[num] GiB", @"num", lengthString); } else if (_resumedFrom + _length >= MEBIBYTE) { lengthString = [OFString stringWithFormat: @"%,.2f", (float)(_resumedFrom + _length) / MEBIBYTE]; lengthString = OF_LOCALIZED(@"size_mib", @"%[num] MiB", @"num", lengthString); } else if (_resumedFrom + _length >= KIBIBYTE) { lengthString = [OFString stringWithFormat: @"%,.2f", (float)(_resumedFrom + _length) / KIBIBYTE]; lengthString = OF_LOCALIZED(@"size_kib", @"%[num] KiB", @"num", lengthString); } else { lengthString = [OFString stringWithFormat: @"%jd", _resumedFrom + _length]; lengthString = OF_LOCALIZED(@"size_bytes", @"%[num] bytes", @"num", lengthString); } } else lengthString = OF_LOCALIZED(@"size_unknown", @"unknown"); if (_verbose) { void *pool = objc_autoreleasePoolPush(); OFDictionary OF_GENERIC(OFString *, OFString *) *headers = [response headers]; OFEnumerator *keyEnumerator = [headers keyEnumerator]; OFEnumerator *objectEnumerator = [headers objectEnumerator]; OFString *key, *object; [of_stdout writeString: @" "]; [of_stdout writeLine: OF_LOCALIZED( @"info_name_unaligned", @"Name: %[name]", @"name", _currentFileName)]; while ((key = [keyEnumerator nextObject]) != nil && (object = [objectEnumerator nextObject]) != nil) [of_stdout writeFormat: @" %@: %@\n", key, object]; objc_autoreleasePoolPop(pool); } else { [of_stdout writeString: @" "]; [of_stdout writeLine: OF_LOCALIZED(@"info_name", @"Name: %[name]", @"name", _currentFileName)]; [of_stdout writeString: @" "]; [of_stdout writeLine: OF_LOCALIZED(@"info_type", @"Type: %[type]", @"type", type)]; [of_stdout writeString: @" "]; [of_stdout writeLine: OF_LOCALIZED(@"info_size", @"Size: %[size]", @"size", lengthString)]; } } if ([_outputPath isEqual: @"-"]) _output = of_stdout; else { if (!_continue && !_force && [[OFFileManager defaultManager] fileExistsAtPath: _currentFileName]) { [of_stderr writeLine: OF_LOCALIZED(@"output_already_exists", @"%[prog]: File %[filename] already exists!", @"prog", [OFApplication programName], @"filename", _currentFileName)]; _errorCode = 1; goto next; } @try { OFString *mode = ([response statusCode] == 206 ? @"a" : @"w"); _output = [[OFFile alloc] initWithPath: _currentFileName mode: mode]; } @catch (OFOpenItemFailedException *e) { [of_stderr writeLine: OF_LOCALIZED(@"failed_to_open_output", @"%[prog]: Failed to open file %[filename]: " @"%[exception]", @"prog", [OFApplication programName], @"filename", _currentFileName, @"exception", e)]; _errorCode = 1; goto next; } } if (!_quiet) { _progressBar = [[ProgressBar alloc] initWithLength: _length resumedFrom: _resumedFrom]; [_progressBar setReceived: _received]; [_progressBar draw]; } [_currentFileName release]; _currentFileName = nil; [response asyncReadIntoBuffer: _buffer length: [OFSystemInfo pageSize] target: self selector: @selector(stream:didReadIntoBuffer: length:exception:)]; return; next: [_currentFileName release]; _currentFileName = nil; [self performSelector: @selector(downloadNextURL) afterDelay: 0]; } - (bool)stream: (OFHTTPResponse *)response didReadIntoBuffer: (void *)buffer length: (size_t)length exception: (OFException *)e { |
︙ | ︙ | |||
684 685 686 687 688 689 690 | [self performSelector: @selector(downloadNextURL) afterDelay: 0]; return false; } - (void)downloadNextURL { | < < < < | 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 | [self performSelector: @selector(downloadNextURL) afterDelay: 0]; return false; } - (void)downloadNextURL { OFString *URLString = nil; OFURL *URL; OFMutableDictionary *clientHeaders; OFHTTPRequest *request; _length = -1; _received = _resumedFrom = 0; if (_output != of_stdout) [_output release]; _output = nil; |
︙ | ︙ | |||
729 730 731 732 733 734 735 | _errorCode = 1; goto next; } clientHeaders = [[_clientHeaders mutableCopy] autorelease]; | | > > > | | < > > | > | | > | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 | _errorCode = 1; goto next; } clientHeaders = [[_clientHeaders mutableCopy] autorelease]; if (_detectFileName && !_detectedFileName) { /* Handle this URL on the next -[downloadNextURL] call */ _URLIndex--; if (!_quiet) [of_stdout writeFormat: @"⠒ %@", [URL string]]; request = [OFHTTPRequest requestWithURL: URL]; [request setHeaders: clientHeaders]; [request setMethod: OF_HTTP_REQUEST_METHOD_HEAD]; if (![self performRequest: request]) { _errorCode = 1; goto next; } return; } _detectedFileName = false; if (!_quiet) [of_stdout writeFormat: @"⇣ %@", [URL string]]; if (_outputPath != nil) { [_currentFileName release]; _currentFileName = [_outputPath copy]; } if (_currentFileName == nil) _currentFileName = [[[URL path] lastPathComponent] copy]; if (_continue) { @try { of_offset_t size = [[OFFileManager defaultManager] sizeOfFileAtPath: _currentFileName]; OFString *range; if (size > INTMAX_MAX) @throw [OFOutOfRangeException exception]; _resumedFrom = (intmax_t)size; range = [OFString stringWithFormat: @"bytes=%jd-", _resumedFrom]; [clientHeaders setObject: range forKey: @"Range"]; } @catch (OFStatItemFailedException *e) { } } request = [OFHTTPRequest requestWithURL: URL]; [request setHeaders: clientHeaders]; [request setMethod: _method]; [request setBody: _body]; if (![self performRequest: request]) { _errorCode = 1; goto next; } return; next: [self performSelector: @selector(downloadNextURL) afterDelay: 0]; } @end |