From 8b1ea0a6a703b3cd39db186b0786852df9d7b51d Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Wed, 16 Nov 2016 15:58:11 -0500 Subject: [PATCH 1/2] Give priority to arguments over settings in UIManager.setup() --- lbrynet/lbrynet_daemon/UIManager.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lbrynet/lbrynet_daemon/UIManager.py b/lbrynet/lbrynet_daemon/UIManager.py index 93d6b91ec..65c1e244f 100644 --- a/lbrynet/lbrynet_daemon/UIManager.py +++ b/lbrynet/lbrynet_daemon/UIManager.py @@ -61,9 +61,12 @@ class UIManager(object): self.loaded_requirements = None def setup(self, branch=None, check_requirements=None, user_specified=None): - local_ui_path = settings.local_ui_path or user_specified - self.branch = settings.ui_branch or branch - self.check_requirements = settings.check_ui_requirements or check_requirements + local_ui_path = (user_specified if user_specified is not None + else settings.local_ui_path) + self.branch = branch if branch is not None else settings.ui_branch + + self.check_requirements = (check_requirements if check_requirements is not None + else settings.check_ui_requirements) if self._check_for_bundled_ui(): return defer.succeed(True) From 776fe41e033b59d2ecd186d1db2d6cb3ddb35d72 Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Wed, 16 Nov 2016 15:56:22 -0500 Subject: [PATCH 2/2] Switch back to "or" style for default params in UIManager.setup() --- lbrynet/lbrynet_daemon/UIManager.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lbrynet/lbrynet_daemon/UIManager.py b/lbrynet/lbrynet_daemon/UIManager.py index 65c1e244f..f81429637 100644 --- a/lbrynet/lbrynet_daemon/UIManager.py +++ b/lbrynet/lbrynet_daemon/UIManager.py @@ -61,10 +61,9 @@ class UIManager(object): self.loaded_requirements = None def setup(self, branch=None, check_requirements=None, user_specified=None): - local_ui_path = (user_specified if user_specified is not None - else settings.local_ui_path) - self.branch = branch if branch is not None else settings.ui_branch + local_ui_path = user_specified or settings.local_ui_path + self.branch = branch or settings.ui_branch self.check_requirements = (check_requirements if check_requirements is not None else settings.check_ui_requirements)