-
-
Notifications
You must be signed in to change notification settings - Fork 6.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Ruby][faraday] fix download_file #7842
Merged
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -172,42 +172,13 @@ def build_request_body(header_params, form_params, body) | |
data | ||
end | ||
|
||
# Save response body into a file in (the defined) temporary folder, using the filename | ||
# from the "Content-Disposition" header if provided, otherwise a random filename. | ||
# The response body is written to the file in chunks in order to handle files which | ||
# size is larger than maximum Ruby String or even larger than the maximum memory a Ruby | ||
# process can use. | ||
# | ||
# @see Configuration#temp_folder_path | ||
def download_file(request) | ||
tempfile = nil | ||
encoding = nil | ||
request.headers do |response| | ||
content_disposition = response.headers['Content-Disposition'] | ||
if content_disposition && content_disposition =~ /filename=/i | ||
filename = content_disposition[/filename=['"]?([^'"\s]+)['"]?/, 1] | ||
prefix = sanitize_filename(filename) | ||
else | ||
prefix = 'download-' | ||
end | ||
prefix = prefix + '-' unless prefix.end_with?('-') | ||
encoding = response.body.encoding | ||
tempfile = Tempfile.open(prefix, @config.temp_folder_path, encoding: encoding) | ||
@tempfile = tempfile | ||
end | ||
|
||
if tempfile.nil? | ||
tempfile = Tempfile.open('download-', @config.temp_folder_path) | ||
@tempfile = tempfile | ||
end | ||
|
||
@stream = [] | ||
|
||
# handle streaming Responses | ||
request.options.on_data = Proc.new do |chunk, overall_received_bytes| | ||
@stream << chunk | ||
end | ||
|
||
end | ||
|
||
# Check if the given MIME is a JSON MIME. | ||
|
@@ -232,7 +203,8 @@ def deserialize(response, return_type) | |
# handle file downloading - return the File instance processed in request callbacks | ||
# note that response body is empty when the file is written in chunks in request on_body callback | ||
if return_type == 'File' | ||
@tempfile.write(@stream) | ||
@tempfile = Tempfile.open('download-', @config.temp_folder_path, encoding: body.encoding) | ||
@tempfile.write(@stream.join.force_encoding(body.encoding)) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Need to |
||
@tempfile.close | ||
@config.logger.info "Temp file written to #{@tempfile.path}, please copy the file to a proper folder "\ | ||
"with e.g. `FileUtils.cp(tempfile.path, '/new/file/path')` otherwise the temp file "\ | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does not process this block.