sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Improve xmldoc and fix silly progress text in LegacyArchiveExporter

Browse Source
This commit is contained in:
Dean Herbert
2023-05-05 16:45:45 +09:00
parent f2dd457b3d
commit 4ec98b0578
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Database/LegacyArchiveExporter.cs
View File

@ -17,6 +17,9 @@ using Logger = osu.Framework.Logging.Logger;
namespace osu.Game.Database namespace osu.Game.Database
{ {
/// <summary>
/// An exporter which handles the common scenario of exporting a model to a zip-based archive, usually with a custom file extension.
/// </summary>
public abstract class LegacyArchiveExporter<TModel> : LegacyExporter<TModel> public abstract class LegacyArchiveExporter<TModel> : LegacyExporter<TModel>
where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey where TModel : RealmObject, IHasNamedFiles, IHasGuidPrimaryKey
{ {
@ -31,17 +34,18 @@ namespace osu.Game.Database
/// <summary> /// <summary>
/// Exports an item to Stream as a legacy (.zip based) package. /// Exports an item to Stream as a legacy (.zip based) package.
/// </summary> /// </summary>
/// <param name="model">The model will be exported.</param> /// <param name="model">The model to be exported.</param>
/// <param name="outputStream">The output stream to export to.</param> /// <param name="outputStream">The output stream to export to.</param>
/// <param name="notification">The notification will displayed to the user</param> /// <param name="notification">An optional target notification to update with ongoing export progress.</param>
/// <param name="cancellationToken">The Cancellation token that can cancel the exporting.</param> /// <param name="cancellationToken">The cancellation token.</param>
private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default) private void exportZipArchive(TModel model, Stream outputStream, ProgressNotification? notification, CancellationToken cancellationToken = default)
{ {
try try
{ {
using var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate)); using var writer = new ZipWriter(outputStream, new ZipWriterOptions(CompressionType.Deflate));
float i = 0; int i = 0;
int fileCount = model.Files.Count();
bool fileMissing = false; bool fileMissing = false;
foreach (var file in model.Files) foreach (var file in model.Files)
@ -66,13 +70,12 @@ namespace osu.Game.Database
} }
} }
i++;
if (notification != null) if (notification != null)
{ {
notification.Progress = i / model.Files.Count(); notification.Progress = (float)(i + 1) / fileCount;
notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
} }
i++;
} }
} }
catch (ObjectDisposedException) catch (ObjectDisposedException)