Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-26 07:49:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix loading custom config if provided

Browse Source
This commit is contained in:
Miguel Jacq 2019-04-20 14:43:04 +10:00
parent a7bbe818bf
commit d2281112b6
No known key found for this signature in database
GPG Key ID: EEA4341C6D97A0B6
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
onionshare/onion.py
View File

@ -160,6 +160,9 @@ class Onion(object):
# Either use settings that are passed in, or use them from common # Either use settings that are passed in, or use them from common
if custom_settings: if custom_settings:
self.settings = custom_settings self.settings = custom_settings
elif config:
self.common.load_settings(config)
self.settings = self.common.settings
else: else:
self.common.load_settings() self.common.load_settings()
self.settings = self.common.settings self.settings = self.common.settings

8
onionshare/settings.py
View File

@ -44,15 +44,17 @@ class Settings(object):
self.common.log('Settings', '__init__') self.common.log('Settings', '__init__')
# Default config
self.filename = self.build_filename()
# If a readable config file was provided, use that instead # If a readable config file was provided, use that instead
if config: if config:
if os.path.isfile(config): if os.path.isfile(config):
self.filename = config self.filename = config
else: else:
self.common.log('Settings', '__init__', 'Supplied config does not exist or is unreadable. Falling back to default location') self.common.log('Settings', '__init__', 'Supplied config does not exist or is unreadable. Falling back to default location')
self.filename = self.build_filename()
else:
# Default config
self.filename = self.build_filename()
# Dictionary of available languages in this version of OnionShare, # Dictionary of available languages in this version of OnionShare,
# mapped to the language name, in that language # mapped to the language name, in that language