move upload code to transferer #39
Open
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
ppolewicz
reviewed
Nov 20, 2019
b2sdk/bucket.py
Outdated
|
|
||
| # Check for unfinished files with same name | ||
| unfinished_file, finished_parts = self._find_unfinished_file_if_possible( | ||
| return self.api.transferer.upload( |
There was a problem hiding this comment.
part size lines above this should also live in transferer, not Bucket
b2sdk/transferer/transferer.py
Outdated
| logger = logging.getLogger(__name__) | ||
|
|
||
|
|
||
| class LargeFileUploadState(object): |
b2sdk/transferer/transferer.py
Outdated
| self.file_progress_listener.bytes_completed(self.bytes_completed) | ||
|
|
||
|
|
||
| class PartProgressReporter(AbstractProgressListener): |
b2sdk/transferer/transferer.py
Outdated
| @@ -58,6 +173,15 @@ def __init__(self, session, account_info): | |||
| max_chunk_size=self.MAX_CHUNK_SIZE, | |||
| ), | |||
| ] | |||
| self.upload_executor = None | |||
|
|
|||
| def get_thread_pool(self): | |||
There was a problem hiding this comment.
I think this should actually be a property and the field should be private. Also, it should live in Emerger - transferer should not be managing upload threads directly
b2sdk/transferer/transferer.py
Outdated
| # so that they share resources during a sync. | ||
| f = self.get_thread_pool().submit( | ||
| self._upload_small_file, bucket_id, upload_source, file_name, content_type, file_info, | ||
| progress_listener |
b2sdk/transferer/transferer.py
Outdated
| part_range, | ||
| upload_source, | ||
| large_file_upload_state, | ||
| finished_parts=None |
anuj-reef
force-pushed
the
transferer_v2
branch
from
5f0ecba to
218bee6
Compare
* Transferer download logic to DownloadManager * Transferer upload logic to UploadManager * Draft implementation for CopyManager * Draft implementation for Emerger * Refactor B2Session to explicit interface * Move account_info, cache, raw_api to B2Session * Move large file helpers to LargeFileServices * Add missing abstract methods to AbstractRawApi * Remove unused parameters in raw api previously required by removed B2Sesion magic
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.
No description provided.