From 131479277b7f2c84d67ba67c975df8e91aff9d15 Mon Sep 17 00:00:00 2001 From: Pat Hartl Date: Mon, 12 Aug 2024 00:15:16 -0500 Subject: [PATCH] Consolidate enums --- LANCommander.SDK/Enums/GameType.cs | 7 +++++- LANCommander.SDK/Enums/NetworkProtocol.cs | 5 +++- LANCommander.SDK/Enums/SavePathType.cs | 3 +++ LANCommander.SDK/Enums/ScriptType.cs | 11 ++++++++- .../Enums/ServerAutostartMethod.cs | 6 ++++- LANCommander.SDK/Enums/ServerConsoleType.cs | 5 +++- .../Controllers/Api/GamesController.cs | 3 +-- LANCommander.Server/Data/Enums/GameType.cs | 16 ------------- .../Data/Enums/SavePathType.cs | 15 ------------ LANCommander.Server/Data/Enums/ScriptType.cs | 24 ------------------- .../Data/Enums/ServerAutostartMethod.cs | 13 ---------- .../Data/Enums/ServerConsoleType.cs | 11 --------- LANCommander.Server/Data/Models/Game.cs | 2 +- .../Data/Models/MultiplayerMode.cs | 3 +-- LANCommander.Server/Data/Models/SavePath.cs | 2 +- LANCommander.Server/Data/Models/Script.cs | 2 +- LANCommander.Server/Data/Models/Server.cs | 5 ++-- .../Data/Models/ServerConsole.cs | 2 +- ...20231117064657_DeleteDeprecatedSnippets.cs | 2 +- .../Models/ScriptEditorOptions.cs | 2 +- LANCommander.Server/Program.cs | 3 ++- LANCommander.Server/Services/GameService.cs | 9 ++++--- .../Services/IMediaGrabberService.cs | 3 +-- .../MediaGrabbers/SteamGridDBMediaGrabber.cs | 2 -- .../Services/PlaySessionService.cs | 2 +- .../Services/ServerLogService.cs | 2 +- .../Services/ServerProcessService.cs | 7 +++--- LANCommander.Server/Services/ServerService.cs | 11 +++++---- .../Templates/Wiki/Game.cshtml | 4 ++-- .../Templates/Wiki/Redistributable.cshtml | 2 +- .../UI/Components/MediaGrabberDialog.razor | 1 - .../UI/Components/ScriptEditor.razor | 2 +- .../UI/Components/ScriptEditorDialog.razor | 4 ++-- .../Games/Components/GameMetadataLookup.razor | 1 - .../Pages/Games/Components/MediaEditor.razor | 3 +-- .../Components/MultiplayerModeEditor.razor | 3 +-- .../Games/Components/SavePathEditor.razor | 4 ++-- LANCommander.Server/UI/Pages/Games/Edit.razor | 2 +- .../UI/Pages/Games/Index.razor | 2 +- .../UI/Pages/Metadata/Collections/Edit.razor | 1 - .../UI/Pages/Redistributables/Edit.razor | 2 +- .../UI/Pages/Servers/Components/Console.razor | 2 +- .../Components/ServerConsoleEditor.razor | 2 +- .../Components/ServerHttpPathEditor.razor | 3 +-- .../UI/Pages/Servers/Edit.razor | 5 ++-- 45 files changed, 78 insertions(+), 143 deletions(-) delete mode 100644 LANCommander.Server/Data/Enums/GameType.cs delete mode 100644 LANCommander.Server/Data/Enums/SavePathType.cs delete mode 100644 LANCommander.Server/Data/Enums/ScriptType.cs delete mode 100644 LANCommander.Server/Data/Enums/ServerAutostartMethod.cs delete mode 100644 LANCommander.Server/Data/Enums/ServerConsoleType.cs diff --git a/LANCommander.SDK/Enums/GameType.cs b/LANCommander.SDK/Enums/GameType.cs index 5d3bdc65..2895e17e 100644 --- a/LANCommander.SDK/Enums/GameType.cs +++ b/LANCommander.SDK/Enums/GameType.cs @@ -1,11 +1,16 @@ -namespace LANCommander.SDK.Enums +using System.ComponentModel.DataAnnotations; + +namespace LANCommander.SDK.Enums { public enum GameType { + [Display(Name = "Main Game")] MainGame, Expansion, + [Display(Name = "Standalone Expansion")] StandaloneExpansion, Mod, + [Display(Name = "Standalone Mod")] StandaloneMod } } diff --git a/LANCommander.SDK/Enums/NetworkProtocol.cs b/LANCommander.SDK/Enums/NetworkProtocol.cs index 5479221e..6e9f1452 100644 --- a/LANCommander.SDK/Enums/NetworkProtocol.cs +++ b/LANCommander.SDK/Enums/NetworkProtocol.cs @@ -1,7 +1,10 @@ -namespace LANCommander.SDK.Enums +using System.ComponentModel.DataAnnotations; + +namespace LANCommander.SDK.Enums { public enum NetworkProtocol { + [Display(Name = "TCP/IP")] TCPIP, IPX, Modem, diff --git a/LANCommander.SDK/Enums/SavePathType.cs b/LANCommander.SDK/Enums/SavePathType.cs index 69181799..99ec2c1a 100644 --- a/LANCommander.SDK/Enums/SavePathType.cs +++ b/LANCommander.SDK/Enums/SavePathType.cs @@ -1,12 +1,15 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; using System.Text; namespace LANCommander.SDK.Enums { public enum SavePathType { + [Display(Name = "File / Folder")] File, + [Display(Name = "Registry Key")] Registry } } diff --git a/LANCommander.SDK/Enums/ScriptType.cs b/LANCommander.SDK/Enums/ScriptType.cs index 3cafdd51..0165dea1 100644 --- a/LANCommander.SDK/Enums/ScriptType.cs +++ b/LANCommander.SDK/Enums/ScriptType.cs @@ -1,15 +1,24 @@ -namespace LANCommander.SDK.Enums +using System.ComponentModel.DataAnnotations; + +namespace LANCommander.SDK.Enums { public enum ScriptType { Install, Uninstall, + [Display(Name = "Name Change")] NameChange, + [Display(Name = "Key Change")] KeyChange, + [Display(Name = "Save Upload")] SaveUpload, + [Display(Name = "Save Download")] SaveDownload, + [Display(Name = "Detect Install")] DetectInstall, + [Display(Name = "Before Start")] BeforeStart, + [Display(Name = "After Stop")] AfterStop, } } diff --git a/LANCommander.SDK/Enums/ServerAutostartMethod.cs b/LANCommander.SDK/Enums/ServerAutostartMethod.cs index 27fde4df..4d0dab24 100644 --- a/LANCommander.SDK/Enums/ServerAutostartMethod.cs +++ b/LANCommander.SDK/Enums/ServerAutostartMethod.cs @@ -1,8 +1,12 @@ -namespace LANCommander.SDK.Enums +using System.ComponentModel.DataAnnotations; + +namespace LANCommander.SDK.Enums { public enum ServerAutostartMethod { + [Display(Name = "On Application Start")] OnApplicationStart, + [Display(Name = "On Player Activity")] OnPlayerActivity } } diff --git a/LANCommander.SDK/Enums/ServerConsoleType.cs b/LANCommander.SDK/Enums/ServerConsoleType.cs index aa3d2b61..a670a007 100644 --- a/LANCommander.SDK/Enums/ServerConsoleType.cs +++ b/LANCommander.SDK/Enums/ServerConsoleType.cs @@ -1,7 +1,10 @@ -namespace LANCommander.SDK.Enums +using System.ComponentModel.DataAnnotations; + +namespace LANCommander.SDK.Enums { public enum ServerConsoleType { + [Display(Name = "Log File")] LogFile, RCON } diff --git a/LANCommander.Server/Controllers/Api/GamesController.cs b/LANCommander.Server/Controllers/Api/GamesController.cs index 8251a6bd..6b3bd27c 100644 --- a/LANCommander.Server/Controllers/Api/GamesController.cs +++ b/LANCommander.Server/Controllers/Api/GamesController.cs @@ -1,6 +1,5 @@ using AutoMapper; using LANCommander.Server.Data; -using LANCommander.Server.Data.Enums; using LANCommander.Server.Data.Models; using LANCommander.Server.Extensions; using LANCommander.Server.Models; @@ -38,7 +37,7 @@ namespace LANCommander.Server.Controllers.Api public async Task> Get() { var accessibleGames = new List(); - var games = await GameService.Get(g => g.Type == GameType.MainGame || g.Type == GameType.StandaloneExpansion || g.Type == GameType.StandaloneMod).ToListAsync(); + var games = await GameService.Get(g => g.Type == SDK.Enums.GameType.MainGame || g.Type == SDK.Enums.GameType.StandaloneExpansion || g.Type == SDK.Enums.GameType.StandaloneMod).ToListAsync(); var mappedGames = Cache.GetOrSet>("MappedGames", _ => { return Mapper.Map>(games); diff --git a/LANCommander.Server/Data/Enums/GameType.cs b/LANCommander.Server/Data/Enums/GameType.cs deleted file mode 100644 index 6936e58a..00000000 --- a/LANCommander.Server/Data/Enums/GameType.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace LANCommander.Server.Data.Enums -{ - public enum GameType - { - [Display(Name = "Main Game")] - MainGame, - Expansion, - [Display(Name = "Standalone Expansion")] - StandaloneExpansion, - Mod, - [Display(Name = "Standalone Mod")] - StandaloneMod - } -} diff --git a/LANCommander.Server/Data/Enums/SavePathType.cs b/LANCommander.Server/Data/Enums/SavePathType.cs deleted file mode 100644 index 15ba9f71..00000000 --- a/LANCommander.Server/Data/Enums/SavePathType.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Text; - -namespace LANCommander.Server.Data.Enums -{ - public enum SavePathType - { - [Display(Name = "File / Folder")] - File, - [Display(Name = "Registry Key")] - Registry - } -} diff --git a/LANCommander.Server/Data/Enums/ScriptType.cs b/LANCommander.Server/Data/Enums/ScriptType.cs deleted file mode 100644 index 0291fd8b..00000000 --- a/LANCommander.Server/Data/Enums/ScriptType.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace LANCommander.Server.Data.Enums -{ - public enum ScriptType - { - Install, - Uninstall, - [Display(Name = "Name Change")] - NameChange, - [Display(Name = "Key Change")] - KeyChange, - [Display(Name = "Save Upload")] - SaveUpload, - [Display(Name = "Save Download")] - SaveDownload, - [Display(Name = "Detect Install")] - DetectInstall, - [Display(Name = "Before Start")] - BeforeStart, - [Display(Name = "After Stop")] - AfterStop, - } -} diff --git a/LANCommander.Server/Data/Enums/ServerAutostartMethod.cs b/LANCommander.Server/Data/Enums/ServerAutostartMethod.cs deleted file mode 100644 index a768d979..00000000 --- a/LANCommander.Server/Data/Enums/ServerAutostartMethod.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; - -namespace LANCommander.Server.Data.Enums -{ - public enum ServerAutostartMethod - { - [Display(Name = "Application Start")] - OnApplicationStart, - [Display(Name = "Player Activity")] - OnPlayerActivity - } -} diff --git a/LANCommander.Server/Data/Enums/ServerConsoleType.cs b/LANCommander.Server/Data/Enums/ServerConsoleType.cs deleted file mode 100644 index 4f1402be..00000000 --- a/LANCommander.Server/Data/Enums/ServerConsoleType.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System.ComponentModel.DataAnnotations; - -namespace LANCommander.Server.Data.Enums -{ - public enum ServerConsoleType - { - [Display(Name = "Log File")] - LogFile, - RCON - } -} diff --git a/LANCommander.Server/Data/Models/Game.cs b/LANCommander.Server/Data/Models/Game.cs index 70da7ed6..5c94ccbf 100644 --- a/LANCommander.Server/Data/Models/Game.cs +++ b/LANCommander.Server/Data/Models/Game.cs @@ -1,4 +1,4 @@ -using LANCommander.Server.Data.Enums; +using LANCommander.SDK.Enums; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; diff --git a/LANCommander.Server/Data/Models/MultiplayerMode.cs b/LANCommander.Server/Data/Models/MultiplayerMode.cs index b79b3b39..887061de 100644 --- a/LANCommander.Server/Data/Models/MultiplayerMode.cs +++ b/LANCommander.Server/Data/Models/MultiplayerMode.cs @@ -1,5 +1,4 @@ -using LANCommander.Server.Data.Enums; -using LANCommander.SDK.Enums; +using LANCommander.SDK.Enums; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; diff --git a/LANCommander.Server/Data/Models/SavePath.cs b/LANCommander.Server/Data/Models/SavePath.cs index eb2463d3..625134d0 100644 --- a/LANCommander.Server/Data/Models/SavePath.cs +++ b/LANCommander.Server/Data/Models/SavePath.cs @@ -1,4 +1,4 @@ -using LANCommander.Server.Data.Enums; +using LANCommander.SDK.Enums; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; diff --git a/LANCommander.Server/Data/Models/Script.cs b/LANCommander.Server/Data/Models/Script.cs index 4f08c396..e653c558 100644 --- a/LANCommander.Server/Data/Models/Script.cs +++ b/LANCommander.Server/Data/Models/Script.cs @@ -1,4 +1,4 @@ -using LANCommander.Server.Data.Enums; +using LANCommander.SDK.Enums; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; diff --git a/LANCommander.Server/Data/Models/Server.cs b/LANCommander.Server/Data/Models/Server.cs index d0b4c395..37ce206f 100644 --- a/LANCommander.Server/Data/Models/Server.cs +++ b/LANCommander.Server/Data/Models/Server.cs @@ -1,5 +1,4 @@ -using LANCommander.Server.Data.Enums; -using LANCommander.SDK.Enums; +using LANCommander.SDK.Enums; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; @@ -21,7 +20,7 @@ namespace LANCommander.Server.Data.Models public bool UseShellExecute { get; set; } public ProcessTerminationMethod ProcessTerminationMethod { get; set; } public bool Autostart { get; set; } - public Data.Enums.ServerAutostartMethod AutostartMethod { get; set; } + public ServerAutostartMethod AutostartMethod { get; set; } public int AutostartDelay { get; set; } public Guid? GameId { get; set; } diff --git a/LANCommander.Server/Data/Models/ServerConsole.cs b/LANCommander.Server/Data/Models/ServerConsole.cs index bae96ef8..e4554a38 100644 --- a/LANCommander.Server/Data/Models/ServerConsole.cs +++ b/LANCommander.Server/Data/Models/ServerConsole.cs @@ -1,4 +1,4 @@ -using LANCommander.Server.Data.Enums; +using LANCommander.SDK.Enums; using System.ComponentModel.DataAnnotations.Schema; using System.Text.Json.Serialization; diff --git a/LANCommander.Server/Migrations/20231117064657_DeleteDeprecatedSnippets.cs b/LANCommander.Server/Migrations/20231117064657_DeleteDeprecatedSnippets.cs index 91167d9a..b4174e69 100644 --- a/LANCommander.Server/Migrations/20231117064657_DeleteDeprecatedSnippets.cs +++ b/LANCommander.Server/Migrations/20231117064657_DeleteDeprecatedSnippets.cs @@ -1,4 +1,4 @@ -using LANCommander.Server.Data.Enums; +using LANCommander.SDK.Enums; using Microsoft.EntityFrameworkCore.Migrations; #nullable disable diff --git a/LANCommander.Server/Models/ScriptEditorOptions.cs b/LANCommander.Server/Models/ScriptEditorOptions.cs index b8da1467..54cca6b8 100644 --- a/LANCommander.Server/Models/ScriptEditorOptions.cs +++ b/LANCommander.Server/Models/ScriptEditorOptions.cs @@ -1,4 +1,4 @@ -using LANCommander.Server.Data.Enums; +using LANCommander.SDK.Enums; namespace LANCommander.Server.Models { diff --git a/LANCommander.Server/Program.cs b/LANCommander.Server/Program.cs index e09b700b..b3bc6312 100644 --- a/LANCommander.Server/Program.cs +++ b/LANCommander.Server/Program.cs @@ -14,6 +14,7 @@ using LANCommander.Server.Services.MediaGrabbers; using Microsoft.Data.Sqlite; using LANCommander.Server.Extensions; using Microsoft.AspNetCore.Http.Features; +using LANCommander.SDK.Enums; namespace LANCommander.Server { @@ -347,7 +348,7 @@ namespace LANCommander.Server var serverService = scope.ServiceProvider.GetService(); var serverProcessService = scope.ServiceProvider.GetService(); - foreach (var server in await serverService.Get(s => s.Autostart && s.AutostartMethod == Data.Enums.ServerAutostartMethod.OnApplicationStart).ToListAsync()) + foreach (var server in await serverService.Get(s => s.Autostart && s.AutostartMethod == ServerAutostartMethod.OnApplicationStart).ToListAsync()) { try { diff --git a/LANCommander.Server/Services/GameService.cs b/LANCommander.Server/Services/GameService.cs index 18094a88..1c8e341b 100644 --- a/LANCommander.Server/Services/GameService.cs +++ b/LANCommander.Server/Services/GameService.cs @@ -1,6 +1,5 @@ using AutoMapper; using LANCommander.Server.Data; -using LANCommander.Server.Data.Enums; using LANCommander.Server.Data.Models; using LANCommander.Server.Extensions; using LANCommander.Server.Models; @@ -423,7 +422,7 @@ namespace LANCommander.Server.Services path.Path = manifestSavePath.Path; path.WorkingDirectory = manifestSavePath.WorkingDirectory; path.IsRegex = manifestSavePath.IsRegex; - path.Type = (Data.Enums.SavePathType)Enum.Parse(typeof(Data.Enums.SavePathType), manifestSavePath.Type); + path.Type = (SavePathType)Enum.Parse(typeof(SavePathType), manifestSavePath.Type); } else game.SavePaths.Remove(path); @@ -437,7 +436,7 @@ namespace LANCommander.Server.Services Path = manifestSavePath.Path, WorkingDirectory = manifestSavePath.WorkingDirectory, IsRegex = manifestSavePath.IsRegex, - Type = (Data.Enums.SavePathType)Enum.Parse(typeof(Data.Enums.SavePathType), manifestSavePath.Type) + Type = (SavePathType)Enum.Parse(typeof(SavePathType), manifestSavePath.Type) }); } #endregion @@ -477,7 +476,7 @@ namespace LANCommander.Server.Services script.Description = manifestScript.Description; script.Name = manifestScript.Name; script.RequiresAdmin = manifestScript.RequiresAdmin; - script.Type = (Data.Enums.ScriptType)(int)manifestScript.Type; + script.Type = (ScriptType)(int)manifestScript.Type; } else game.Scripts.Remove(script); @@ -493,7 +492,7 @@ namespace LANCommander.Server.Services Description = manifestScript.Description, Name = manifestScript.Name, RequiresAdmin = manifestScript.RequiresAdmin, - Type = (Data.Enums.ScriptType)(int)manifestScript.Type, + Type = (ScriptType)(int)manifestScript.Type, CreatedOn = manifestScript.CreatedOn, }); } diff --git a/LANCommander.Server/Services/IMediaGrabberService.cs b/LANCommander.Server/Services/IMediaGrabberService.cs index cd737fe4..fcea703c 100644 --- a/LANCommander.Server/Services/IMediaGrabberService.cs +++ b/LANCommander.Server/Services/IMediaGrabberService.cs @@ -1,5 +1,4 @@ -using LANCommander.Server.Data.Enums; -using LANCommander.Server.Models; +using LANCommander.Server.Models; using LANCommander.SDK.Enums; namespace LANCommander.Server.Services diff --git a/LANCommander.Server/Services/MediaGrabbers/SteamGridDBMediaGrabber.cs b/LANCommander.Server/Services/MediaGrabbers/SteamGridDBMediaGrabber.cs index a20bece2..7b860555 100644 --- a/LANCommander.Server/Services/MediaGrabbers/SteamGridDBMediaGrabber.cs +++ b/LANCommander.Server/Services/MediaGrabbers/SteamGridDBMediaGrabber.cs @@ -1,9 +1,7 @@ using craftersmine.SteamGridDBNet; -using LANCommander.Server.Data.Enums; using LANCommander.Server.Models; using LANCommander.SDK.Enums; using LANCommander.Steam; -using Microsoft.CodeAnalysis.CSharp.Syntax; using System.Net.Mime; namespace LANCommander.Server.Services.MediaGrabbers diff --git a/LANCommander.Server/Services/PlaySessionService.cs b/LANCommander.Server/Services/PlaySessionService.cs index ae367bfb..ecb32ba6 100644 --- a/LANCommander.Server/Services/PlaySessionService.cs +++ b/LANCommander.Server/Services/PlaySessionService.cs @@ -1,9 +1,9 @@ using LANCommander.Server.Data; -using LANCommander.Server.Data.Enums; using LANCommander.Server.Data.Models; using LANCommander.Helpers; using LANCommander.Server.Models; using Microsoft.EntityFrameworkCore; +using LANCommander.SDK.Enums; namespace LANCommander.Server.Services { diff --git a/LANCommander.Server/Services/ServerLogService.cs b/LANCommander.Server/Services/ServerLogService.cs index f8f902fb..2c68a99d 100644 --- a/LANCommander.Server/Services/ServerLogService.cs +++ b/LANCommander.Server/Services/ServerLogService.cs @@ -1,6 +1,6 @@ using CoreRCON; +using LANCommander.SDK.Enums; using LANCommander.Server.Data; -using LANCommander.Server.Data.Enums; using LANCommander.Server.Data.Models; using System.Diagnostics; using System.Net; diff --git a/LANCommander.Server/Services/ServerProcessService.cs b/LANCommander.Server/Services/ServerProcessService.cs index 51cfd733..de200f5e 100644 --- a/LANCommander.Server/Services/ServerProcessService.cs +++ b/LANCommander.Server/Services/ServerProcessService.cs @@ -1,6 +1,5 @@ using AutoMapper; using CoreRCON; -using LANCommander.Server.Data.Enums; using LANCommander.Server.Data.Models; using LANCommander.Server.Hubs; using LANCommander.SDK.Enums; @@ -175,7 +174,7 @@ namespace LANCommander.Server.Services Logger.Info("Starting server \"{ServerName}\" for game {GameName}", server.Name, server.Game?.Title); - foreach (var serverScript in server.Scripts.Where(s => s.Type == Data.Enums.ScriptType.BeforeStart)) + foreach (var serverScript in server.Scripts.Where(s => s.Type == ScriptType.BeforeStart)) { try { @@ -235,7 +234,7 @@ namespace LANCommander.Server.Services Processes[server.Id] = process; - foreach (var logFile in server.ServerConsoles.Where(sc => sc.Type == Data.Enums.ServerConsoleType.LogFile)) + foreach (var logFile in server.ServerConsoles.Where(sc => sc.Type == ServerConsoleType.LogFile)) { StartMonitoringLog(logFile, server); } @@ -315,7 +314,7 @@ namespace LANCommander.Server.Services LogFileMonitors.Remove(server.Id); } - foreach (var serverScript in server.Scripts.Where(s => s.Type == Data.Enums.ScriptType.AfterStop)) + foreach (var serverScript in server.Scripts.Where(s => s.Type == ScriptType.AfterStop)) { try { diff --git a/LANCommander.Server/Services/ServerService.cs b/LANCommander.Server/Services/ServerService.cs index b5814eb3..cbe826bd 100644 --- a/LANCommander.Server/Services/ServerService.cs +++ b/LANCommander.Server/Services/ServerService.cs @@ -4,6 +4,7 @@ using LANCommander.Server.Extensions; using LANCommander.SDK.Helpers; using System.Diagnostics; using System.IO.Compression; +using LANCommander.SDK.Enums; namespace LANCommander.Server.Services { @@ -38,7 +39,7 @@ namespace LANCommander.Server.Services server.Name = manifest.Name; server.Autostart = manifest.Autostart; - server.AutostartMethod = (Data.Enums.ServerAutostartMethod)(int)manifest.AutostartMethod; + server.AutostartMethod = (ServerAutostartMethod)(int)manifest.AutostartMethod; server.AutostartDelay = manifest.AutostartDelay; server.WorkingDirectory = Path.Combine(settings.Servers.StoragePath, server.Name.SanitizeFilename()); server.Path = manifest.Path.Replace(manifest.WorkingDirectory, server.WorkingDirectory); @@ -68,7 +69,7 @@ namespace LANCommander.Server.Services if (manifestConsole != null) { serverConsole.Name = manifestConsole.Name; - serverConsole.Type = (Data.Enums.ServerConsoleType)(int)manifestConsole.Type; + serverConsole.Type = (ServerConsoleType)(int)manifestConsole.Type; serverConsole.Path = manifestConsole.Path; serverConsole.Host = manifestConsole.Host; serverConsole.Port = manifestConsole.Port; @@ -86,7 +87,7 @@ namespace LANCommander.Server.Services { Id = manifestConsole.Id, Name = manifestConsole.Name, - Type = (Data.Enums.ServerConsoleType)(int)manifestConsole.Type, + Type = (ServerConsoleType)(int)manifestConsole.Type, Path = manifestConsole.Path, Host = manifestConsole.Host, Port = manifestConsole.Port, @@ -141,7 +142,7 @@ namespace LANCommander.Server.Services script.Description = manifestScript.Description; script.Name = manifestScript.Name; script.RequiresAdmin = manifestScript.RequiresAdmin; - script.Type = (Data.Enums.ScriptType)(int)manifestScript.Type; + script.Type = (ScriptType)(int)manifestScript.Type; } else server.Scripts.Remove(script); @@ -158,7 +159,7 @@ namespace LANCommander.Server.Services Description = manifestScript.Description, Name = manifestScript.Name, RequiresAdmin = manifestScript.RequiresAdmin, - Type = (Data.Enums.ScriptType)(int)manifestScript.Type, + Type = (ScriptType)(int)manifestScript.Type, CreatedOn = manifestScript.CreatedOn, }); } diff --git a/LANCommander.Server/Templates/Wiki/Game.cshtml b/LANCommander.Server/Templates/Wiki/Game.cshtml index 139d7fb7..82a33262 100644 --- a/LANCommander.Server/Templates/Wiki/Game.cshtml +++ b/LANCommander.Server/Templates/Wiki/Game.cshtml @@ -1,5 +1,5 @@ -@using LANCommander.Server.Data.Enums -@using LANCommander.PCGamingWiki +@using LANCommander.PCGamingWiki +@using LANCommander.SDK.Enums @model LANCommander.Server.Data.Models.Game @{ diff --git a/LANCommander.Server/Templates/Wiki/Redistributable.cshtml b/LANCommander.Server/Templates/Wiki/Redistributable.cshtml index 509a4fb7..7f183756 100644 --- a/LANCommander.Server/Templates/Wiki/Redistributable.cshtml +++ b/LANCommander.Server/Templates/Wiki/Redistributable.cshtml @@ -1,4 +1,4 @@ -@using LANCommander.Server.Data.Enums +@using LANCommander.SDK.Enums @model LANCommander.Server.Data.Models.Redistributable @{ diff --git a/LANCommander.Server/UI/Components/MediaGrabberDialog.razor b/LANCommander.Server/UI/Components/MediaGrabberDialog.razor index ca0b1367..becc2594 100644 --- a/LANCommander.Server/UI/Components/MediaGrabberDialog.razor +++ b/LANCommander.Server/UI/Components/MediaGrabberDialog.razor @@ -1,5 +1,4 @@ @inherits FeedbackComponent -@using LANCommander.Server.Data.Enums; @using LANCommander.Server.Models; @using LANCommander.SDK.Enums @inject IMediaGrabberService MediaGrabberService diff --git a/LANCommander.Server/UI/Components/ScriptEditor.razor b/LANCommander.Server/UI/Components/ScriptEditor.razor index 21438e64..9e7a3582 100644 --- a/LANCommander.Server/UI/Components/ScriptEditor.razor +++ b/LANCommander.Server/UI/Components/ScriptEditor.razor @@ -1,4 +1,4 @@ -@using LANCommander.Server.Data.Enums; +@using LANCommander.SDK.Enums @using LANCommander.Server.Extensions; @using LANCommander.Server.Models @using LANCommander.Server.Services diff --git a/LANCommander.Server/UI/Components/ScriptEditorDialog.razor b/LANCommander.Server/UI/Components/ScriptEditorDialog.razor index 56f762df..28c15cc4 100644 --- a/LANCommander.Server/UI/Components/ScriptEditorDialog.razor +++ b/LANCommander.Server/UI/Components/ScriptEditorDialog.razor @@ -1,5 +1,5 @@ -@using LANCommander.Server.Extensions; -@using LANCommander.Server.Data.Enums; +@using LANCommander.SDK.Enums +@using LANCommander.Server.Extensions; @using LANCommander.Server.Models; @inherits FeedbackComponent @inject ScriptService ScriptService diff --git a/LANCommander.Server/UI/Pages/Games/Components/GameMetadataLookup.razor b/LANCommander.Server/UI/Pages/Games/Components/GameMetadataLookup.razor index 73108c2c..d7a8976f 100644 --- a/LANCommander.Server/UI/Pages/Games/Components/GameMetadataLookup.razor +++ b/LANCommander.Server/UI/Pages/Games/Components/GameMetadataLookup.razor @@ -1,5 +1,4 @@ @using AntDesign.TableModels; -@using LANCommander.Server.Data.Enums @using LANCommander.Server.Models @using LANCommander.PCGamingWiki @using LANCommander.SDK.Enums diff --git a/LANCommander.Server/UI/Pages/Games/Components/MediaEditor.razor b/LANCommander.Server/UI/Pages/Games/Components/MediaEditor.razor index 1e1d58f1..10e396e1 100644 --- a/LANCommander.Server/UI/Pages/Games/Components/MediaEditor.razor +++ b/LANCommander.Server/UI/Pages/Games/Components/MediaEditor.razor @@ -1,5 +1,4 @@ -@using LANCommander.Server.Data.Enums; -@using LANCommander.Server.Models; +@using LANCommander.Server.Models; @using LANCommander.SDK.Enums @using System.Net.Mime @inject MediaService MediaService diff --git a/LANCommander.Server/UI/Pages/Games/Components/MultiplayerModeEditor.razor b/LANCommander.Server/UI/Pages/Games/Components/MultiplayerModeEditor.razor index 6d9bbc1a..38bfa19a 100644 --- a/LANCommander.Server/UI/Pages/Games/Components/MultiplayerModeEditor.razor +++ b/LANCommander.Server/UI/Pages/Games/Components/MultiplayerModeEditor.razor @@ -1,5 +1,4 @@ -@using LANCommander.Server.Data.Enums -@using LANCommander.Server.Data.Models +@using LANCommander.Server.Data.Models @using LANCommander.Server.Extensions; @using LANCommander.SDK.Enums diff --git a/LANCommander.Server/UI/Pages/Games/Components/SavePathEditor.razor b/LANCommander.Server/UI/Pages/Games/Components/SavePathEditor.razor index 152ef568..852e1e21 100644 --- a/LANCommander.Server/UI/Pages/Games/Components/SavePathEditor.razor +++ b/LANCommander.Server/UI/Pages/Games/Components/SavePathEditor.razor @@ -1,5 +1,5 @@ -@using LANCommander.Server.Extensions; -@using LANCommander.Server.Data.Enums +@using LANCommander.SDK.Enums +@using LANCommander.Server.Extensions; diff --git a/LANCommander.Server/UI/Pages/Games/Edit.razor b/LANCommander.Server/UI/Pages/Games/Edit.razor index 6a4cb471..c614c06e 100644 --- a/LANCommander.Server/UI/Pages/Games/Edit.razor +++ b/LANCommander.Server/UI/Pages/Games/Edit.razor @@ -1,9 +1,9 @@ @page "/Games/{id:guid}" @page "/Games/{id:guid}/{panel}" @page "/Games/Add" +@using LANCommander.SDK.Enums @using LANCommander.Server.Extensions @using LANCommander.Server.UI.Pages.Games.Components; -@using LANCommander.Server.Data.Enums; @using LANCommander.Server.Models; @using System.IO.Compression; @using Microsoft.EntityFrameworkCore diff --git a/LANCommander.Server/UI/Pages/Games/Index.razor b/LANCommander.Server/UI/Pages/Games/Index.razor index 8dca25b3..af423028 100644 --- a/LANCommander.Server/UI/Pages/Games/Index.razor +++ b/LANCommander.Server/UI/Pages/Games/Index.razor @@ -1,6 +1,6 @@ @page "/Games" @using AntDesign.TableModels; -@using LANCommander.Server.Data.Enums +@using LANCommander.SDK.Enums @using LANCommander.Server.Extensions; @using System.ComponentModel.DataAnnotations; @using LANCommander.Server.Models diff --git a/LANCommander.Server/UI/Pages/Metadata/Collections/Edit.razor b/LANCommander.Server/UI/Pages/Metadata/Collections/Edit.razor index d5ac8f6f..7ec170ec 100644 --- a/LANCommander.Server/UI/Pages/Metadata/Collections/Edit.razor +++ b/LANCommander.Server/UI/Pages/Metadata/Collections/Edit.razor @@ -1,6 +1,5 @@ @page "/Metadata/Collections/{id:guid}" @page "/Metadata/Collections/Add" -@using LANCommander.Server.Data.Enums; @using LANCommander.Server.Extensions @attribute [Authorize(Roles = "Administrator")] @inject CollectionService CollectionService diff --git a/LANCommander.Server/UI/Pages/Redistributables/Edit.razor b/LANCommander.Server/UI/Pages/Redistributables/Edit.razor index 1f7d966b..2c4af71c 100644 --- a/LANCommander.Server/UI/Pages/Redistributables/Edit.razor +++ b/LANCommander.Server/UI/Pages/Redistributables/Edit.razor @@ -1,7 +1,7 @@ @page "/Redistributables/{id:guid}" @page "/Redistributables/{id:guid}/{panel}" @page "/Redistributables/Add" -@using LANCommander.Server.Data.Enums; +@using LANCommander.SDK.Enums @using LANCommander.Server.Models @attribute [Authorize(Roles = "Administrator")] @inject RedistributableService RedistributableService diff --git a/LANCommander.Server/UI/Pages/Servers/Components/Console.razor b/LANCommander.Server/UI/Pages/Servers/Components/Console.razor index aaff7fa9..854e841a 100644 --- a/LANCommander.Server/UI/Pages/Servers/Components/Console.razor +++ b/LANCommander.Server/UI/Pages/Servers/Components/Console.razor @@ -1,4 +1,4 @@ -@using LANCommander.Server.Data.Enums; +@using LANCommander.SDK.Enums @using Microsoft.AspNetCore.SignalR.Client @using NLog; @using XtermBlazor diff --git a/LANCommander.Server/UI/Pages/Servers/Components/ServerConsoleEditor.razor b/LANCommander.Server/UI/Pages/Servers/Components/ServerConsoleEditor.razor index 0f09cbd7..66522dad 100644 --- a/LANCommander.Server/UI/Pages/Servers/Components/ServerConsoleEditor.razor +++ b/LANCommander.Server/UI/Pages/Servers/Components/ServerConsoleEditor.razor @@ -1,4 +1,4 @@ -@using LANCommander.Server.Data.Enums +@using LANCommander.SDK.Enums @using LANCommander.Server.Data.Models @using LANCommander.Server.Extensions; diff --git a/LANCommander.Server/UI/Pages/Servers/Components/ServerHttpPathEditor.razor b/LANCommander.Server/UI/Pages/Servers/Components/ServerHttpPathEditor.razor index f7d91aaf..f173c0e5 100644 --- a/LANCommander.Server/UI/Pages/Servers/Components/ServerHttpPathEditor.razor +++ b/LANCommander.Server/UI/Pages/Servers/Components/ServerHttpPathEditor.razor @@ -1,5 +1,4 @@ -@using LANCommander.Server.Data.Enums -@using LANCommander.Server.Data.Models +@using LANCommander.Server.Data.Models @using LANCommander.Server.Extensions; @inject NavigationManager NavigationManager diff --git a/LANCommander.Server/UI/Pages/Servers/Edit.razor b/LANCommander.Server/UI/Pages/Servers/Edit.razor index 9c32eb69..946cca0e 100644 --- a/LANCommander.Server/UI/Pages/Servers/Edit.razor +++ b/LANCommander.Server/UI/Pages/Servers/Edit.razor @@ -5,7 +5,6 @@ @attribute [Authorize(Roles = "Administrator")] @using LANCommander.SDK.Enums @using LANCommander.Server.UI.Pages.Servers.Components -@using LANCommander.Server.Data.Enums @using LANCommander.Server.Extensions @using Microsoft.EntityFrameworkCore @using System.Runtime.InteropServices @@ -147,7 +146,7 @@ - @Value.GetDisplayName() @Value.GetDisplayName() @@ -199,7 +198,7 @@ @if (Panel == "Scripts") { - + } @if (Panel == "Files")