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

update gui to work with updated LBRYcrdWallet

Browse source
This commit is contained in:
Jimmy Kiselak 2015-12-02 14:53:39 -05:00
parent d04981969f
commit c7e4638736
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lbrynet/lbrynet_gui/LBRYGui.py
View file

@ -43,6 +43,7 @@ class LBRYDownloader(object):
self.wallet_dir = os.path.join(get_path(FOLDERID.RoamingAppData, UserHandle.current), "lbrycrd") self.wallet_dir = os.path.join(get_path(FOLDERID.RoamingAppData, UserHandle.current), "lbrycrd")
else: else:
self.download_directory = os.getcwd() self.download_directory = os.getcwd()
self.wallet_dir = os.path.join(os.path.expanduser("~"), ".lbrycrd")
self.wallet_conf = os.path.join(self.wallet_dir, "lbrycrd.conf") self.wallet_conf = os.path.join(self.wallet_dir, "lbrycrd.conf")
self.wallet_user = None self.wallet_user = None
self.wallet_password = None self.wallet_password = None
@ -56,7 +57,8 @@ class LBRYDownloader(object):
if os.name == "nt": if os.name == "nt":
self.lbrycrdd_path = "lbrycrdd.exe" self.lbrycrdd_path = "lbrycrdd.exe"
else: else:
self.lbrycrdd_path = "./lbrycrdd" self.lbrycrdd_path = None
self.default_lbrycrdd_path = "./lbrycrdd"
self.delete_blobs_on_remove = True self.delete_blobs_on_remove = True
self.blob_request_payment_rate_manager = None self.blob_request_payment_rate_manager = None
@ -122,7 +124,7 @@ class LBRYDownloader(object):
if not os.path.exists(lbrycrdd_path_conf_path): if not os.path.exists(lbrycrdd_path_conf_path):
return "" return ""
lbrycrdd_path_conf = open(lbrycrdd_path_conf_path) lbrycrdd_path_conf = open(lbrycrdd_path_conf_path)
lines = lbrycrdd_path_conf.readline() lines = lbrycrdd_path_conf.readlines()
return lines return lines
d = threads.deferToThread(get_lbrycrdd_path_conf_file) d = threads.deferToThread(get_lbrycrdd_path_conf_file)
@ -292,6 +294,8 @@ class LBRYDownloader(object):
lbrycrdd_path = None lbrycrdd_path = None
if self.start_lbrycrdd is True: if self.start_lbrycrdd is True:
lbrycrdd_path = self.lbrycrdd_path lbrycrdd_path = self.lbrycrdd_path
if not lbrycrdd_path:
lbrycrdd_path = self.default_lbrycrdd_path
wallet = LBRYcrdWallet(self.db_dir, wallet_dir=self.wallet_dir, wallet_conf=self.wallet_conf, wallet = LBRYcrdWallet(self.db_dir, wallet_dir=self.wallet_dir, wallet_conf=self.wallet_conf,
lbrycrdd_path=lbrycrdd_path) lbrycrdd_path=lbrycrdd_path)