Fix "folder missing" message showing incorrectly for beatmaps folder

This commit is contained in:
Dean Herbert
2021-05-20 13:51:08 +09:00
parent 775e0fbde5
commit 8f5b28d264
2 changed files with 5 additions and 3 deletions

View File

@ -65,7 +65,7 @@ namespace osu.Game.Beatmaps
protected override string[] HashableFileTypes => new[] { ".osu" }; protected override string[] HashableFileTypes => new[] { ".osu" };
protected override string ImportFromStablePath => "."; protected override string ImportFromStablePath => string.Empty;
protected override Storage PrepareStableStorage(StableStorage stableStorage) => stableStorage.GetSongStorage(); protected override Storage PrepareStableStorage(StableStorage stableStorage) => stableStorage.GetSongStorage();

View File

@ -691,10 +691,12 @@ namespace osu.Game.Database
{ {
var storage = PrepareStableStorage(stableStorage); var storage = PrepareStableStorage(stableStorage);
// Handle situations like when the user does not have a Skins folder.
if (!storage.ExistsDirectory(ImportFromStablePath)) if (!storage.ExistsDirectory(ImportFromStablePath))
{ {
// This handles situations like when the user does not have a Skins folder string fullPath = storage.GetFullPath(ImportFromStablePath);
Logger.Log($"No {ImportFromStablePath} folder available in osu!stable installation", LoggingTarget.Information, LogLevel.Error);
Logger.Log($"Folder \"{fullPath}\" not available in the target osu!stable installation to import {HumanisedModelName}s.", LoggingTarget.Information, LogLevel.Error);
return Task.CompletedTask; return Task.CompletedTask;
} }