a55e271a69
* Makes EnsureDirectory properly work for relative and absolute paths * Adds a `PathUtility.GetFullPath` which returns full paths for relative paths to `Core.BaseDirectory`. If the path is absolute, it will return as-is. * Moves EnsureDirectory to `PathUtility`. So `ScriptsHandler.EnsureDirectory` and `AssemblyHandler.EnsureDirectory` are now `PathUtility.EnsureDirectory` * Fixes crash guard so that it copies accounts properly. * Changes world save and auto archive to use a random folder name inside of the temp folder.
67 lines
2.6 KiB
C#
67 lines
2.6 KiB
C#
/*************************************************************************
|
|
* ModernUO *
|
|
* Copyright 2019-2021 - ModernUO Development Team *
|
|
* Email: hi@modernuo.com *
|
|
* File: PathUtility.cs *
|
|
* *
|
|
* This program is free software: you can redistribute it and/or modify *
|
|
* it under the terms of the GNU General Public License as published by *
|
|
* the Free Software Foundation, either version 3 of the License, or *
|
|
* (at your option) any later version. *
|
|
* *
|
|
* You should have received a copy of the GNU General Public License *
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
|
|
*************************************************************************/
|
|
|
|
using System;
|
|
using System.IO;
|
|
using Server.Text;
|
|
|
|
namespace Server
|
|
{
|
|
public static class PathUtility
|
|
{
|
|
public static string EnsureDirectory(string dir)
|
|
{
|
|
var path = GetFullPath(dir, Core.BaseDirectory);
|
|
Directory.CreateDirectory(path);
|
|
|
|
return path;
|
|
}
|
|
|
|
public static void EnsureDirectory(this FileInfo fi)
|
|
{
|
|
var dir = GetFullPath(fi.DirectoryName, Core.BaseDirectory);
|
|
if (dir != null)
|
|
{
|
|
Directory.CreateDirectory(dir);
|
|
}
|
|
}
|
|
|
|
public static void EnsureDirectory(this DirectoryInfo di)
|
|
{
|
|
var file = GetFullPath(di.FullName, Core.BaseDirectory);
|
|
Directory.CreateDirectory(file);
|
|
}
|
|
|
|
public static string GetFullPath(string relativeOrAbsolutePath) =>
|
|
GetFullPath(relativeOrAbsolutePath, Core.BaseDirectory);
|
|
|
|
public static string GetFullPath(string relativeOrAbsolutePath, string basePath) =>
|
|
relativeOrAbsolutePath switch
|
|
{
|
|
null => null,
|
|
"" => basePath,
|
|
_ => Path.IsPathRooted(relativeOrAbsolutePath)
|
|
? relativeOrAbsolutePath
|
|
: Path.GetFullPath(relativeOrAbsolutePath, basePath)
|
|
};
|
|
|
|
public static string EnsureRandomPath(string basePath)
|
|
{
|
|
Span<byte> bytes = stackalloc byte[8];
|
|
Utility.RandomBytes(bytes);
|
|
return EnsureDirectory(Path.Combine(basePath, bytes.ToHexString()));
|
|
}
|
|
}
|
|
}
|