RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-26 17:02:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a lazy for delegating Songs directory locating until it is actually used.

Browse Source
This commit is contained in:
Lucas A 2021-01-26 19:07:05 +01:00
parent 043385f919
commit 2a2b6f347e
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,38 +17,43 @@ namespace osu.Game.IO
private const string stable_default_songs_path = "Songs"; private const string stable_default_songs_path = "Songs";
private readonly DesktopGameHost host; private readonly DesktopGameHost host;
private readonly string songsPath; private readonly Lazy<string> songsPath;
public StableStorage(string path, DesktopGameHost host) public StableStorage(string path, DesktopGameHost host)
: base(path, host) : base(path, host)
{ {
this.host = host; this.host = host;
songsPath = locateSongsDirectory(); songsPath = new Lazy<string>(locateSongsDirectory);
} }
/// <summary> /// <summary>
/// Returns a <see cref="Storage"/> pointing to the osu-stable Songs directory. /// Returns a <see cref="Storage"/> pointing to the osu-stable Songs directory.
/// </summary> /// </summary>
public Storage GetSongStorage() => new DesktopStorage(songsPath, host); public Storage GetSongStorage() => new DesktopStorage(songsPath.Value, host);
private string locateSongsDirectory() private string locateSongsDirectory()
{ {
var configFile = GetStream(GetFiles(".", "osu!.*.cfg").First());
var textReader = new StreamReader(configFile);
var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path); var songsDirectoryPath = Path.Combine(BasePath, stable_default_songs_path);
while (!textReader.EndOfStream) var configFile = GetFiles(".", "osu!.*.cfg").FirstOrDefault();
if (configFile == null)
return songsDirectoryPath;
using (var textReader = new StreamReader(GetStream(configFile)))
{ {
var line = textReader.ReadLine(); string line;
if (line?.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase) == true) while ((line = textReader.ReadLine()) != null)
{ {
var directory = line.Split('=')[1].TrimStart(); if (line.StartsWith("BeatmapDirectory", StringComparison.OrdinalIgnoreCase))
if (Path.IsPathFullyQualified(directory)) {
songsDirectoryPath = directory; var directory = line.Split('=')[1].TrimStart();
if (Path.IsPathFullyQualified(directory))
songsDirectoryPath = directory;
break; break;
}
} }
} }