tribufu/ServerManagers
1
0
Fork 0
mirror of https://github.com/tribufu/ServerManagers synced 2026-05-06 15:17:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed error when backup path was null

Browse source
This commit is contained in:
Brett Hewitson 2021-12-19 11:20:08 +10:00
parent 2d5655bebf
commit 8c1908310e
3 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ARKServerManager/App.xaml.cs
View file

@ -561,14 +561,12 @@ namespace ServerManagerTool
CommonConfig.Default.Reload(); CommonConfig.Default.Reload();
var installFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); var installFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
var backupFolder = includeBackup var backupFolder = string.IsNullOrWhiteSpace(Config.Default.BackupPath)
? string.IsNullOrWhiteSpace(Config.Default.BackupPath)
? Path.Combine(Config.Default.DataDir, Config.Default.BackupDir) ? Path.Combine(Config.Default.DataDir, Config.Default.BackupDir)
: Path.Combine(Config.Default.BackupPath) : Path.Combine(Config.Default.BackupPath);
: null;
SettingsUtils.BackupUserConfigSettings(Config.Default, "userconfig.json", installFolder, backupFolder); SettingsUtils.BackupUserConfigSettings(Config.Default, "userconfig.json", installFolder, includeBackup ? backupFolder : null);
SettingsUtils.BackupUserConfigSettings(CommonConfig.Default, "commonconfig.json", installFolder, backupFolder); SettingsUtils.BackupUserConfigSettings(CommonConfig.Default, "commonconfig.json", installFolder, includeBackup ? backupFolder : null);
SettingsUtils.DeleteBackupUserConfigFiles("userconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL); SettingsUtils.DeleteBackupUserConfigFiles("userconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL);
SettingsUtils.DeleteBackupUserConfigFiles("commonconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL); SettingsUtils.DeleteBackupUserConfigFiles("commonconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL);

10
src/ConanServerManager/App.xaml.cs
View file

@ -550,14 +550,12 @@ namespace ServerManagerTool
CommonConfig.Default.Reload(); CommonConfig.Default.Reload();
var installFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location); var installFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
var backupFolder = includeBackup var backupFolder = string.IsNullOrWhiteSpace(Config.Default.BackupPath)
? string.IsNullOrWhiteSpace(Config.Default.BackupPath)
? Path.Combine(Config.Default.DataPath, Config.Default.BackupRelativePath) ? Path.Combine(Config.Default.DataPath, Config.Default.BackupRelativePath)
: Path.Combine(Config.Default.BackupPath) : Path.Combine(Config.Default.BackupPath);
: null;
SettingsUtils.BackupUserConfigSettings(Config.Default, "userconfig.json", installFolder, backupFolder); SettingsUtils.BackupUserConfigSettings(Config.Default, "userconfig.json", installFolder, includeBackup ? backupFolder : null);
SettingsUtils.BackupUserConfigSettings(CommonConfig.Default, "commonconfig.json", installFolder, backupFolder); SettingsUtils.BackupUserConfigSettings(CommonConfig.Default, "commonconfig.json", installFolder, includeBackup ? backupFolder : null);
SettingsUtils.DeleteBackupUserConfigFiles("userconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL); SettingsUtils.DeleteBackupUserConfigFiles("userconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL);
SettingsUtils.DeleteBackupUserConfigFiles("commonconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL); SettingsUtils.DeleteBackupUserConfigFiles("commonconfig.json", backupFolder, ServerApp.BACKUP_DELETEINTERVAL);

12
src/ServerManager.Common/Utils/SettingsUtils.cs
View file

@ -53,15 +53,15 @@ namespace ServerManagerTool.Common.Utils
public static void DeleteBackupUserConfigFiles(string fileName, string backupPath, int interval) public static void DeleteBackupUserConfigFiles(string fileName, string backupPath, int interval)
{ {
var backupFileName = Path.GetFileNameWithoutExtension(fileName);
var backupFileExt = Path.GetExtension(fileName);
var backupFileFilter = $"{backupFileName}_*{backupFileExt}";
var backupDateFilter = DateTime.Now.AddDays(-interval);
try try
{ {
Debug.WriteLine("Deleting old config backup files started..."); Debug.WriteLine("Deleting old config backup files started...");
var backupFileName = Path.GetFileNameWithoutExtension(fileName);
var backupFileExt = Path.GetExtension(fileName);
var backupFileFilter = $"{backupFileName}_*{backupFileExt}";
var backupDateFilter = DateTime.Now.AddDays(-interval);
var filesToDelete = new DirectoryInfo(backupPath).GetFiles(backupFileFilter).Where(f => f.LastWriteTime < backupDateFilter); var filesToDelete = new DirectoryInfo(backupPath).GetFiles(backupFileFilter).Where(f => f.LastWriteTime < backupDateFilter);
foreach (var fileToDelete in filesToDelete) foreach (var fileToDelete in filesToDelete)
{ {
@ -78,7 +78,7 @@ namespace ServerManagerTool.Common.Utils
} }
catch (Exception ex) catch (Exception ex)
{ {
Debug.WriteLine($"Error deleting old server backup files.\r\n{ex.Message}"); Debug.WriteLine($"Error deleting old config backup files.\r\n{ex.Message}");
} }
finally finally
{ {