sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +09:00
Code Issues Packages Projects Releases Wiki Activity

Moved stableInfo read to FileBasedIPC

Browse Source 
DI is also not needed anymore to access StableInfo, this goes through FileBasedIPC.
Note: directory selector now always navigates to the osu! lazer base path.
This commit is contained in:
Shivam
2020-05-31 16:27:05 +02:00
parent dbb7651e60
commit 0027f44bd0
4 changed files with 31 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
osu.Game.Tournament/IPC/FileBasedIPC.cs
View File

@ -37,8 +37,7 @@ namespace osu.Game.Tournament.IPC
private int lastBeatmapId;
private ScheduledDelegate scheduled;
[Resolved]
private StableInfo stableInfo { get; set; }
private StableInfo stableInfo;
public const string STABLE_CONFIG = "tournament/stable.json";
@ -161,9 +160,11 @@ namespace osu.Game.Tournament.IPC
public static bool CheckExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
public StableInfo GetStableInfo() => stableInfo;
private string findStablePath()
{
if (!string.IsNullOrEmpty(stableInfo.StablePath.Value))
if (!string.IsNullOrEmpty(readStableConfig()))
return stableInfo.StablePath.Value;
string stableInstallPath = string.Empty;
@ -184,7 +185,7 @@ namespace osu.Game.Tournament.IPC
if (stableInstallPath != null)
{
saveStableConfig(stableInstallPath);
SaveStableConfig(stableInstallPath);
return stableInstallPath;
}
}
@ -197,7 +198,7 @@ namespace osu.Game.Tournament.IPC
}
}
private void saveStableConfig(string path)
public void SaveStableConfig(string path)
{
stableInfo.StablePath.Value = path;
@ -214,6 +215,25 @@ namespace osu.Game.Tournament.IPC
}
}
private string readStableConfig()
{
if (stableInfo == null)
stableInfo = new StableInfo();
if (tournamentStorage.Exists(FileBasedIPC.STABLE_CONFIG))
{
using (Stream stream = tournamentStorage.GetStream(FileBasedIPC.STABLE_CONFIG, FileAccess.Read, FileMode.Open))
using (var sr = new StreamReader(stream))
{
stableInfo = JsonConvert.DeserializeObject<StableInfo>(sr.ReadToEnd());
}
return stableInfo.StablePath.Value;
}
return null;
}
private string findFromEnvVar()
{
try