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

Prompt for file path instead of file name, then show file name and file path

Browse source
This commit is contained in:
Jimmy Kiselak 2015-10-26 13:15:32 -04:00
parent ea2a3c3b70
commit b80d45ad45
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lbrynet/lbrynet_console/ControlHandlers.py
View file

@ -12,7 +12,7 @@ from lbrynet.core.Error import UnknownNameError, InvalidBlobHashError, Insuffici
from lbrynet.core.Error import InvalidStreamInfoError from lbrynet.core.Error import InvalidStreamInfoError
from lbrynet.core.utils import is_valid_blobhash from lbrynet.core.utils import is_valid_blobhash
from twisted.internet import defer, threads from twisted.internet import defer, threads
#import os import os
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -1505,6 +1505,7 @@ class Publish(CommandHandler):
self.lbry_file_manager = lbry_file_manager self.lbry_file_manager = lbry_file_manager
self.wallet = wallet self.wallet = wallet
self.received_file_name = False self.received_file_name = False
self.file_path = None
self.file_name = None self.file_name = None
self.title = None self.title = None
self.publish_name = None self.publish_name = None
@ -1552,7 +1553,7 @@ class Publish(CommandHandler):
if file_name is not None: if file_name is not None:
self.received_file_name = True self.received_file_name = True
d = self._check_file_name(file_name) d = self._check_file_path(file_name)
#d.addCallback(lambda _: set_other_fields()) #d.addCallback(lambda _: set_other_fields())
d.addCallbacks(lambda _: self._send_next_prompt(), handle_error) d.addCallbacks(lambda _: self._send_next_prompt(), handle_error)
else: else:
@ -1563,7 +1564,7 @@ class Publish(CommandHandler):
if self.file_name is None: if self.file_name is None:
if self.received_file_name is False: if self.received_file_name is False:
self.received_file_name = True self.received_file_name = True
d = self._check_file_name(line) d = self._check_file_path(line)
def file_name_failed(err): def file_name_failed(err):
err.trap(IOError) err.trap(IOError)
@ -1607,11 +1608,12 @@ class Publish(CommandHandler):
d.addCallbacks(lambda s: self._send_next_prompt() if s is True else None, d.addCallbacks(lambda s: self._send_next_prompt() if s is True else None,
self.finished_deferred.errback) self.finished_deferred.errback)
def _check_file_name(self, file_name): def _check_file_path(self, file_path):
def check_file_threaded(): def check_file_threaded():
f = open(file_name) f = open(file_path)
f.close() f.close()
self.file_name = file_name self.file_path = file_path
self.file_name = os.path.basename(self.file_path)
return True return True
return threads.deferToThread(check_file_threaded) return threads.deferToThread(check_file_threaded)
@ -1628,7 +1630,7 @@ class Publish(CommandHandler):
def _send_next_prompt(self): def _send_next_prompt(self):
prompt = None prompt = None
if self.file_name is None: if self.file_name is None:
prompt = "File name: " prompt = "Path to file: "
elif self.title is None: elif self.title is None:
prompt = "Title: " prompt = "Title: "
elif self.publish_name is None: elif self.publish_name is None:
@ -1648,6 +1650,7 @@ class Publish(CommandHandler):
def _get_verification_prompt(self): def _get_verification_prompt(self):
v_string = "\nPlease review the following details.\n\n" v_string = "\nPlease review the following details.\n\n"
v_string += "Path to file: %s\n" % str(self.file_path)
v_string += "File name: %s\n" % str(self.file_name) v_string += "File name: %s\n" % str(self.file_name)
v_string += "Title: %s\n" % str(self.title) v_string += "Title: %s\n" % str(self.title)
v_string += "Published to: lbry://%s\n" % str(self.publish_name) v_string += "Published to: lbry://%s\n" % str(self.publish_name)
@ -1730,7 +1733,6 @@ class PublishFactory(CommandHandlerFactory):
"The description will be presented to users before they download the file.\n" "The description will be presented to users before they download the file.\n"
class ModifyDefaultDataPaymentRate(ModifyPaymentRate): class ModifyDefaultDataPaymentRate(ModifyPaymentRate):
prompt_description = "Modify default data payment rate" prompt_description = "Modify default data payment rate"