delete deprecated producer/consumer read methods from BlobFile
This commit is contained in:
parent
1360345395
commit
96d8cb17d9
2 changed files with 1 additions and 60 deletions
|
@ -1,14 +1,13 @@
|
|||
import logging
|
||||
import os
|
||||
from twisted.internet import defer, threads
|
||||
from twisted.protocols.basic import FileSender
|
||||
from twisted.web.client import FileBodyProducer
|
||||
from twisted.python.failure import Failure
|
||||
from lbrynet import conf
|
||||
from lbrynet.core.Error import DownloadCanceledError, InvalidDataError, InvalidBlobHashError
|
||||
from lbrynet.core.utils import is_valid_blobhash
|
||||
from lbrynet.blob.writer import HashBlobWriter
|
||||
from lbrynet.blob.reader import HashBlobReader, HashBlobReader_v0
|
||||
from lbrynet.blob.reader import HashBlobReader
|
||||
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
@ -143,33 +142,6 @@ class BlobFile(object):
|
|||
return True
|
||||
return False
|
||||
|
||||
def read(self, write_func):
|
||||
"""
|
||||
This function is only used in StreamBlobDecryptor
|
||||
and should be deprecated in favor of open_for_reading()
|
||||
"""
|
||||
def close_self(*args):
|
||||
self.close_read_handle(file_handle)
|
||||
return args[0]
|
||||
|
||||
file_sender = FileSender()
|
||||
reader = HashBlobReader_v0(write_func)
|
||||
file_handle = self.open_for_reading()
|
||||
if file_handle is not None:
|
||||
d = file_sender.beginFileTransfer(file_handle, reader)
|
||||
d.addCallback(close_self)
|
||||
else:
|
||||
d = defer.fail(IOError("Could not read the blob"))
|
||||
return d
|
||||
|
||||
def close_read_handle(self, file_handle):
|
||||
"""
|
||||
This function is only used in StreamBlobDecryptor
|
||||
and should be deprecated in favor of open_for_reading()
|
||||
"""
|
||||
if file_handle is not None:
|
||||
file_handle.close()
|
||||
|
||||
def reader_finished(self, reader):
|
||||
self.readers -= 1
|
||||
return defer.succeed(True)
|
||||
|
|
|
@ -1,39 +1,8 @@
|
|||
import logging
|
||||
from twisted.internet import interfaces
|
||||
from zope.interface import implements
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class HashBlobReader_v0(object):
|
||||
"""
|
||||
This is a class that is only used in StreamBlobDecryptor
|
||||
and should be deprecated
|
||||
"""
|
||||
implements(interfaces.IConsumer)
|
||||
|
||||
def __init__(self, write_func):
|
||||
self.write_func = write_func
|
||||
|
||||
def registerProducer(self, producer, streaming):
|
||||
from twisted.internet import reactor
|
||||
|
||||
self.producer = producer
|
||||
self.streaming = streaming
|
||||
if self.streaming is False:
|
||||
reactor.callLater(0, self.producer.resumeProducing)
|
||||
|
||||
def unregisterProducer(self):
|
||||
pass
|
||||
|
||||
def write(self, data):
|
||||
from twisted.internet import reactor
|
||||
|
||||
self.write_func(data)
|
||||
if self.streaming is False:
|
||||
reactor.callLater(0, self.producer.resumeProducing)
|
||||
|
||||
|
||||
class HashBlobReader(object):
|
||||
"""
|
||||
This is a file like reader class that supports
|
||||
|
|
Loading…
Reference in a new issue