From f9c644b96494a9d5c3ed01f32e8db80320ec844f Mon Sep 17 00:00:00 2001
From: Jack <jack@robisonservice.com>
Date: Mon, 30 May 2016 04:00:47 -0400
Subject: [PATCH] fix switching between --branch and --ui

---
 lbrynet/lbrynet_daemon/LBRYDaemon.py        |  6 ++++--
 lbrynet/lbrynet_daemon/LBRYDaemonControl.py | 13 ++++++++-----
 lbrynet/lbrynet_daemon/LBRYDaemonServer.py  |  4 ++--
 lbrynet/lbrynet_daemon/LBRYUIManager.py     |  4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/lbrynet/lbrynet_daemon/LBRYDaemon.py b/lbrynet/lbrynet_daemon/LBRYDaemon.py
index 32e811fc9..4d1494f80 100644
--- a/lbrynet/lbrynet_daemon/LBRYDaemon.py
+++ b/lbrynet/lbrynet_daemon/LBRYDaemon.py
@@ -382,7 +382,7 @@ class LBRYDaemon(jsonrpc.JSONRPC):
         log.error(failure)
         return jsonrpclib.Fault(self.FAILURE, "error")
 
-    def setup(self, branch=DEFAULT_UI_BRANCH, user_specified=False):
+    def setup(self, branch=DEFAULT_UI_BRANCH, user_specified=False, branch_specified=False):
         def _log_starting_vals():
             d = self._get_lbry_files()
             d.addCallback(lambda r: json.dumps([d[1] for d in r]))
@@ -427,7 +427,9 @@ class LBRYDaemon(jsonrpc.JSONRPC):
         self.connection_problem_checker.start(1)
 
         d = defer.Deferred()
-        d.addCallback(lambda _: self.lbry_ui_manager.setup(branch=branch, user_specified=user_specified))
+        d.addCallback(lambda _: self.lbry_ui_manager.setup(branch=branch,
+                                                           user_specified=user_specified,
+                                                           branch_specified=branch_specified))
         d.addCallback(lambda _: self._initial_setup())
         d.addCallback(lambda _: threads.deferToThread(self._setup_data_directory))
         d.addCallback(lambda _: self._check_db_migration())
diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonControl.py b/lbrynet/lbrynet_daemon/LBRYDaemonControl.py
index 1d7531331..72c8d2c1e 100644
--- a/lbrynet/lbrynet_daemon/LBRYDaemonControl.py
+++ b/lbrynet/lbrynet_daemon/LBRYDaemonControl.py
@@ -13,7 +13,8 @@ from twisted.internet import reactor, defer
 from jsonrpc.proxy import JSONRPCProxy
 
 from lbrynet.lbrynet_daemon.LBRYDaemonServer import LBRYDaemonServer
-from lbrynet.conf import API_CONNECTION_STRING, API_INTERFACE, API_ADDRESS, API_PORT, DEFAULT_WALLET, UI_ADDRESS
+from lbrynet.conf import API_CONNECTION_STRING, API_INTERFACE, API_ADDRESS, API_PORT, \
+                            DEFAULT_WALLET, UI_ADDRESS, DEFAULT_UI_BRANCH
 
 
 if sys.platform != "darwin":
@@ -68,12 +69,11 @@ def start():
                         help="path to custom UI folder",
                         default=None)
     parser.add_argument("--branch",
-                        help="Branch of lbry-web-ui repo to use, defaults on master",
-                        default="master")
+                        help="Branch of lbry-web-ui repo to use, defaults on master")
     parser.add_argument('--no-launch', dest='launchui', action="store_false")
     parser.add_argument('--log-to-console', dest='logtoconsole', action="store_true")
     parser.add_argument('--quiet', dest='quiet', action="store_true")
-    parser.set_defaults(launchui=True, logtoconsole=False, quiet=False)
+    parser.set_defaults(branch=False, launchui=True, logtoconsole=False, quiet=False)
     args = parser.parse_args()
 
     if args.logtoconsole:
@@ -104,7 +104,10 @@ def start():
     if test_internet_connection():
         lbry = LBRYDaemonServer()
 
-        d = lbry.start(branch=args.branch, user_specified=args.ui, wallet=args.wallet)
+        d = lbry.start(branch=args.branch if args.branch else DEFAULT_UI_BRANCH,
+                       user_specified=args.ui,
+                       wallet=args.wallet,
+                       branch_specified=True if args.branch else False)
         if args.launchui:
             d.addCallback(lambda _: webbrowser.open(UI_ADDRESS))
 
diff --git a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py b/lbrynet/lbrynet_daemon/LBRYDaemonServer.py
index 948c3ea2e..393a87b72 100644
--- a/lbrynet/lbrynet_daemon/LBRYDaemonServer.py
+++ b/lbrynet/lbrynet_daemon/LBRYDaemonServer.py
@@ -198,7 +198,7 @@ class LBRYDaemonServer(object):
         self.root.putChild(API_ADDRESS, self._api)
         return defer.succeed(True)
 
-    def start(self, branch=DEFAULT_UI_BRANCH, user_specified=False, wallet=DEFAULT_WALLET):
+    def start(self, branch=DEFAULT_UI_BRANCH, user_specified=False, branch_specified=False, wallet=DEFAULT_WALLET):
         d = self._setup_server(self._setup_server(wallet))
-        d.addCallback(lambda _: self._api.setup(branch, user_specified))
+        d.addCallback(lambda _: self._api.setup(branch, user_specified, branch_specified))
         return d
diff --git a/lbrynet/lbrynet_daemon/LBRYUIManager.py b/lbrynet/lbrynet_daemon/LBRYUIManager.py
index baa4b09f9..b4aa33cd5 100644
--- a/lbrynet/lbrynet_daemon/LBRYUIManager.py
+++ b/lbrynet/lbrynet_daemon/LBRYUIManager.py
@@ -70,7 +70,7 @@ class LBRYUIManager(object):
                 self.loaded_branch = None
                 self.loaded_requirements = None
 
-    def setup(self, branch=DEFAULT_UI_BRANCH, user_specified=None):
+    def setup(self, branch=DEFAULT_UI_BRANCH, user_specified=None, branch_specified=False):
         self.branch = branch
         if user_specified:
             if os.path.isdir(user_specified):
@@ -82,7 +82,7 @@ class LBRYUIManager(object):
                 return d
             else:
                 log.info("User specified UI directory doesn't exist, using " + branch)
-        elif self.loaded_branch == "user-specified":
+        elif self.loaded_branch == "user-specified" and not branch_specified:
             log.info("Loading user provided UI")
             d = self._load_ui()
             return d