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

make lbryum default wallet for daemon

Browse source 
with optional command line argument —wallet=
This commit is contained in:
Jack 2016-02-22 22:32:07 -05:00
parent 53ff4cd651
commit 485be533c9
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
lbrynet/lbrynet_daemon/LBRYDaemon.py
View file

@ -16,7 +16,7 @@ from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE, DEFAULT_MAX_SEARCH_RESULTS,
from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier, download_sd_blob from lbrynet.core.StreamDescriptor import StreamDescriptorIdentifier, download_sd_blob
from lbrynet.core.Session import LBRYSession from lbrynet.core.Session import LBRYSession
from lbrynet.core.PTCWallet import PTCWallet from lbrynet.core.PTCWallet import PTCWallet
from lbrynet.core.LBRYcrdWallet import LBRYcrdWallet from lbrynet.core.LBRYcrdWallet import LBRYcrdWallet, LBRYumWallet
from lbrynet.lbryfilemanager.LBRYFileManager import LBRYFileManager from lbrynet.lbryfilemanager.LBRYFileManager import LBRYFileManager
from lbrynet.lbryfile.LBRYFileMetadataManager import DBLBRYFileMetadataManager, TempLBRYFileMetadataManager from lbrynet.lbryfile.LBRYFileMetadataManager import DBLBRYFileMetadataManager, TempLBRYFileMetadataManager
from twisted.web import xmlrpc, server from twisted.web import xmlrpc, server
@ -26,7 +26,8 @@ from decimal import Decimal
from StringIO import StringIO from StringIO import StringIO
from zipfile import ZipFile from zipfile import ZipFile
from urllib import urlopen from urllib import urlopen
import os, sys, json, binascii, webbrowser, xmlrpclib, subprocess, logging
import os, sys, json, binascii, webbrowser, xmlrpclib, subprocess, logging, argparse, getopt
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -46,8 +47,8 @@ class LBRYDaemon(xmlrpc.XMLRPC):
LBRYnet daemon LBRYnet daemon
""" """
def setup(self): def setup(self, wallet_type):
def _set_vars(): def _set_vars(wallet_type):
self.fetcher = None self.fetcher = None
self.current_db_revision = 1 self.current_db_revision = 1
self.run_server = True self.run_server = True
@ -93,7 +94,7 @@ class LBRYDaemon(xmlrpc.XMLRPC):
self.lbry_file_metadata_manager = None self.lbry_file_metadata_manager = None
self.lbry_file_manager = None self.lbry_file_manager = None
self.settings = LBRYSettings(self.db_dir) self.settings = LBRYSettings(self.db_dir)
self.wallet_type = "lbrycrd" self.wallet_type = wallet_type
self.lbrycrd_conf = os.path.join(self.wallet_dir, "lbrycrd.conf") self.lbrycrd_conf = os.path.join(self.wallet_dir, "lbrycrd.conf")
self.autofetcher_conf = os.path.join(self.wallet_dir, "autofetcher.conf") self.autofetcher_conf = os.path.join(self.wallet_dir, "autofetcher.conf")
self.files = [] self.files = []
@ -121,7 +122,7 @@ class LBRYDaemon(xmlrpc.XMLRPC):
return defer.succeed(None) return defer.succeed(None)
d = defer.Deferred() d = defer.Deferred()
d.addCallback(lambda _: _set_vars()) d.addCallback(lambda _: _set_vars(wallet_type))
d.addCallback(lambda _: threads.deferToThread(self._setup_data_directory)) d.addCallback(lambda _: threads.deferToThread(self._setup_data_directory))
d.addCallback(lambda _: self._check_db_migration()) d.addCallback(lambda _: self._check_db_migration())
d.addCallback(lambda _: self._get_settings()) d.addCallback(lambda _: self._get_settings())
@ -397,6 +398,7 @@ class LBRYDaemon(xmlrpc.XMLRPC):
def get_wallet(): def get_wallet():
if self.wallet_type == "lbrycrd": if self.wallet_type == "lbrycrd":
print "Using lbrycrd wallet"
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
@ -404,8 +406,15 @@ class LBRYDaemon(xmlrpc.XMLRPC):
lbrycrdd_path = self.default_lbrycrdd_path lbrycrdd_path = self.default_lbrycrdd_path
d = defer.succeed(LBRYcrdWallet(self.db_dir, wallet_dir=self.wallet_dir, wallet_conf=self.lbrycrd_conf, d = defer.succeed(LBRYcrdWallet(self.db_dir, wallet_dir=self.wallet_dir, wallet_conf=self.lbrycrd_conf,
lbrycrdd_path=lbrycrdd_path)) lbrycrdd_path=lbrycrdd_path))
else: elif self.wallet_type == "lbryum":
print "Using lbryum wallet"
d = defer.succeed(LBRYumWallet(self.db_dir))
elif self.wallet_type == "ptc":
print "Using PTC wallet"
d = defer.succeed(PTCWallet(self.db_dir)) d = defer.succeed(PTCWallet(self.db_dir))
else:
d = defer.fail()
d.addCallback(lambda wallet: {"wallet": wallet}) d.addCallback(lambda wallet: {"wallet": wallet})
return d return d
@ -1042,17 +1051,23 @@ class LBRYDaemon(xmlrpc.XMLRPC):
def main(): def main():
parser = argparse.ArgumentParser(description="Launch lbrynet-daemon")
parser.add_argument("--wallet",
help="Either lbrycrd or lbryum",
type=str,
default="lbryum")
args = parser.parse_args()
try: try:
d = xmlrpclib.ServerProxy('http://localhost:7080') daemon = xmlrpclib.ServerProxy("http://localhost:7080")
d.stop() daemon.stop()
except: except:
pass pass
daemon = LBRYDaemon() daemon = LBRYDaemon()
daemon.setup() daemon.setup(args.wallet)
reactor.listenTCP(7080, server.Site(daemon)) reactor.listenTCP(7080, server.Site(daemon))
reactor.run() reactor.run()
if __name__ == '__main__': if __name__ == '__main__':
main() main()