h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 23:12:56 +08:00
Code Issues Releases Wiki Activity

Move population of import time to the Populate method

Browse Source 
Feels like a better place to be doing this. I think we want to keep any
kind of potentially expensive work in the `Populate` method.
This commit is contained in:
Dean Herbert 2023-08-18 17:54:39 +09:00
parent eb2460d180
commit 864f1bdb3e
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
osu.Game/Beatmaps/BeatmapImporter.cs
View File

@ -152,6 +152,8 @@ namespace osu.Game.Beatmaps
if (archive != null)
beatmapSet.Beatmaps.AddRange(createBeatmapDifficulties(beatmapSet, realm));
beatmapSet.DateAdded = getDateAdded(archive);
foreach (BeatmapInfo b in beatmapSet.Beatmaps)
{
b.BeatmapSet = beatmapSet;
@ -302,47 +304,37 @@ namespace osu.Game.Beatmaps
beatmap = Decoder.GetDecoder<Beatmap>(stream).Decode(stream);
}
var dateAdded = DateTimeOffset.UtcNow;
// Apply proper date added for a beatmapset when importing from stable.
// Stable tracks said date using the filesystem last modified date on the .osu file.
if (reader is LegacyDirectoryArchiveReader legacyReader)
{
dateAdded = determineDateAdded(legacyReader);
}
return new BeatmapSetInfo
{
OnlineID = beatmap.BeatmapInfo.BeatmapSet?.OnlineID ?? -1,
DateAdded = dateAdded
};
}
/// <summary>
/// Used for beatmapsets in legacy (stable) storage.
/// Determine the date a given beatmapset has been added to the game.
/// The specific date is determined based on the oldest `.osu` file existing
/// in the beatmapset directory.
/// For legacy imports, we can use the oldest file write time for any `.osu` file in the directory.
/// For any other import types, use "now".
/// </summary>
/// <param name="reader"></param>
/// <returns></returns>
private DateTimeOffset determineDateAdded(LegacyDirectoryArchiveReader reader)
private DateTimeOffset getDateAdded(ArchiveReader? reader)
{
var beatmaps = reader.Filenames.Where(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
DateTimeOffset dateAdded = DateTimeOffset.UtcNow;
var dateAdded = File.GetLastWriteTimeUtc(reader.GetPath(beatmaps.First()));
foreach (string beatmapName in beatmaps)
if (reader is LegacyDirectoryArchiveReader legacyReader)
{
var currentDateAdded = File.GetLastWriteTimeUtc(reader.GetPath(beatmapName));
var beatmaps = reader.Filenames.Where(f => f.EndsWith(".osu", StringComparison.OrdinalIgnoreCase));
if (currentDateAdded < dateAdded)
dateAdded = File.GetLastWriteTimeUtc(legacyReader.GetPath(beatmaps.First()));
foreach (string beatmapName in beatmaps)
{
dateAdded = currentDateAdded;
var currentDateAdded = File.GetLastWriteTimeUtc(legacyReader.GetPath(beatmapName));
if (currentDateAdded < dateAdded)
dateAdded = currentDateAdded;
}
}
return new DateTimeOffset(dateAdded);
return dateAdded;
}
/// <summary>