diff --git a/src/ARKServerManager/Lib/ServerApp.cs b/src/ARKServerManager/Lib/ServerApp.cs index 2dd88753..5a31a178 100644 --- a/src/ARKServerManager/Lib/ServerApp.cs +++ b/src/ARKServerManager/Lib/ServerApp.cs @@ -1987,6 +1987,10 @@ namespace ServerManagerTool.Lib var profileFile = GetProfileFile(_profile); var gameIniFile = IOUtils.NormalizePath(Path.Combine(GetProfileServerConfigDir(_profile), Config.Default.ServerGameConfigFile)); var gusIniFile = IOUtils.NormalizePath(Path.Combine(GetProfileServerConfigDir(_profile), Config.Default.ServerGameUserSettingsConfigFile)); + var adminFile = IOUtils.NormalizePath(Path.Combine(GetProfileSavedDir(_profile), Config.Default.ServerAdminFile)); + var exlusiveFile = IOUtils.NormalizePath(Path.Combine(GetProfileServerBinaryDir(_profile), Config.Default.ServerExclusiveFile)); + var whitelistFile = IOUtils.NormalizePath(Path.Combine(GetProfileServerBinaryDir(_profile), Config.Default.ServerWhitelistFile)); + var launcherFile = GetLauncherFile(); if (!Directory.Exists(backupFolder)) @@ -2008,6 +2012,15 @@ namespace ServerManagerTool.Lib if (File.Exists(launcherFile)) files.Add(launcherFile); + if (File.Exists(adminFile)) + files.Add(adminFile); + + if (File.Exists(exlusiveFile)) + files.Add(exlusiveFile); + + if (File.Exists(whitelistFile)) + files.Add(whitelistFile); + var comment = new StringBuilder(); comment.AppendLine($"Windows Platform: {Environment.OSVersion.Platform}"); comment.AppendLine($"Windows Version: {Environment.OSVersion.VersionString}"); @@ -2510,6 +2523,10 @@ namespace ServerManagerTool.Lib public static string GetProfileServerConfigDir(ServerProfileSnapshot profile) => Path.Combine(profile.InstallDirectory, Config.Default.ServerConfigRelativePath); + public static string GetProfileSavedDir(ServerProfileSnapshot profile) => Path.Combine(profile.InstallDirectory, Config.Default.SavedRelativePath); + + public static string GetProfileServerBinaryDir(ServerProfileSnapshot profile) => Path.Combine(profile.InstallDirectory, Config.Default.ServerBinaryRelativePath); + private static string GetRconMessageCommand(string commandValue) { switch (commandValue.ToLower()) diff --git a/src/ConanServerManager/App.config b/src/ConanServerManager/App.config index 27d28574..44bf71de 100644 --- a/src/ConanServerManager/App.config +++ b/src/ConanServerManager/App.config @@ -113,6 +113,9 @@ steam_appid.txt + + serveruid.txt + https://raw.githubusercontent.com/Bletch1971/ServerManagers/master/CSM/beta/latest.txt diff --git a/src/ConanServerManager/Config.Designer.cs b/src/ConanServerManager/Config.Designer.cs index 88bda54c..24dba8c1 100644 --- a/src/ConanServerManager/Config.Designer.cs +++ b/src/ConanServerManager/Config.Designer.cs @@ -778,7 +778,18 @@ namespace ServerManagerTool { return ((string)(this["ServerAppIdFile"])); } } - + + [global::System.Configuration.ApplicationScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("serveruid.txt")] + public string ServerUidFile + { + get + { + return ((string)(this["ServerUidFile"])); + } + } + [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.DefaultSettingValueAttribute("https://raw.githubusercontent.com/Bletch1971/ServerManagers/master/CSM/beta/lates" + diff --git a/src/ConanServerManager/Lib/ServerApp.cs b/src/ConanServerManager/Lib/ServerApp.cs index 414bcd65..fd379633 100644 --- a/src/ConanServerManager/Lib/ServerApp.cs +++ b/src/ConanServerManager/Lib/ServerApp.cs @@ -1898,6 +1898,9 @@ namespace ServerManagerTool.Lib var engineIniFile = IOUtils.NormalizePath(Path.Combine(GetProfileServerConfigDir(_profile), Config.Default.ServerEngineConfigFile)); var gameIniFile = IOUtils.NormalizePath(Path.Combine(GetProfileServerConfigDir(_profile), Config.Default.ServerGameConfigFile)); var settingsIniFile = IOUtils.NormalizePath(Path.Combine(GetProfileServerConfigDir(_profile), Config.Default.ServerSettingsConfigFile)); + var blacklistFile = IOUtils.NormalizePath(Path.Combine(GetProfileServerSaveFolder(_profile), Config.Default.ServerBlacklistFile)); + var whitelistFile = IOUtils.NormalizePath(Path.Combine(GetProfileServerSaveFolder(_profile), Config.Default.ServerWhitelistFile)); + var serverUidFile = IOUtils.NormalizePath(Path.Combine(GetProfileServerSaveFolder(_profile), Config.Default.ServerUidFile)); var launcherFile = GetLauncherFile(); if (!Directory.Exists(backupFolder)) @@ -1922,6 +1925,15 @@ namespace ServerManagerTool.Lib if (File.Exists(launcherFile)) files.Add(launcherFile); + if (File.Exists(blacklistFile)) + files.Add(blacklistFile); + + if (File.Exists(whitelistFile)) + files.Add(whitelistFile); + + if (File.Exists(serverUidFile)) + files.Add(serverUidFile); + var comment = new StringBuilder(); comment.AppendLine($"Windows Platform: {Environment.OSVersion.Platform}"); comment.AppendLine($"Windows Version: {Environment.OSVersion.VersionString}"); @@ -2384,6 +2396,8 @@ namespace ServerManagerTool.Lib public static string GetProfileServerConfigDir(ServerProfileSnapshot profile) => Path.Combine(profile.InstallDirectory, Config.Default.ServerConfigRelativePath); + public static string GetProfileServerSaveFolder(ServerProfileSnapshot profile) => Path.Combine(profile.InstallDirectory, Config.Default.SavedFilesRelativePath); + private static string GetRconMessageCommand(string commandValue) { return commandValue.ToLower();