LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

Merge pull request #532 from lbryio/fix_descriptor_get

Browse source 
Fix broken descriptor_get command
This commit is contained in:
Jack Robison 2017-03-20 16:50:19 -04:00 committed by GitHub
commit c1a5806bc0
2 changed files with 5 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -19,6 +19,10 @@ at anytime.
*
### Fixed
* Fixed descriptor_get
* Fixed jsonrpc_reflect()
* Fixed api help return
* Fixed API command descriptor_get
*
*
*

53
lbrynet/lbrynet_daemon/Daemon.py
View file

@ -28,7 +28,6 @@ from lbrynet.metadata.Metadata import verify_name_characters
from lbrynet.lbryfile.client.EncryptedFileDownloader import EncryptedFileSaverFactory
from lbrynet.lbryfile.client.EncryptedFileDownloader import EncryptedFileOpenerFactory
from lbrynet.lbryfile.client.EncryptedFileOptions import add_lbry_file_to_sd_identifier
from lbrynet.lbryfile.StreamDescriptor import save_sd_info
from lbrynet.lbryfile.EncryptedFileMetadataManager import DBEncryptedFileMetadataManager
from lbrynet.lbryfile.StreamDescriptor import EncryptedFileStreamType
from lbrynet.lbryfilemanager.EncryptedFileManager import EncryptedFileManager
@ -718,51 +717,6 @@ class Daemon(AuthJSONRPCServer):
EncryptedFileStreamType, file_opener_factory)
return defer.succeed(None)
def _download_sd_blob(self, sd_blob_hash, rate_manager=None, timeout=None):
"""
Download a sd blob and register it with the stream info manager
Use this when downloading a sd blob as part of a stream download
:param sd_blob_hash (str): sd blob hash
:param rate_manager (PaymentRateManager), optional: the payment rate manager to use,
defaults to session.payment_rate_manager
:param timeout (int): sd blob timeout
:return: decoded sd blob
"""
timeout = timeout if timeout is not None else conf.settings['sd_download_timeout']
rate_manager = rate_manager or self.session.payment_rate_manager
def cb(sd_blob):
if not finished_d.called:
finished_d.callback(sd_blob)
def eb():
if not finished_d.called:
finished_d.errback(Exception("Blob (%s) download timed out" %
sd_blob_hash[:SHORT_ID_LEN]))
def save_sd_blob(sd_blob):
d = defer.succeed(read_sd_blob(sd_blob))
d.addCallback(lambda decoded: save_sd_info(self.stream_info_manager, decoded))
d.addCallback(self.stream_info_manager.save_sd_blob_hash_to_stream, sd_blob_hash)
d.addCallback(lambda _: sd_blob)
return d
def read_sd_blob(sd_blob):
sd_blob_file = sd_blob.open_for_reading()
decoded_sd_blob = json.loads(sd_blob_file.read())
sd_blob.close_read_handle(sd_blob_file)
return decoded_sd_blob
finished_d = defer.Deferred()
finished_d.addCallback(save_sd_blob)
reactor.callLater(timeout, eb)
d = download_sd_blob(self.session, sd_blob_hash, rate_manager)
d.addCallback(cb)
return finished_d
def _download_blob(self, blob_hash, rate_manager=None, timeout=None):
"""
Download a blob
@ -2140,7 +2094,6 @@ class Daemon(AuthJSONRPCServer):
return self.jsonrpc_descriptor_get(**kwargs)
@AuthJSONRPCServer.auth_required
@defer.inlineCallbacks
def jsonrpc_descriptor_get(self, sd_hash, timeout=None, payment_rate_manager=None):
"""
Download and return a sd blob
@ -2155,12 +2108,8 @@ class Daemon(AuthJSONRPCServer):
Returns
(str) Success/Fail message or (dict) decoded data
"""
return self.jsonrpc_blob_get(sd_hash, timeout, 'json', payment_rate_manager)
payment_rate_manager = get_blob_payment_rate_manager(self.session, payment_rate_manager)
decoded_sd_blob = yield self._download_sd_blob(sd_hash, payment_rate_manager,
timeout=timeout)
result = yield self._render_response(decoded_sd_blob)
defer.returnValue(result)
@AuthJSONRPCServer.auth_required
@defer.inlineCallbacks