ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-24 15:16:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

upload.py: minor refactoring

Browse Source
This commit is contained in:
Brian Warner 2007-06-11 19:21:51 -07:00
parent 10af746d90
commit a182edf4de
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/allmydata/upload.py
View File

@ -99,11 +99,25 @@ class FileUploader:
assert self.needed_shares assert self.needed_shares
# create the encoder, so we can know how large the shares will be # create the encoder, so we can know how large the shares will be
share_size, block_size = self.setup_encoder()
d = self._locate_all_shareholders(share_size, block_size)
d.addCallback(self._send_shares)
d.addCallback(self._compute_uri)
return d
def setup_encoder(self):
self._encoder = encode.Encoder(self._options) self._encoder = encode.Encoder(self._options)
self._encoder.setup(self._filehandle, self._encryption_key) self._encoder.setup(self._filehandle, self._encryption_key)
share_size = self._encoder.get_share_size() share_size = self._encoder.get_share_size()
block_size = self._encoder.get_block_size() block_size = self._encoder.get_block_size()
return share_size, block_size
def _locate_all_shareholders(self, share_size, block_size):
"""
@return: a set of PeerTracker instances that have agreed to hold some
shares for us
"""
# we are responsible for locating the shareholders. self._encoder is # we are responsible for locating the shareholders. self._encoder is
# responsible for handling the data and sending out the shares. # responsible for handling the data and sending out the shares.
peers = self._client.get_permuted_peers(self._crypttext_hash) peers = self._client.get_permuted_peers(self._crypttext_hash)
@ -116,16 +130,6 @@ class FileUploader:
self.used_peers = set() # while this set grows self.used_peers = set() # while this set grows
self.unallocated_sharenums = set(range(self.total_shares)) # this one shrinks self.unallocated_sharenums = set(range(self.total_shares)) # this one shrinks
d = self._locate_all_shareholders()
d.addCallback(self._send_shares)
d.addCallback(self._compute_uri)
return d
def _locate_all_shareholders(self):
"""
@return: a set of PeerTracker instances that have agreed to hold some
shares for us
"""
return self._locate_more_shareholders() return self._locate_more_shareholders()
def _locate_more_shareholders(self): def _locate_more_shareholders(self):