From 59b006f9ac8688b75fa6556fb286f27f37cdbbca Mon Sep 17 00:00:00 2001
From: Shivam <s.r.v.ramkisoen@umail.leidenuniv.nl>
Date: Sun, 17 May 2020 22:46:43 +0200
Subject: [PATCH] Make IPC error dialog reusable

and inspectcode fixes
---
 .../{IPCNotFoundDialog.cs => IPCErrorDialog.cs}       | 11 +++++------
 osu.Game.Tournament/IPC/FileBasedIPC.cs               |  3 ++-
 osu.Game.Tournament/Screens/SetupScreen.cs            |  2 +-
 osu.Game.Tournament/Screens/StablePathSelectScreen.cs |  5 +++--
 4 files changed, 11 insertions(+), 10 deletions(-)
 rename osu.Game.Tournament/Components/{IPCNotFoundDialog.cs => IPCErrorDialog.cs} (65%)

diff --git a/osu.Game.Tournament/Components/IPCNotFoundDialog.cs b/osu.Game.Tournament/Components/IPCErrorDialog.cs
similarity index 65%
rename from osu.Game.Tournament/Components/IPCNotFoundDialog.cs
rename to osu.Game.Tournament/Components/IPCErrorDialog.cs
index d4f9edc182..07fd0ac973 100644
--- a/osu.Game.Tournament/Components/IPCNotFoundDialog.cs
+++ b/osu.Game.Tournament/Components/IPCErrorDialog.cs
@@ -6,14 +6,13 @@ using osu.Game.Overlays.Dialog;
 
 namespace osu.Game.Tournament.Components
 {
-    public class IPCNotFoundDialog : PopupDialog
+    public class IPCErrorDialog : PopupDialog
     {
-        public IPCNotFoundDialog()
+        public IPCErrorDialog(string headerText, string bodyText)
         {
-            BodyText = "Select a directory that contains an osu! Cutting Edge installation";
-
-            Icon = FontAwesome.Regular.Angry;
-            HeaderText = @"This is an invalid IPC Directory!";
+            Icon = FontAwesome.Regular.SadTear;
+            HeaderText = headerText;
+            BodyText = bodyText;
             Buttons = new PopupDialogButton[]
             {
                 new PopupDialogOkButton
diff --git a/osu.Game.Tournament/IPC/FileBasedIPC.cs b/osu.Game.Tournament/IPC/FileBasedIPC.cs
index 0454ef4e41..730779a46b 100644
--- a/osu.Game.Tournament/IPC/FileBasedIPC.cs
+++ b/osu.Game.Tournament/IPC/FileBasedIPC.cs
@@ -233,6 +233,7 @@ namespace osu.Game.Tournament.IPC
         private string findFromJsonConfig()
         {
             Logger.Log("Trying to find stable through the json config");
+
             if (tournamentStorage.Exists(stable_config))
             {
                 using (Stream stream = tournamentStorage.GetStream(stable_config, FileAccess.Read, FileMode.Open))
@@ -242,7 +243,7 @@ namespace osu.Game.Tournament.IPC
                     return stableInfo.StablePath.Value;
                 }
             }
-            
+
             return null;
         }
 
diff --git a/osu.Game.Tournament/Screens/SetupScreen.cs b/osu.Game.Tournament/Screens/SetupScreen.cs
index dcaadc8247..4f6d063b10 100644
--- a/osu.Game.Tournament/Screens/SetupScreen.cs
+++ b/osu.Game.Tournament/Screens/SetupScreen.cs
@@ -82,7 +82,7 @@ namespace osu.Game.Tournament.Screens
                     ButtonText = "Refresh",
                     Action = () =>
                     {
-                         stableInfo.StablePath.BindValueChanged(_ =>
+                        stableInfo.StablePath.BindValueChanged(_ =>
                         {
                             fileBasedIpc?.LocateStableStorage();
                             Schedule(reload);
diff --git a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
index 8b75bd9290..35c2272918 100644
--- a/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
+++ b/osu.Game.Tournament/Screens/StablePathSelectScreen.cs
@@ -171,7 +171,7 @@ namespace osu.Game.Tournament.Screens
             else
             {
                 overlay = new DialogOverlay();
-                overlay.Push(new IPCNotFoundDialog());
+                overlay.Push(new IPCErrorDialog("This is an invalid IPC Directory", "Select a directory that contains an osu! stable cutting edge installation and make sure it has an empty ipc.txt file in it."));
                 AddInternal(overlay);
                 Logger.Log("Folder is not an osu! stable CE directory");
                 // Return an error in the picker that the directory does not contain ipc.txt
@@ -182,11 +182,12 @@ namespace osu.Game.Tournament.Screens
         {
             var fileBasedIpc = ipc as FileBasedIPC;
             fileBasedIpc?.LocateStableStorage();
+
             if (fileBasedIpc?.IPCStorage == null)
             {
                 // Could not auto detect
                 overlay = new DialogOverlay();
-                overlay.Push(new IPCNotFoundDialog());
+                overlay.Push(new IPCErrorDialog("Failed to auto detect", "An osu! stable cutting-edge installation could not be auto detected.\nPlease try and manually point to the directory."));
                 AddInternal(overlay);
             }
             else