Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

update controllers to use DI stat manager

Browse Source
This commit is contained in:
RaidMax
2023-04-04 22:10:37 -05:00
parent da54c5d327
commit 6fa172d757
4 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
WebfrontCore/ViewComponents/ServerListViewComponent.cs
View File

@ -7,6 +7,7 @@ using System.Linq;
using System.Threading;
using Data.Models;
using Data.Models.Client.Stats;
using IW4MAdmin.Plugins.Stats.Helpers;
using SharedLibraryCore.Configuration;
using SharedLibraryCore.Interfaces;
using static SharedLibraryCore.Server;
@ -68,10 +69,10 @@ namespace WebfrontCore.ViewComponents
{
Name = server.Hostname,
ID = server.EndPoint,
Port = server.Port,
Map = server.CurrentMap.Alias,
Port = server.ListenPort,
Map = server.CurrentMap?.Alias,
Game = (Reference.Game)server.GameName,
ClientCount = server.Clients.Count(client => client != null),
ClientCount = server.ClientNum,
MaxClients = server.MaxClients,
GameType = server.GametypeName,
ClientHistory = new ClientHistoryInfo
@ -80,15 +81,14 @@ namespace WebfrontCore.ViewComponents
ClientCounts = counts.ToList()
},
Players = server.GetClientsAsList()
.Select(p => new PlayerInfo()
.Select(client => new PlayerInfo
{
Name = p.Name,
ClientId = p.ClientId,
Level = p.Level.ToLocalizedLevelName(),
LevelInt = (int) p.Level,
Tag = p.Tag,
ZScore = p.GetAdditionalProperty<EFClientStatistics>(IW4MAdmin.Plugins.Stats.Helpers
.StatManager
Name = client.Name,
ClientId = client.ClientId,
Level = client.Level.ToLocalizedLevelName(),
LevelInt = (int)client.Level,
Tag = client.Tag,
ZScore = client.GetAdditionalProperty<EFClientStatistics>(StatManager
.CLIENT_STATS_KEY)?.ZScore
}).ToList(),
ChatHistory = server.ChatHistory.ToList(),
@ -97,7 +97,7 @@ namespace WebfrontCore.ViewComponents
ExternalIPAddress = server.ResolvedIpEndPoint.Address.IsInternal() ? Program.Manager.ExternalIPAddress : server.IP,
ConnectProtocolUrl = server.EventParser.URLProtocolFormat.FormatExt(
server.ResolvedIpEndPoint.Address.IsInternal() ? Program.Manager.ExternalIPAddress : server.IP,
server.Port)
server.ListenPort)
});
}

15
WebfrontCore/ViewComponents/TopPlayersViewComponent.cs
View File

@ -3,6 +3,7 @@ using System.Threading.Tasks;
using IW4MAdmin.Plugins.Stats;
using IW4MAdmin.Plugins.Stats.Helpers;
using Microsoft.AspNetCore.Mvc;
using SharedLibraryCore.Interfaces;
using Stats.Config;
namespace WebfrontCore.ViewComponents
@ -10,26 +11,28 @@ namespace WebfrontCore.ViewComponents
public class TopPlayersViewComponent : ViewComponent
{
private readonly StatsConfiguration _config;
private readonly StatManager _statManager;
public TopPlayersViewComponent(StatsConfiguration config)
public TopPlayersViewComponent(StatsConfiguration config, StatManager statManager)
{
_config = config;
_statManager = statManager;
}
public async Task<IViewComponentResult> InvokeAsync(int count, int offset, string serverEndpoint = null)
{
var server = Plugin.ServerManager.GetServers()
.FirstOrDefault(server => server.ToString() == serverEndpoint);
.FirstOrDefault(server => server.Id == serverEndpoint) as IGameServer;
var serverId = server is null ? (long?)null : StatManager.GetIdForServer(server);
var serverId = server?.LegacyDatabaseId;
ViewBag.UseNewStats = _config?.EnableAdvancedMetrics ?? true;
ViewBag.SelectedServerName = server?.Hostname;
ViewBag.SelectedServerName = server?.ServerName;
return View("~/Views/Client/Statistics/Components/TopPlayers/_List.cshtml",
ViewBag.UseNewStats
? await Plugin.Manager.GetNewTopStats(offset, count, serverId)
: await Plugin.Manager.GetTopStats(offset, count, serverId));
? await _statManager.GetNewTopStats(offset, count, serverId)
: await _statManager.GetTopStats(offset, count, serverId));
}
}
}