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

re-use lbryid

Browse source
This commit is contained in:
Jack 2016-12-19 13:27:45 -05:00
parent 0044d6cf75
commit f301741807
1 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lbrynet/lbrynet_daemon/Daemon.py
View file

@ -96,8 +96,9 @@ BAD_REQUEST = 400
NOT_FOUND = 404 NOT_FOUND = 404
OK_CODE = 200 OK_CODE = 200
PENDING_LBRY_ID = "not set" PENDING_ID = "not set"
SHORT_LBRY_ID_LEN = 20 SHORT_ID_LEN = 20
class Checker: class Checker:
"""The looping calls the daemon runs""" """The looping calls the daemon runs"""
@ -119,6 +120,7 @@ class FileID:
REMOTE_SERVER = "www.lbry.io" REMOTE_SERVER = "www.lbry.io"
class NoValidSearch(Exception): class NoValidSearch(Exception):
pass pass
@ -264,7 +266,7 @@ class Daemon(AuthJSONRPCServer):
self.log_uploader = log_support.LogUploader.load('lbrynet', self.log_file) self.log_uploader = log_support.LogUploader.load('lbrynet', self.log_file)
self.analytics_manager = analytics_manager self.analytics_manager = analytics_manager
self.lbryid = utils.generate_id() self.lbryid = PENDING_ID
self.daemon_conf = conf.settings.get_conf_filename() self.daemon_conf = conf.settings.get_conf_filename()
self.wallet_user = None self.wallet_user = None
@ -364,12 +366,22 @@ class Daemon(AuthJSONRPCServer):
return d return d
def _load_caches(self): def _load_caches(self):
if os.path.isfile(os.path.join(self.db_dir, "stream_info_cache.json")): name_cache_filename = os.path.join(self.db_dir, "stream_info_cache.json")
filename = os.path.join(self.db_dir, "stream_info_cache.json") lbry_id_filename = os.path.join(self.db_dir, "lbry_id")
with open(filename, "r") as stream_info_cache:
self.name_cache = json.loads(stream_info_cache.read()) if os.path.isfile(name_cache_filename):
with open(name_cache_filename, "r") as name_cache:
self.name_cache = json.loads(name_cache.read())
log.info("Loaded claim info cache") log.info("Loaded claim info cache")
if os.path.isfile(lbry_id_filename):
with open(lbry_id_filename, "r") as lbry_id_file:
self.lbryid = base58.b58decode(lbry_id_file.read())
else:
with open(lbry_id_filename, "w") as lbry_id_file:
self.lbryid = utils.generate_id()
lbry_id_file.write(base58.b58encode(self.lbryid))
def _set_events(self): def _set_events(self):
context = analytics.make_context(self._get_platform(), self.wallet_type) context = analytics.make_context(self._get_platform(), self.wallet_type)
self._events = analytics.Events(context, base58.b58encode(self.lbryid), self._session_id) self._events = analytics.Events(context, base58.b58encode(self.lbryid), self._session_id)
@ -537,7 +549,7 @@ class Daemon(AuthJSONRPCServer):
def _upload_log(self, log_type=None, exclude_previous=False, force=False): def _upload_log(self, log_type=None, exclude_previous=False, force=False):
if self.upload_log or force: if self.upload_log or force:
lbry_id = base58.b58encode(self.lbryid)[:SHORT_LBRY_ID_LEN] lbry_id = base58.b58encode(self.lbryid)[:SHORT_ID_LEN]
try: try:
self.log_uploader.upload(exclude_previous, lbry_id, log_type) self.log_uploader.upload(exclude_previous, lbry_id, log_type)
except requests.RequestException: except requests.RequestException:
@ -1203,7 +1215,7 @@ class Daemon(AuthJSONRPCServer):
def _prepare_message(blobs): def _prepare_message(blobs):
msg = { msg = {
'lbry_id': base58.b58encode(self.lbryid)[:SHORT_LBRY_ID_LEN], 'lbry_id': base58.b58encode(self.lbryid)[:SHORT_ID_LEN],
'managed_blobs': len(blobs), 'managed_blobs': len(blobs),
'managed_streams': len(self.lbry_file_manager.lbry_files), 'managed_streams': len(self.lbry_file_manager.lbry_files),
} }