friendlynamazu/server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get rid of xivapi

Browse Source
This commit is contained in:
Stanley Dimant
2024-07-18 12:47:42 +02:00
parent ab6292ad55
commit c21df6fd59
2 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
MareSynchronosServer/MareSynchronosServer/Services/MareCensus.cs
View File

@@ -1,4 +1,5 @@
using MareSynchronos.API.Dto.User; using MareSynchronos.API.Dto.User;
using Microsoft.VisualBasic.FileIO;
using Prometheus; using Prometheus;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Globalization; using System.Globalization;
@@ -23,13 +24,11 @@ public class MareCensus : IHostedService
private readonly Dictionary<short, string> _races = new(); private readonly Dictionary<short, string> _races = new();
private readonly Dictionary<short, string> _tribes = new(); private readonly Dictionary<short, string> _tribes = new();
private readonly Dictionary<ushort, (string, short)> _worlds = new(); private readonly Dictionary<ushort, (string, short)> _worlds = new();
private readonly string _xivApiKey;
private Gauge? _gauge; private Gauge? _gauge;
public MareCensus(ILogger<MareCensus> logger, string xivApiKey) public MareCensus(ILogger<MareCensus> logger)
{ {
_logger = logger; _logger = logger;
_xivApiKey = xivApiKey;
} }
private bool Initialized => _gauge != null; private bool Initialized => _gauge != null;
@@ -68,67 +67,85 @@ public class MareCensus : IHostedService
public async Task StartAsync(CancellationToken cancellationToken) public async Task StartAsync(CancellationToken cancellationToken)
{ {
if (string.IsNullOrEmpty(_xivApiKey)) return;
_logger.LogInformation("Loading XIVAPI data"); _logger.LogInformation("Loading XIVAPI data");
using HttpClient client = new HttpClient(); using HttpClient client = new HttpClient();
Dictionary<ushort, short> worldDcs = new(); Dictionary<ushort, short> worldDcs = new();
var dcs = await client.GetStringAsync("https://xivapi.com/worlddcgrouptype?private_key" + _xivApiKey, cancellationToken).ConfigureAwait(false);
using var dcsJson = JsonSerializer.Deserialize<JsonElement>(dcs).GetProperty("Results").EnumerateArray();
foreach (var dcValue in dcsJson) var dcs = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/WorldDCGroupType.csv", cancellationToken).ConfigureAwait(false);
// dc: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/WorldDCGroupType.csv
// id, name, region
using var dcsReader = new StringReader(dcs);
using var dcsParser = new TextFieldParser(dcsReader);
dcsParser.Delimiters = [","];
// read 3 lines and discard
dcsParser.ReadLine(); dcsParser.ReadLine(); dcsParser.ReadLine();
while (!dcsParser.EndOfData)
{ {
var id = dcValue.GetProperty("ID").GetInt16(); var fields = dcsParser.ReadFields();
var name = dcValue.GetProperty("Name").GetString(); var id = short.Parse(fields[0], CultureInfo.InvariantCulture);
_dcs[id] = name; var name = fields[1];
_logger.LogInformation("DC: ID: {id}, Name: {name}", id, name); _logger.LogInformation("DC: ID: {id}, Name: {name}", id, name);
var dcData = await client.GetStringAsync("https://xivapi.com/worlddcgrouptype/" + id.ToString(CultureInfo.InvariantCulture) + "?private_key=" + _xivApiKey, cancellationToken).ConfigureAwait(false); _dcs[id] = name;
if (JsonSerializer.Deserialize<JsonElement>(dcData).TryGetProperty("GameContentLinks", out var gameContentLinks))
{
if (gameContentLinks.ValueKind == JsonValueKind.Object && gameContentLinks.TryGetProperty("World", out var worldProp))
{
using var json = worldProp.GetProperty("DataCenter").EnumerateArray();
foreach (var world in json)
{
worldDcs[(ushort)world.GetInt32()] = id;
}
}
} }
await Task.Delay(TimeSpan.FromMilliseconds(100)).ConfigureAwait(false); var worlds = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/World.csv", cancellationToken).ConfigureAwait(false);
} // world: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/World.csv
// id, internalname, name, region, usertype, datacenter
var worlds = await client.GetStringAsync("https://xivapi.com/world?limit=1000&private_key" + _xivApiKey, cancellationToken).ConfigureAwait(false); using var worldsReader = new StringReader(worlds);
using var worldJson = JsonSerializer.Deserialize<JsonElement>(worlds).GetProperty("Results").EnumerateArray(); using var worldsParser = new TextFieldParser(worldsReader);
foreach (var worldValue in worldJson) worldsParser.Delimiters = [","];
// read 3 lines and discard
worldsParser.ReadLine(); worldsParser.ReadLine(); worldsParser.ReadLine();
while (!worldsParser.EndOfData)
{ {
var id = (ushort)worldValue.GetProperty("ID").GetInt32(); var fields = worldsParser.ReadFields();
var name = worldValue.GetProperty("Name").GetString(); var id = ushort.Parse(fields[0], CultureInfo.InvariantCulture);
if (worldDcs.TryGetValue(id, out var dc)) var name = fields[1];
{ var dc = short.Parse(fields[5], CultureInfo.InvariantCulture);
_worlds[(ushort)id] = (name, dc); _worlds[id] = (name, dc);
_logger.LogInformation("World: ID: {id}, Name: {name}, DC: {dc}", id, name, dc); _logger.LogInformation("World: ID: {id}, Name: {name}, DC: {dc}", id, name, dc);
} }
}
var races = await client.GetStringAsync("https://xivapi.com/race?private_key" + _xivApiKey, cancellationToken).ConfigureAwait(false); var races = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/Race.csv", cancellationToken).ConfigureAwait(false);
using var racesJson = JsonSerializer.Deserialize<JsonElement>(races).GetProperty("Results").EnumerateArray(); // race: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/Race.csv
foreach (var racesValue in racesJson) // id, masc name, fem name, other crap I don't care about
using var raceReader = new StringReader(races);
using var raceParser = new TextFieldParser(raceReader);
raceParser.Delimiters = [","];
// read 3 lines and discard
raceParser.ReadLine(); raceParser.ReadLine(); raceParser.ReadLine();
while (!raceParser.EndOfData)
{ {
var id = racesValue.GetProperty("ID").GetInt16(); var fields = raceParser.ReadFields();
var name = racesValue.GetProperty("Name").GetString(); var id = short.Parse(fields[0], CultureInfo.InvariantCulture);
var name = fields[1];
_races[id] = name; _races[id] = name;
_logger.LogInformation("Race: ID: {id}, Name: {name}", id, name); _logger.LogInformation("Race: ID: {id}, Name: {name}", id, name);
} }
var tribe = await client.GetStringAsync("https://xivapi.com/tribe?private_key=" + _xivApiKey, cancellationToken).ConfigureAwait(false); var tribe = await client.GetStringAsync("https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/Tribe.csv", cancellationToken).ConfigureAwait(false);
using var tribeJson = JsonSerializer.Deserialize<JsonElement>(tribe).GetProperty("Results").EnumerateArray(); // tribe: https://raw.githubusercontent.com/xivapi/ffxiv-datamining/master/csv/Tribe.csv
foreach (var tribeValue in tribeJson) // id masc name, fem name, other crap I don't care about
using var tribeReader = new StringReader(tribe);
using var tribeParser = new TextFieldParser(tribeReader);
tribeParser.Delimiters = [","];
// read 3 lines and discard
tribeParser.ReadLine(); tribeParser.ReadLine(); tribeParser.ReadLine();
while (!tribeParser.EndOfData)
{ {
var id = tribeValue.GetProperty("ID").GetInt16(); var fields = tribeParser.ReadFields();
var name = tribeValue.GetProperty("Name").GetString(); var id = short.Parse(fields[0], CultureInfo.InvariantCulture);
var name = fields[1];
_tribes[id] = name; _tribes[id] = name;
_logger.LogInformation("Tribe: ID: {id}, Name: {name}", id, name); _logger.LogInformation("Tribe: ID: {id}, Name: {name}", id, name);
} }

2
MareSynchronosServer/MareSynchronosServer/Startup.cs
View File

@@ -94,7 +94,7 @@ public class Startup
// configure services based on main server status // configure services based on main server status
ConfigureServicesBasedOnShardType(services, mareConfig, isMainServer); ConfigureServicesBasedOnShardType(services, mareConfig, isMainServer);
services.AddSingleton(s => new MareCensus(s.GetRequiredService<ILogger<MareCensus>>(), mareConfig.GetValue("XIVAPIKey", string.Empty))); services.AddSingleton(s => new MareCensus(s.GetRequiredService<ILogger<MareCensus>>()));
services.AddHostedService(p => p.GetRequiredService<MareCensus>()); services.AddHostedService(p => p.GetRequiredService<MareCensus>());
if (isMainServer) if (isMainServer)