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

Fix search issue and move some settings to conf.py

Browse source
This commit is contained in:
Jack 2016-02-15 10:12:49 -05:00
parent 407ebeb699
commit d544199eff
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lbrynet/conf.py
View file

@ -18,6 +18,10 @@ MIN_BLOB_INFO_PAYMENT_RATE = .02 # points/1000 infos
MIN_VALUABLE_BLOB_INFO_PAYMENT_RATE = .05 # points/1000 infos MIN_VALUABLE_BLOB_INFO_PAYMENT_RATE = .05 # points/1000 infos
MIN_VALUABLE_BLOB_HASH_PAYMENT_RATE = .05 # points/1000 infos MIN_VALUABLE_BLOB_HASH_PAYMENT_RATE = .05 # points/1000 infos
MAX_CONNECTIONS_PER_STREAM = 5 MAX_CONNECTIONS_PER_STREAM = 5
DEFAULT_MAX_SEARCH_RESULTS = 25
DEFAULT_MAX_KEY_FEE = 100.0
KNOWN_DHT_NODES = [('104.236.42.182', 4000)]
POINTTRADER_SERVER = 'http://ec2-54-187-192-68.us-west-2.compute.amazonaws.com:2424' POINTTRADER_SERVER = 'http://ec2-54-187-192-68.us-west-2.compute.amazonaws.com:2424'
#POINTTRADER_SERVER = 'http://127.0.0.1:2424' #POINTTRADER_SERVER = 'http://127.0.0.1:2424'

19
lbrynet/lbrynet_daemon/LBRYDaemon.py
View file

@ -11,7 +11,7 @@ from lbrynet.lbrynet_daemon.LBRYDownloader import GetStream, FetcherDaemon
from lbrynet.lbrynet_daemon.LBRYPublisher import Publisher from lbrynet.lbrynet_daemon.LBRYPublisher import Publisher
from lbrynet.core.utils import generate_id from lbrynet.core.utils import generate_id
from lbrynet.lbrynet_console.LBRYSettings import LBRYSettings from lbrynet.lbrynet_console.LBRYSettings import LBRYSettings
from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE from lbrynet.conf import MIN_BLOB_DATA_PAYMENT_RATE, DEFAULT_MAX_SEARCH_RESULTS, KNOWN_DHT_NODES, DEFAULT_MAX_KEY_FEE
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
@ -53,7 +53,7 @@ class LBRYDaemon(xmlrpc.XMLRPC):
self.current_db_revision = 1 self.current_db_revision = 1
self.run_server = True self.run_server = True
self.session = None self.session = None
self.known_dht_nodes = [('104.236.42.182', 4000)] self.known_dht_nodes = KNOWN_DHT_NODES
self.db_dir = os.path.join(os.path.expanduser("~"), ".lbrynet") self.db_dir = os.path.join(os.path.expanduser("~"), ".lbrynet")
self.blobfile_dir = os.path.join(self.db_dir, "blobfiles") self.blobfile_dir = os.path.join(self.db_dir, "blobfiles")
self.peer_port = 3333 self.peer_port = 3333
@ -100,7 +100,9 @@ class LBRYDaemon(xmlrpc.XMLRPC):
self.created_data_dir = True self.created_data_dir = True
self.session_settings = None self.session_settings = None
self.data_rate = MIN_BLOB_DATA_PAYMENT_RATE self.data_rate = MIN_BLOB_DATA_PAYMENT_RATE
self.max_key_fee = 100.0 self.max_key_fee = DEFAULT_MAX_KEY_FEE
self.max_search_results = DEFAULT_MAX_SEARCH_RESULTS
self.search_timeout = 3.0
self.query_handlers = {} self.query_handlers = {}
return defer.succeed(None) return defer.succeed(None)
@ -497,8 +499,7 @@ class LBRYDaemon(xmlrpc.XMLRPC):
def _add_key_fee(data_cost): def _add_key_fee(data_cost):
d = self.session.wallet.get_stream_info_for_name(name) d = self.session.wallet.get_stream_info_for_name(name)
d.addCallback(lambda info: info['key_fee'] if 'key_fee' in info.keys() else 0.0) d.addCallback(lambda info: data_cost + info['key_fee'] if 'key_fee' in info.keys() else data_cost)
d.addCallback(lambda key_fee: key_fee + data_cost)
return d return d
d = self.session.wallet.get_stream_info_for_name(name) d = self.session.wallet.get_stream_info_for_name(name)
@ -510,7 +511,7 @@ class LBRYDaemon(xmlrpc.XMLRPC):
d.addCallback(lambda info: int(info['stream_size'])/1000000*self.data_rate) d.addCallback(lambda info: int(info['stream_size'])/1000000*self.data_rate)
d.addCallback(_add_key_fee) d.addCallback(_add_key_fee)
d.addErrback(lambda _: _add_key_fee(0.0)) d.addErrback(lambda _: _add_key_fee(0.0))
reactor.callLater(3.0, _check_est, d, name) reactor.callLater(self.search_timeout, _check_est, d, name)
return d return d
@ -764,11 +765,11 @@ class LBRYDaemon(xmlrpc.XMLRPC):
print '[' + str(datetime.now()) + '] Search nametrie: ' + search print '[' + str(datetime.now()) + '] Search nametrie: ' + search
filtered_results = [n for n in self.session.wallet.get_nametrie() if n['name'].startswith(search)] filtered_results = [n for n in self.session.wallet.get_nametrie() if n['name'].startswith(search)]
if len(filtered_results) > 25: if len(filtered_results) > self.max_search_results:
filtered_results = filtered_results[:25] filtered_results = filtered_results[:self.max_search_results]
filtered_results = [n for n in filtered_results if 'txid' in n.keys()] filtered_results = [n for n in filtered_results if 'txid' in n.keys()]
resolved_results = [defer.DeferredList([_return_d(n), self._resolve_name_wc(n['name']), resolved_results = [defer.DeferredList([_return_d(n), self._resolve_name_wc(n['name']),
self._get_est_cost(n['name'])]) self._get_est_cost(n['name'])], consumeErrors=True)
for n in filtered_results] for n in filtered_results]
d = defer.DeferredList(resolved_results) d = defer.DeferredList(resolved_results)