sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-nested-folder-migration-endless-copy' into migration-ui

Browse Source
This commit is contained in:
Dean Herbert
2020-05-15 13:04:16 +09:00
parent 364aa5aa12 aea192080a
commit 9ed0e8891b
13 changed files with 62 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/IO/OsuStorage.cs
View File

@ -48,10 +48,14 @@ namespace osu.Game.IO
var source = new DirectoryInfo(GetFullPath("."));
var destination = new DirectoryInfo(newLocation);
if (source.FullName == destination.FullName)
// using Uri is the easiest way to check equality and contains (https://stackoverflow.com/a/7710620)
var sourceUri = new Uri(source.FullName + Path.DirectorySeparatorChar);
var destinationUri = new Uri(destination.FullName + Path.DirectorySeparatorChar);
if (sourceUri == destinationUri)
throw new ArgumentException("Destination provided is already the current location", nameof(newLocation));
if (destination.FullName.Contains(source.FullName))
if (sourceUri.IsBaseOf(destinationUri))
throw new ArgumentException("Destination provided is inside the source", nameof(newLocation));
// ensure the new location has no files present, else hard abort