1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 12:57:36 +08:00

override a sub-method instead of the whole Export()

This commit is contained in:
integer 2022-12-24 22:18:42 +00:00
parent 498d00935b
commit d392d1a5c0
2 changed files with 10 additions and 22 deletions

View File

@ -33,17 +33,17 @@ namespace osu.Game.Database
UserFileStorage = storage.GetStorageForDirectory(@"files");
}
protected virtual string GetItemExportString(TModel item) => item.GetDisplayString().GetValidFilename();
/// <summary>
/// Exports an item to a legacy (.zip based) package.
/// </summary>
/// <param name="item">The item to export.</param>
public virtual void Export(TModel item)
public void Export(TModel item)
{
string itemFilename = item.GetDisplayString().GetValidFilename();
IEnumerable<string> existingExports = exportStorage.GetFiles("", $"{GetItemExportString(item)}*{FileExtension}");
IEnumerable<string> existingExports = exportStorage.GetFiles("", $"{itemFilename}*{FileExtension}");
string filename = NamingUtils.GetNextBestFilename(existingExports, $"{itemFilename}{FileExtension}");
string filename = NamingUtils.GetNextBestFilename(existingExports, $"{GetItemExportString(item)}{FileExtension}");
using (var stream = exportStorage.CreateFileSafely(filename))
ExportModelTo(item, stream);

View File

@ -3,13 +3,11 @@
#nullable disable
using System.Collections.Generic;
using System.IO;
using System.Linq;
using osu.Framework.Platform;
using osu.Game.Extensions;
using osu.Game.Scoring;
using osu.Game.Utils;
namespace osu.Game.Database
{
@ -17,27 +15,17 @@ namespace osu.Game.Database
{
protected override string FileExtension => ".osr";
private readonly Storage exportStorage;
public LegacyScoreExporter(Storage storage)
: base(storage)
{
exportStorage = storage.GetStorageForDirectory(@"exports");
}
private string GetScoreExportString(ScoreInfo score) => $"{score.GetDisplayString()} ({score.Date.LocalDateTime:yyyy-MM-dd})";
public override void Export(ScoreInfo score)
protected override string GetItemExportString(ScoreInfo score)
{
string scoreExportTitle = GetScoreExportString(score).GetValidFilename();
IEnumerable<string> existingExports = exportStorage.GetFiles("", $"{scoreExportTitle}*{FileExtension}");
string scoreExportFilename = NamingUtils.GetNextBestFilename(existingExports, $"{scoreExportTitle}{FileExtension}");
using (var stream = exportStorage.CreateFileSafely(scoreExportFilename))
ExportModelTo(score, stream);
exportStorage.PresentFileExternally(scoreExportFilename);
string scoreString = score.GetDisplayString();
string filename = $"{scoreString} ({score.Date.LocalDateTime:yyyy-MM-dd})";
return filename.GetValidFilename();
}
public override void ExportModelTo(ScoreInfo model, Stream outputStream)