Fix automatic size hint on uploads #626
Merged
Conversation
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
When uploading without a size hint (via headers or `--size-hint`), a x-archive-size-hint header is added automatically. However, prior to this commit, the value was the individual file size on each file's `PUT` request. This effectively made the size hint useless because it does not, in fact, provide a size hint for the total item size to the S3 backend at item creation time. Notes on detailed changes to implement this: * Rename `internetarchive.utils.recursive_file_count` to `recursive_file_count_and_size`, adding a wrapper for backwards compatibility * Add support for paths (rather than only file-like objects) to `internetarchive.utils.get_file_size` * Add a `internetarchive.utils.is_filelike_obj` helper function * Fix a bug introduced by 62c8513 where `total_files` would never be `None` and so `recursive_file_count` was never called, possibly leading to incorrect derive queueing. * Add tests for the fixed behaviour
|
Looks great. Thanks again @JustAnotherArchivist. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When uploading without a size hint (via headers or
--size-hint), a x-archive-size-hint header is added automatically. However, prior to this commit, the value was the individual file size on each file'sPUTrequest. This effectively made the size hint useless because it does not, in fact, provide a size hint for the total item size to the S3 backend at item creation time.Notes on detailed changes to implement this:
internetarchive.utils.recursive_file_counttorecursive_file_count_and_size, adding a wrapper for backwards compatibilityinternetarchive.utils.get_file_sizeinternetarchive.utils.is_filelike_objhelper functiontotal_fileswould never beNoneand sorecursive_file_countwas never called, possibly leading to incorrect derive queueing.