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

correctly save daemon_settings.yml on fresh install

Browse source
This commit is contained in:
Lex Berezhny 2018-12-08 12:51:43 -05:00
parent 7713881e71
commit 946488bce9
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lbrynet/conf.py
View file

@ -49,8 +49,6 @@ DEFAULT_DHT_NODES = [
('lbrynet3.lbry.io', 4444)
]
DEFAULT_SETTINGS_FILENAME = 'daemon_settings.yml'
settings_decoders = {
'.json': json.loads,
'.yml': yaml.load
@ -485,7 +483,7 @@ class Config:
}
def save_conf_file_settings(self):
path = conf_file or self.get_valid_settings_filename() or DEFAULT_SETTINGS_FILENAME
path = conf_file or self.get_valid_settings_filename()
# reverse the conversions done after loading the settings from the conf
# file
rev = self._convert_conf_file_lists_reverse(self._data[TYPE_PERSISTED])
@ -593,12 +591,10 @@ class Config:
def get_valid_settings_filename(self):
data_dir = self.ensure_data_dir()
yml_path = os.path.join(data_dir, 'daemon_settings.yml')
json_path = os.path.join(data_dir, 'daemon_settings.json')
if os.path.isfile(yml_path):
return yml_path
elif os.path.isfile(json_path):
if os.path.isfile(json_path):
return json_path
return os.path.join(data_dir, 'daemon_settings.yml')
def get_installation_id(self):
install_id_filename = os.path.join(self.ensure_data_dir(), "install_id")