warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Cleans up file system paths and archiving (#815)

Browse source 
* 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.
This commit is contained in:
Kamron Batman 2021-10-05 08:54:44 -07:00 • committed by GitHub
parent da31153b20
commit a55e271a69
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 447 additions and 341 deletions
Download patch file Download diff file Expand all files Collapse all files

76
Projects/UOContent/Misc/CrashGuard.cs
View file

@ -4,6 +4,7 @@ using System.IO;
using Server.Accounting;
using Server.Logging;
using Server.Network;
using Server.Saves;
namespace Server.Misc
{
@ -76,24 +77,23 @@ namespace Server.Misc
}
}
private static void CopyFile(string rootOrigin, string rootBackup, string path)
private static void DirectoryCopy(string sourceDirName, string destDirName)
{
var originPath = Path.Combine(rootOrigin, path);
if (!File.Exists(originPath))
// Get the subdirectories for the specified directory.
DirectoryInfo dir = new DirectoryInfo(sourceDirName);
DirectoryInfo[] dirs = dir.GetDirectories();
FileInfo[] files = dir.GetFiles();
foreach (FileInfo file in files)
{
return;
string tempPath = Path.Combine(destDirName, file.Name);
file.CopyTo(tempPath, false);
}
var backupPath = Path.Combine(rootBackup, path);
Directory.CreateDirectory(Path.GetDirectoryName(backupPath));
try
foreach (DirectoryInfo subdir in dirs)
{
File.Copy(originPath, backupPath);
}
catch
{
// ignored
string tempPath = Path.Combine(destDirName, subdir.Name);
DirectoryCopy(subdir.FullName, tempPath);
}
}
@ -105,26 +105,12 @@ namespace Server.Misc
{
var timeStamp = Utility.GetTimeStamp();
var root = Core.BaseDirectory;
var rootBackup = Path.Combine(root, $"Backups/Crashed/{timeStamp}/");
var rootOrigin = Path.Combine(root, "Saves/");
// Copy files
CopyFile(rootOrigin, rootBackup, "Accounts/Accounts.xml");
CopyFile(rootOrigin, rootBackup, "Items/Items.bin");
CopyFile(rootOrigin, rootBackup, "Items/Items.idx");
CopyFile(rootOrigin, rootBackup, "Items/Items.tdb");
CopyFile(rootOrigin, rootBackup, "Mobiles/Mobiles.bin");
CopyFile(rootOrigin, rootBackup, "Mobiles/Mobiles.idx");
CopyFile(rootOrigin, rootBackup, "Mobiles/Mobiles.tdb");
CopyFile(rootOrigin, rootBackup, "Guilds/Guilds.bin");
CopyFile(rootOrigin, rootBackup, "Guilds/Guilds.idx");
CopyFile(rootOrigin, rootBackup, "Regions/Regions.bin");
CopyFile(rootOrigin, rootBackup, "Regions/Regions.idx");
var backupPath = PathUtility.EnsureDirectory(Path.Combine(AutoArchive.BackupPath, "Crashed", timeStamp));
var savePath = World.SavePath;
if (Directory.Exists(savePath))
{
DirectoryCopy(savePath, backupPath);
}
logger.Information("Backup done");
}
@ -160,7 +146,7 @@ namespace Server.Misc
try
{
op.WriteLine("Mobiles: {0}", World.Mobiles.Count);
op.WriteLine($"Accounts: {Accounts.Count}");
}
catch
{
@ -169,15 +155,23 @@ namespace Server.Misc
try
{
op.WriteLine("Items: {0}", World.Items.Count);
op.WriteLine($"Mobiles: {World.Mobiles.Count}");
}
catch
{
// ignored
}
op.WriteLine("Exception:");
op.WriteLine(e.Exception);
try
{
op.WriteLine($"Items: {World.Items.Count}");
}
catch
{
// ignored
}
op.WriteLine($"Exception: {e.Exception}");
op.WriteLine();
op.WriteLine("Clients:");
@ -186,22 +180,22 @@ namespace Server.Misc
{
var states = TcpServer.Instances;
op.WriteLine("- Count: {0}", states.Count);
op.WriteLine($"- Count: {states.Count}");
foreach (var ns in TcpServer.Instances)
{
op.Write("+ {0}:", ns);
op.Write($"+ {ns}:");
if (ns.Account is Account a)
{
op.Write(" (account = {0})", a.Username);
op.Write($" (account = {a.Username})");
}
var m = ns.Mobile;
if (m != null)
{
op.Write(" (mobile = 0x{0:X} '{1}')", m.Serial.Value, m.Name);
op.Write($" (mobile = 0x{m.Serial.Value:X} '{m.Name}')");
}
op.WriteLine();