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

Revert "Fix migration failing on single file copy failure"

Browse Source 
This reverts commit fc8835d43a.
This commit is contained in:
Dean Herbert 2022-08-01 16:57:50 +09:00
parent fc8835d43a
commit 59210ecc9d
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
osu.Game/IO/MigratableStorage.cs
View File

@ -7,7 +7,6 @@ using System;
using System.IO;
using System.Linq;
using System.Threading;
using osu.Framework.Logging;
using osu.Framework.Platform;
namespace osu.Game.IO
@ -17,12 +16,6 @@ namespace osu.Game.IO
/// </summary>
public abstract class MigratableStorage : WrappedStorage
{
/// <summary>
/// The number of file copy failures before actually bailing on migration.
/// This allows some lenience to cover things like temporary files which could not be copied but are also not too important.
/// </summary>
private const int allowed_failures = 10;
/// <summary>
/// A relative list of directory paths which should not be migrated.
/// </summary>
@ -80,7 +73,7 @@ namespace osu.Game.IO
if (topLevelExcludes && IgnoreFiles.Contains(fi.Name))
continue;
allFilesDeleted &= AttemptOperation(() => fi.Delete());
allFilesDeleted &= AttemptOperation(() => fi.Delete(), throwOnFailure: false);
}
foreach (DirectoryInfo dir in target.GetDirectories())
@ -88,16 +81,16 @@ namespace osu.Game.IO
if (topLevelExcludes && IgnoreDirectories.Contains(dir.Name))
continue;
allFilesDeleted &= AttemptOperation(() => dir.Delete(true));
allFilesDeleted &= AttemptOperation(() => dir.Delete(true), throwOnFailure: false);
}
if (target.GetFiles().Length == 0 && target.GetDirectories().Length == 0)
allFilesDeleted &= AttemptOperation(target.Delete);
allFilesDeleted &= AttemptOperation(target.Delete, throwOnFailure: false);
return allFilesDeleted;
}
protected void CopyRecursive(DirectoryInfo source, DirectoryInfo destination, bool topLevelExcludes = true, int totalFailedOperations = 0)
protected void CopyRecursive(DirectoryInfo source, DirectoryInfo destination, bool topLevelExcludes = true)
{
// based off example code https://docs.microsoft.com/en-us/dotnet/api/system.io.directoryinfo
if (!destination.Exists)
@ -108,14 +101,7 @@ namespace osu.Game.IO
if (topLevelExcludes && IgnoreFiles.Contains(fi.Name))
continue;
if (!AttemptOperation(() => fi.CopyTo(Path.Combine(destination.FullName, fi.Name), false)))
{
Logger.Log($"Failed to copy file {fi.Name} during folder migration");
totalFailedOperations++;
if (totalFailedOperations > allowed_failures)
throw new Exception("Aborting due to too many file copy failures during data migration");
}
AttemptOperation(() => fi.CopyTo(Path.Combine(destination.FullName, fi.Name), true));
}
foreach (DirectoryInfo dir in source.GetDirectories())
@ -123,7 +109,7 @@ namespace osu.Game.IO
if (topLevelExcludes && IgnoreDirectories.Contains(dir.Name))
continue;
CopyRecursive(dir, destination.CreateSubdirectory(dir.Name), false, totalFailedOperations);
CopyRecursive(dir, destination.CreateSubdirectory(dir.Name), false);
}
}
@ -132,7 +118,8 @@ namespace osu.Game.IO
/// </summary>
/// <param name="action">The action to perform.</param>
/// <param name="attempts">The number of attempts (250ms wait between each).</param>
protected static bool AttemptOperation(Action action, int attempts = 10)
/// <param name="throwOnFailure">Whether to throw an exception on failure. If <c>false</c>, will silently fail.</param>
protected static bool AttemptOperation(Action action, int attempts = 10, bool throwOnFailure = true)
{
while (true)
{
@ -144,7 +131,12 @@ namespace osu.Game.IO
catch (Exception)
{
if (attempts-- == 0)
{
if (throwOnFailure)
throw;
return false;
}
}
Thread.Sleep(250);