diff --git a/osu.Game/Database/ArchiveModelManager.cs b/osu.Game/Database/ArchiveModelManager.cs
index d809dbcb01..6719351530 100644
--- a/osu.Game/Database/ArchiveModelManager.cs
+++ b/osu.Game/Database/ArchiveModelManager.cs
@@ -422,15 +422,25 @@ namespace osu.Game.Database
if (retrievedItem == null)
throw new ArgumentException("Specified model could not be found", nameof(item));
+ using (var outputStream = exportStorage.GetStream($"{getValidFilename(item.ToString())}{HandledExtensions.First()}", FileAccess.Write, FileMode.Create))
+ ExportModelTo(retrievedItem, outputStream);
+
+ exportStorage.OpenInNativeExplorer();
+ }
+
+ ///
+ /// Exports an item to the given output stream.
+ ///
+ /// The item to export.
+ /// The output stream to export to.
+ protected virtual void ExportModelTo(TModel model, Stream outputStream)
+ {
using (var archive = ZipArchive.Create())
{
- foreach (var file in retrievedItem.Files)
+ foreach (var file in model.Files)
archive.AddEntry(file.Filename, Files.Storage.GetStream(file.FileInfo.StoragePath));
- using (var outputStream = exportStorage.GetStream($"{getValidFilename(item.ToString())}{HandledExtensions.First()}", FileAccess.Write, FileMode.Create))
- archive.SaveTo(outputStream);
-
- exportStorage.OpenInNativeExplorer();
+ archive.SaveTo(outputStream);
}
}
diff --git a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
index db7e51e833..56c4e75864 100644
--- a/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
+++ b/osu.Game/Scoring/Legacy/LegacyScoreEncoder.cs
@@ -95,7 +95,7 @@ namespace osu.Game.Scoring.Legacy
foreach (var f in score.Replay.Frames.OfType().Select(f => f.ToLegacy(beatmap)))
{
- replayData.Append(FormattableString.Invariant($"{f.Time - lastF.Time}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
+ replayData.Append(FormattableString.Invariant($"{(int)Math.Round(f.Time - lastF.Time)}|{f.MouseX ?? 0}|{f.MouseY ?? 0}|{(int)f.ButtonState},"));
lastF = f;
}
}
diff --git a/osu.Game/Scoring/ScoreManager.cs b/osu.Game/Scoring/ScoreManager.cs
index c7ee26c248..9d3b952ada 100644
--- a/osu.Game/Scoring/ScoreManager.cs
+++ b/osu.Game/Scoring/ScoreManager.cs
@@ -72,6 +72,16 @@ namespace osu.Game.Scoring
}
}
+ protected override void ExportModelTo(ScoreInfo model, Stream outputStream)
+ {
+ var file = model.Files.SingleOrDefault();
+ if (file == null)
+ return;
+
+ using (var inputStream = Files.Storage.GetStream(file.FileInfo.StoragePath))
+ inputStream.CopyTo(outputStream);
+ }
+
protected override IEnumerable GetStableImportPaths(Storage storage)
=> storage.GetFiles(ImportFromStablePath).Where(p => HandledExtensions.Any(ext => Path.GetExtension(p)?.Equals(ext, StringComparison.OrdinalIgnoreCase) ?? false))
.Select(path => storage.GetFullPath(path));