LBRYFoundation/lbry-sdk
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-sdk.git synced 2025-08-23 17:27:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make saving plain stream descriptor file work when no file name is given

Browse source
This commit is contained in:
Jimmy Kiselak 2015-09-18 00:49:06 -04:00
parent 0e4f21842c
commit e339d3857f
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lbrynet/lbryfilemanager/LBRYFileDownloader.py
View file

@ -22,10 +22,8 @@ class ManagedLBRYFileDownloader(LBRYFileSaver):
file_name=None): file_name=None):
LBRYFileSaver.__init__(self, stream_hash, peer_finder, rate_limiter, blob_manager, LBRYFileSaver.__init__(self, stream_hash, peer_finder, rate_limiter, blob_manager,
stream_info_manager, payment_rate_manager, wallet, download_directory, stream_info_manager, payment_rate_manager, wallet, download_directory,
upload_allowed) upload_allowed, file_name)
self.lbry_file_manager = lbry_file_manager self.lbry_file_manager = lbry_file_manager
self.file_name = file_name
self.file_handle = None
self.saving_status = False self.saving_status = False
def restore(self): def restore(self):

18
lbrynet/lbrynet_console/ControlHandlers.py
View file

@ -9,6 +9,7 @@ from lbrynet.lbrynet_console.interfaces import IControlHandler, IControlHandlerF
from lbrynet.core.StreamDescriptor import download_sd_blob from lbrynet.core.StreamDescriptor import download_sd_blob
from lbrynet.core.Error import UnknownNameError, InvalidBlobHashError, InsufficientFundsError from lbrynet.core.Error import UnknownNameError, InvalidBlobHashError, InsufficientFundsError
from twisted.internet import defer from twisted.internet import defer
import os
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -826,11 +827,22 @@ class CreatePlainStreamDescriptor(ControlHandler):
return True, self._create_sd() return True, self._create_sd()
def _create_sd(self): def _create_sd(self):
if not self.sd_file_name: if self.sd_file_name:
self.sd_file_name = None file_name = self.sd_file_name
descriptor_writer = PlainStreamDescriptorWriter(self.sd_file_name) else:
file_name = self.lbry_file.file_name
if not file_name:
file_name = "_"
file_name += ".cryptsd"
if os.path.exists(file_name):
ext_num = 1
while os.path.exists(file_name + "_" + str(ext_num)):
ext_num += 1
file_name = file_name + "_" + str(ext_num)
descriptor_writer = PlainStreamDescriptorWriter(file_name)
d = get_sd_info(self.lbry_file_manager.stream_info_manager, self.lbry_file.stream_hash, True) d = get_sd_info(self.lbry_file_manager.stream_info_manager, self.lbry_file.stream_hash, True)
d.addCallback(descriptor_writer.create_descriptor) d.addCallback(descriptor_writer.create_descriptor)
d.addCallback(lambda sd_file_name: "Wrote stream metadata to " + sd_file_name)
return d return d