RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-02 12:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

catch ObjectDisposedException

Browse Source
This commit is contained in:
cdwcgt 2023-02-19 02:06:07 +09:00
parent d611603742
commit 30985f192e
1 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using System.IO;
using System.Linq;
using System.Threading;
@ -39,34 +40,45 @@ namespace osu.Game.Database
float i = 0;
bool fileMissing = false;
foreach (var file in model.Files)
try
{
cancellationToken.ThrowIfCancellationRequested();
using (var stream = UserFileStorage.GetStream(file.File.GetStoragePath()))
foreach (var file in model.Files)
{
// Sometimes we cannot find the file(probably deleted by the user), so we handle this and post a error.
if (stream == null)
cancellationToken.ThrowIfCancellationRequested();
using (var stream = UserFileStorage.GetStream(file.File.GetStoragePath()))
{
// Only pop up once to prevent spam.
if (!fileMissing)
// Sometimes we cannot find the file(probably deleted by the user), so we handle this and post a error.
if (stream == null)
{
PostNotification?.Invoke(new SimpleErrorNotification
// Only pop up once to prevent spam.
if (!fileMissing)
{
Text = "Some of your files are missing, they will not be included in the archive"
});
fileMissing = true;
PostNotification?.Invoke(new SimpleErrorNotification
{
Text = "Some of your files are missing, they will not be included in the archive"
});
fileMissing = true;
}
}
else
{
writer.Write(file.Filename, stream);
}
}
else
{
writer.Write(file.Filename, stream);
}
}
i++;
notification.Progress = i / model.Files.Count();
notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
i++;
notification.Progress = i / model.Files.Count();
notification.Text = $"Exporting... ({i}/{model.Files.Count()})";
}
}
catch (ObjectDisposedException)
{
// outputStream may close before writing when request cancel
if (cancellationToken.IsCancellationRequested)
return;
throw;
}
}
}