ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-20 17:52:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

immutable: refactor ReadBucketProxy a little

Browse Source
This commit is contained in:
Zooko O'Whielacronx 2008-12-16 17:53:25 -07:00
parent 82ee44ed5b
commit d511941136
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/immutable/download.py
View File

@ -772,7 +772,7 @@ class FileDownloader:
(self._responses_received,
self._queries_sent))
for sharenum, bucket in buckets.iteritems():
b = layout.ReadBucketProxy(bucket, peerid, self._si_s)
b = layout.ReadBucketProxy(bucket, peerid, self._storage_index)
self.add_share_bucket(sharenum, b)
if self._results:

11
src/allmydata/immutable/layout.py
View File

@ -6,6 +6,7 @@ from allmydata.interfaces import IStorageBucketWriter, IStorageBucketReader, \
FileTooLargeError, HASH_SIZE
from allmydata.util import mathutil, idlib
from allmydata.util.assertutil import _assert, precondition
from allmydata import storage
"""
@ -248,19 +249,19 @@ class WriteBucketProxy_v2(WriteBucketProxy):
class ReadBucketProxy:
implements(IStorageBucketReader)
def __init__(self, rref, peerid=None, storage_index_s=None):
def __init__(self, rref, peerid, storage_index):
self._rref = rref
self._peerid = peerid
self._si_s = storage_index_s
peer_id_s = idlib.shortnodeid_b2a(peerid)
storage_index_s = storage.si_b2a(storage_index)
self._reprstr = "<ReadBucketProxy to peer [%s] SI %s>" % (peer_id_s, storage_index_s)
self._started = False
def get_peerid(self):
return self._peerid
def __repr__(self):
peerid_s = idlib.shortnodeid_b2a(self._peerid)
return "<ReadBucketProxy to peer [%s] SI %s>" % (peerid_s,
self._si_s)
return self._reprstr
def startIfNecessary(self):
if self._started: