h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 18:47:27 +08:00
Code Issues Releases Wiki Activity

invert if-statement and early return + reuse of checkExists

Browse Source
This commit is contained in:
Shivam 2020-05-20 17:25:53 +02:00
parent 15ebe38303
commit b1c957c5e1
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,7 +157,7 @@ namespace osu.Game.Tournament.IPC
return IPCStorage;
}
private static bool checkExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
public bool checkExists(string p) => File.Exists(Path.Combine(p, "ipc.txt"));
private string findStablePath()
{

56
osu.Game.Tournament/Screens/StablePathSelectScreen.cs
View File

@ -140,43 +140,43 @@ namespace osu.Game.Tournament.Screens
private void changePath(Storage storage)
{
var target = directorySelector.CurrentDirectory.Value.FullName;
var fileBasedIpc = ipc as FileBasedIPC;
Logger.Log($"Changing Stable CE location to {target}");
if (File.Exists(Path.Combine(target, "ipc.txt")))
{
stableInfo.StablePath.Value = target;
try
{
using (var stream = storage.GetStream(StableInfo.STABLE_CONFIG, FileAccess.Write, FileMode.Create))
using (var sw = new StreamWriter(stream))
{
sw.Write(JsonConvert.SerializeObject(stableInfo,
new JsonSerializerSettings
{
Formatting = Formatting.Indented,
NullValueHandling = NullValueHandling.Ignore,
DefaultValueHandling = DefaultValueHandling.Ignore,
}));
}
var fileBasedIpc = ipc as FileBasedIPC;
fileBasedIpc?.LocateStableStorage();
sceneManager?.SetScreen(typeof(SetupScreen));
}
catch (Exception e)
{
Logger.Log($"Error during migration: {e.Message}", level: LogLevel.Error);
}
}
else
if (!fileBasedIpc.checkExists(target))
{
overlay = new DialogOverlay();
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;
// Return an error in the picker that the directory does not contain ipc.txt
}
stableInfo.StablePath.Value = target;
try
{
using (var stream = storage.GetStream(StableInfo.STABLE_CONFIG, FileAccess.Write, FileMode.Create))
using (var sw = new StreamWriter(stream))
{
sw.Write(JsonConvert.SerializeObject(stableInfo,
new JsonSerializerSettings
{
Formatting = Formatting.Indented,
NullValueHandling = NullValueHandling.Ignore,
DefaultValueHandling = DefaultValueHandling.Ignore,
}));
}
fileBasedIpc?.LocateStableStorage();
sceneManager?.SetScreen(typeof(SetupScreen));
}
catch (Exception e)
{
Logger.Log($"Error during migration: {e.Message}", level: LogLevel.Error);
}
}
private void autoDetect()