Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

rename HashBlobWriter.cancel() as close() to be more file like

Browse source
This commit is contained in:
Kay Kurokawa 2017-09-12 23:14:19 -04:00 • committed by Jack Robison
parent ab513d076b
commit 0f95712a0f
No known key found for this signature in database
GPG key ID: 284699E7404E3CFF
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lbrynet/core/HashBlob.py
View file

@ -71,9 +71,10 @@ class HashBlobWriter(object):
if self.len_so_far == self.length_getter(): if self.len_so_far == self.length_getter():
self.finished_cb(self) self.finished_cb(self)
def cancel(self, reason=None): def close(self, reason=None):
if reason is None: if reason is None:
reason = Failure(DownloadCanceledError()) reason = Failure(DownloadCanceledError())
self.finished_cb(self, reason) self.finished_cb(self, reason)
@ -157,7 +158,7 @@ class HashBlob(object):
def cancel_other_downloads(): def cancel_other_downloads():
for p, (w, finished_deferred) in self.writers.items(): for p, (w, finished_deferred) in self.writers.items():
w.cancel() w.close()
if err is None: if err is None:
if writer.len_so_far == self.length and writer.blob_hash == self.blob_hash: if writer.len_so_far == self.length and writer.blob_hash == self.blob_hash:
@ -232,19 +233,19 @@ class BlobFile(HashBlob):
open a blob file to be written by peer, supports concurrent open a blob file to be written by peer, supports concurrent
writers, as long as they are from differnt peers. writers, as long as they are from differnt peers.
returns tuple of (finished_deferred, writer.writer, writer.cancel) returns tuple of (finished_deferred, writer.writer, writer.close)
finished_deferred - deferred that is fired when write is finished and returns finished_deferred - deferred that is fired when write is finished and returns
a instance of itself as HashBlob a instance of itself as HashBlob
writer.write - function used to write to file, argument is data to be written writer.write - function used to write to file, argument is data to be written
writer.cancel - function used to cancel the write, takes no argument writer.close - function used to cancel the write, takes no argument
""" """
if not peer in self.writers: if not peer in self.writers:
log.debug("Opening %s to be written by %s", str(self), str(peer)) log.debug("Opening %s to be written by %s", str(self), str(peer))
finished_deferred = defer.Deferred() finished_deferred = defer.Deferred()
writer = HashBlobWriter(self.get_length, self.writer_finished) writer = HashBlobWriter(self.get_length, self.writer_finished)
self.writers[peer] = (writer, finished_deferred) self.writers[peer] = (writer, finished_deferred)
return finished_deferred, writer.write, writer.cancel return finished_deferred, writer.write, writer.close
log.warning("Tried to download the same file twice simultaneously from the same peer") log.warning("Tried to download the same file twice simultaneously from the same peer")
return None, None, None return None, None, None