Consolidate enums

This commit is contained in:
Pat Hartl 2024-08-12 00:15:16 -05:00
parent 9139140f24
commit 131479277b
45 changed files with 78 additions and 143 deletions

View file

@ -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
}
}

View file

@ -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,

View file

@ -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
}
}

View file

@ -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,
}
}

View file

@ -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
}
}

View file

@ -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
}

View file

@ -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<IEnumerable<SDK.Models.Game>> Get()
{
var accessibleGames = new List<SDK.Models.Game>();
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<IEnumerable<SDK.Models.Game>>("MappedGames", _ => {
return Mapper.Map<IEnumerable<SDK.Models.Game>>(games);

View file

@ -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
}
}

View file

@ -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
}
}

View file

@ -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,
}
}

View file

@ -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
}
}

View file

@ -1,11 +0,0 @@
using System.ComponentModel.DataAnnotations;
namespace LANCommander.Server.Data.Enums
{
public enum ServerConsoleType
{
[Display(Name = "Log File")]
LogFile,
RCON
}
}

View file

@ -1,4 +1,4 @@
using LANCommander.Server.Data.Enums;
using LANCommander.SDK.Enums;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

View file

@ -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;

View file

@ -1,4 +1,4 @@
using LANCommander.Server.Data.Enums;
using LANCommander.SDK.Enums;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text.Json.Serialization;

View file

@ -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;

View file

@ -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; }

View file

@ -1,4 +1,4 @@
using LANCommander.Server.Data.Enums;
using LANCommander.SDK.Enums;
using System.ComponentModel.DataAnnotations.Schema;
using System.Text.Json.Serialization;

View file

@ -1,4 +1,4 @@
using LANCommander.Server.Data.Enums;
using LANCommander.SDK.Enums;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable

View file

@ -1,4 +1,4 @@
using LANCommander.Server.Data.Enums;
using LANCommander.SDK.Enums;
namespace LANCommander.Server.Models
{

View file

@ -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<ServerService>();
var serverProcessService = scope.ServiceProvider.GetService<ServerProcessService>();
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
{

View file

@ -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,
});
}

View file

@ -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

View file

@ -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

View file

@ -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
{

View file

@ -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;

View file

@ -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
{

View file

@ -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,
});
}

View file

@ -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
@{

View file

@ -1,4 +1,4 @@
@using LANCommander.Server.Data.Enums
@using LANCommander.SDK.Enums
@model LANCommander.Server.Data.Models.Redistributable
@{

View file

@ -1,5 +1,4 @@
@inherits FeedbackComponent<MediaGrabberOptions, MediaGrabberResult>
@using LANCommander.Server.Data.Enums;
@using LANCommander.Server.Models;
@using LANCommander.SDK.Enums
@inject IMediaGrabberService MediaGrabberService

View file

@ -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

View file

@ -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<ScriptEditorOptions, Script>
@inject ScriptService ScriptService

View file

@ -1,5 +1,4 @@
@using AntDesign.TableModels;
@using LANCommander.Server.Data.Enums
@using LANCommander.Server.Models
@using LANCommander.PCGamingWiki
@using LANCommander.SDK.Enums

View file

@ -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

View file

@ -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

View file

@ -1,5 +1,5 @@
@using LANCommander.Server.Extensions;
@using LANCommander.Server.Data.Enums
@using LANCommander.SDK.Enums
@using LANCommander.Server.Extensions;
<Space Direction="DirectionVHType.Vertical" Size="@("large")" Style="width: 100%">
<SpaceItem>

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -1,4 +1,4 @@
@using LANCommander.Server.Data.Enums;
@using LANCommander.SDK.Enums
@using Microsoft.AspNetCore.SignalR.Client
@using NLog;
@using XtermBlazor

View file

@ -1,4 +1,4 @@
@using LANCommander.Server.Data.Enums
@using LANCommander.SDK.Enums
@using LANCommander.Server.Data.Models
@using LANCommander.Server.Extensions;

View file

@ -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

View file

@ -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 @@
</FormItem>
<FormItem Label="Method">
<Select @bind-Value="context.AutostartMethod" TItem="Data.Enums.ServerAutostartMethod" TItemValue="Data.Enums.ServerAutostartMethod" DataSource="Enum.GetValues<Data.Enums.ServerAutostartMethod>()">
<Select @bind-Value="context.AutostartMethod" TItem="ServerAutostartMethod" TItemValue="ServerAutostartMethod" DataSource="Enum.GetValues<ServerAutostartMethod>()">
<LabelTemplate Context="Value">@Value.GetDisplayName()</LabelTemplate>
<ItemTemplate Context="Value">@Value.GetDisplayName()</ItemTemplate>
</Select>
@ -199,7 +198,7 @@
@if (Panel == "Scripts")
{
<ScriptEditor ServerId="@Server.Id" AllowedTypes="new Data.Enums.ScriptType[] { Data.Enums.ScriptType.BeforeStart, Data.Enums.ScriptType.AfterStop }" />
<ScriptEditor ServerId="@Server.Id" AllowedTypes="new ScriptType[] { ScriptType.BeforeStart, ScriptType.AfterStop }" />
}
@if (Panel == "Files")