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

Merge branch 'master' into android_platform_paths

Browse source
This commit is contained in:
Jack Robison 2017-08-22 15:39:02 -04:00
commit 5fc55fc482
No known key found for this signature in database
GPG key ID: 284699E7404E3CFF
5 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bumpversion.cfg
View file

@ -1,5 +1,5 @@
[bumpversion] [bumpversion]
current_version = 0.14.1 current_version = 0.15.0
commit = True commit = True
tag = True tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))? parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))?

2
CHANGELOG.md
View file

@ -21,7 +21,7 @@ at anytime.
* *
### Changed ### Changed
* * Persist DHT node id
* *
### Added ### Added

14
lbrynet/conf.py
View file

@ -287,6 +287,7 @@ class Config(object):
self._installation_id = None self._installation_id = None
self._session_id = base58.b58encode(utils.generate_id()) self._session_id = base58.b58encode(utils.generate_id())
self._node_id = None
self._fixed_defaults = fixed_defaults self._fixed_defaults = fixed_defaults
self._adjustable_defaults = adjustable_defaults self._adjustable_defaults = adjustable_defaults
@ -528,6 +529,18 @@ class Config(object):
install_id_file.write(self._installation_id) install_id_file.write(self._installation_id)
return self._installation_id return self._installation_id
def get_node_id(self):
node_id_filename = os.path.join(self.ensure_data_dir(), "node_id")
if not self._node_id:
if os.path.isfile(node_id_filename):
with open(node_id_filename, "r") as node_id_file:
self._node_id = base58.b58decode(node_id_file.read())
if not self._node_id:
self._node_id = utils.generate_id()
with open(node_id_filename, "w") as node_id_file:
node_id_file.write(base58.b58encode(self._node_id))
return self._node_id
def get_session_id(self): def get_session_id(self):
return self._session_id return self._session_id
@ -551,5 +564,6 @@ def initialize_settings(load_conf_file=True):
settings = Config(FIXED_SETTINGS, ADJUSTABLE_SETTINGS, settings = Config(FIXED_SETTINGS, ADJUSTABLE_SETTINGS,
environment=get_default_env()) environment=get_default_env())
settings.installation_id = settings.get_installation_id() settings.installation_id = settings.get_installation_id()
settings.node_id = settings.get_node_id()
if load_conf_file: if load_conf_file:
settings.load_conf_file_settings() settings.load_conf_file_settings()

2
lbrynet/daemon/Daemon.py
View file

@ -207,7 +207,7 @@ class Daemon(AuthJSONRPCServer):
# of the daemon, but I don't want to deal with that now # of the daemon, but I don't want to deal with that now
self.analytics_manager = analytics_manager self.analytics_manager = analytics_manager
self.lbryid = utils.generate_id() self.lbryid = conf.settings.node_id
self.wallet_user = None self.wallet_user = None
self.wallet_password = None self.wallet_password = None

1
tests/mocks.py
View file

@ -280,6 +280,7 @@ def mock_conf_settings(obj, settings={}):
original_settings = conf.settings original_settings = conf.settings
conf.settings = conf.Config(conf.FIXED_SETTINGS, conf.ADJUSTABLE_SETTINGS) conf.settings = conf.Config(conf.FIXED_SETTINGS, conf.ADJUSTABLE_SETTINGS)
conf.settings.installation_id = conf.settings.get_installation_id() conf.settings.installation_id = conf.settings.get_installation_id()
conf.settings.node_id = conf.settings.get_node_id()
conf.settings.update(settings) conf.settings.update(settings)
def _reset_settings(): def _reset_settings():