h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 07:33:20 +08:00
Code Issues Releases Wiki Activity

Tidy up config parsing logic

Browse Source
This commit is contained in:
Dean Herbert 2021-02-12 12:57:57 +09:00
parent 5f23bd7259
commit 8ab7d07eab
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/IO/StableStorage.cs
View File

@ -23,6 +23,7 @@ namespace osu.Game.IO
: base(path, host)
{
this.host = host;
songsPath = new Lazy<string>(locateSongsDirectory);
}
@ -33,32 +34,29 @@ namespace osu.Game.IO
private string locateSongsDirectory()
{
var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
var configFile = GetFiles(".", $"osu!.{Environment.UserName}.cfg").SingleOrDefault();
if (configFile == null)
return songsDirectoryPath;
using (var stream = GetStream(configFile))
using (var textReader = new StreamReader(stream))
if (configFile != null)
{
string line;
while ((line = textReader.ReadLine()) != null)
using (var stream = GetStream(configFile))
using (var textReader = new StreamReader(stream))
{
if (line.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase))
string line;
while ((line = textReader.ReadLine()) != null)
{
var directory = line.Split('=')[1].TrimStart();
if (Path.IsPathFullyQualified(directory))
songsDirectoryPath = directory;
if (!line.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase)) continue;
var customDirectory = line.Split('=').LastOrDefault()?.Trim();
if (customDirectory != null && Path.IsPathFullyQualified(customDirectory))
return customDirectory;
break;
}
}
}
return songsDirectoryPath;
return GetFullPath(stable_default_songs_path);
}
}
}