From 9bfdfbea43e14bbad24554a2d8758327882561a7 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Mon, 18 May 2020 00:47:31 +0200
Subject: [PATCH] Move stablestorage check to path selection screen

Also forced stablepath to be empty during auto detection so it checks other sources to load ipc from
---
 osu.Game.Tournament/IPC/FileBasedIPC.cs           | 15 +++++++--------
 osu.Game.Tournament/Screens/SetupScreen.cs        |  1 -
 .../Screens/StablePathSelectScreen.cs             |  4 ++++
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 730779a46b..6d1cd7cc3c 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -232,16 +232,15 @@ namespace osu.Game.Tournament.IPC
 
         private string findFromJsonConfig()
         {
-            Logger.Log("Trying to find stable through the json config");
-
-            if (tournamentStorage.Exists(stable_config))
+            try
             {
-                using (Stream stream = tournamentStorage.GetStream(stable_config, FileAccess.Read, FileMode.Open))
-                using (var sr = new StreamReader(stream))
-                {
-                    stableInfo = JsonConvert.DeserializeObject<StableInfo>(sr.ReadToEnd());
+                Logger.Log("Trying to find stable through the json config");
+
+                if (!string.IsNullOrEmpty(stableInfo.StablePath.Value))
                     return stableInfo.StablePath.Value;
-                }
+            }
+            catch
+            {
             }
 
             return null;
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 4f6d063b10..e0fc98e031 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -84,7 +84,6 @@ namespace osu.Game.Tournament.Screens
                     {
                         stableInfo.StablePath.BindValueChanged(_ =>
                         {
-                            fileBasedIpc?.LocateStableStorage();
                             Schedule(reload);
                         });
                         sceneManager.SetScreen(new StablePathSelectScreen());
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 35c2272918..5c488ae352 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -142,6 +142,7 @@ namespace osu.Game.Tournament.Screens
         private void changePath(Storage storage)
         {
             var target = directorySelector.CurrentDirectory.Value.FullName;
+            Logger.Log($"Changing Stable CE location to {target}");
 
             if (File.Exists(Path.Combine(target, "ipc.txt")))
             {
@@ -161,6 +162,8 @@ namespace osu.Game.Tournament.Screens
                             }));
                     }
 
+                    var fileBasedIpc = ipc as FileBasedIPC;
+                    fileBasedIpc?.LocateStableStorage();
                     sceneManager?.SetScreen(typeof(SetupScreen));
                 }
                 catch (Exception e)
@@ -180,6 +183,7 @@ namespace osu.Game.Tournament.Screens
 
         private void autoDetect()
         {
+            stableInfo.StablePath.Value = string.Empty; // This forces findStablePath() to look elsewhere.
             var fileBasedIpc = ipc as FileBasedIPC;
             fileBasedIpc?.LocateStableStorage();