From e018d0744152e92df3e4559b7ce98551c30a57f2 Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Wed, 20 May 2020 16:30:38 +0200
Subject: [PATCH] Use one constant for STABLE_CONFIG location string

---
 osu.Game.Tournament/IPC/FileBasedIPC.cs               | 4 +---
 osu.Game.Tournament/Models/StableInfo.cs              | 4 ++++
 osu.Game.Tournament/Screens/SetupScreen.cs            | 1 -
 osu.Game.Tournament/Screens/StablePathSelectScreen.cs | 4 +---
 osu.Game.Tournament/TournamentGameBase.cs             | 8 ++++----
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 6d1cd7cc3c..d2d74e94b2 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -40,8 +40,6 @@ namespace osu.Game.Tournament.IPC
         [Resolved]
         private StableInfo stableInfo { get; set; }
 
-        private const string stable_config = "tournament/stable.json";
-
         public Storage IPCStorage { get; private set; }
 
         [Resolved]
@@ -196,7 +194,7 @@ namespace osu.Game.Tournament.IPC
 
         private void saveStablePath()
         {
-            using (var stream = tournamentStorage.GetStream(stable_config, FileAccess.Write, FileMode.Create))
+            using (var stream = tournamentStorage.GetStream(StableInfo.STABLE_CONFIG, FileAccess.Write, FileMode.Create))
             using (var sw = new StreamWriter(stream))
             {
                 sw.Write(JsonConvert.SerializeObject(stableInfo,
diff --git a/osu.Game.Tournament/Models/StableInfo.cs b/osu.Game.Tournament/Models/StableInfo.cs
index 4818842151..63423ca6fa 100644
--- a/osu.Game.Tournament/Models/StableInfo.cs
+++ b/osu.Game.Tournament/Models/StableInfo.cs
@@ -2,6 +2,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
+using Newtonsoft.Json;
 using osu.Framework.Bindables;
 
 namespace osu.Game.Tournament.Models
@@ -13,5 +14,8 @@ namespace osu.Game.Tournament.Models
     public class StableInfo
     {
         public Bindable<string> StablePath = new Bindable<string>(string.Empty);
+
+        [JsonIgnore]
+        public const string STABLE_CONFIG = "tournament/stable.json";
     }
 }
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index 1c479bdec4..9f8f81aa80 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -28,7 +28,6 @@ namespace osu.Game.Tournament.Screens
 
         private LoginOverlay loginOverlay;
         private ActionableInfo resolution;
-        private const string stable_config = "tournament/stable.json";
 
         [Resolved]
         private MatchIPCInfo ipc { get; set; }
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 5c488ae352..a42a5dc0fc 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -26,8 +26,6 @@ namespace osu.Game.Tournament.Screens
     {
         private DirectorySelector directorySelector;
 
-        private const string stable_config = "tournament/stable.json";
-
         [Resolved]
         private StableInfo stableInfo { get; set; }
 
@@ -150,7 +148,7 @@ namespace osu.Game.Tournament.Screens
 
                 try
                 {
-                    using (var stream = storage.GetStream(stable_config, FileAccess.Write, FileMode.Create))
+                    using (var stream = storage.GetStream(StableInfo.STABLE_CONFIG, FileAccess.Write, FileMode.Create))
                     using (var sw = new StreamWriter(stream))
                     {
                         sw.Write(JsonConvert.SerializeObject(stableInfo,
diff --git a/osu.Game.Tournament/TournamentGameBase.cs b/osu.Game.Tournament/TournamentGameBase.cs
index 31c56c7fc4..00946399fb 100644
--- a/osu.Game.Tournament/TournamentGameBase.cs
+++ b/osu.Game.Tournament/TournamentGameBase.cs
@@ -147,7 +147,10 @@ namespace osu.Game.Tournament
 
         private void readStableConfig()
         {
-            if (storage.Exists(stable_config))
+            if (stableInfo == null)
+                stableInfo = new StableInfo();
+
+            if (storage.Exists(StableInfo.STABLE_CONFIG))
             {
                 using (Stream stream = storage.GetStream(stable_config, FileAccess.Read, FileMode.Open))
                 using (var sr = new StreamReader(stream))
@@ -156,9 +159,6 @@ namespace osu.Game.Tournament
                 }
             }
 
-            if (stableInfo == null)
-                stableInfo = new StableInfo();
-
             dependencies.Cache(stableInfo);
         }