kozhilya/Pf2eDataScrapper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Отчистика кода

Browse Source
This commit is contained in:
kozhilya
2025-04-18 17:32:23 +04:00
parent 9a711c5a9d
commit 02d35d72d2
11 changed files with 1181 additions and 1229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pf2eViewer/EntityConventor.cs
+5 -38
View File
@@ -1,12 +1,9 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pf2eModel;
using Pf2eModel.Model;
using Pf2eModel.Model.Base;
using Pf2eModel.Model.Structure;
using Processor = System.Func<Newtonsoft.Json.JsonWriter, object, Newtonsoft.Json.JsonSerializer, Pf2eModel.Model.Pf2eDbContext, Newtonsoft.Json.Linq.JObject>;
namespace Pf2eViewer;
internal class EntityConventor : JsonConverter
@@ -43,11 +40,11 @@ internal class EntityConventor : JsonConverter
JObject ProcessEntity(JObject obj, Entity e)
{
var traitIds = e.Traits.Select(t => t.Id).ToList();
var traits = Context.Traits.Where(t => traitIds.Contains(t.Id)).Include(t => t.Entity).ToList();
List<int> traitIds = e.Traits.Select(t => t.Id).ToList();
List<Trait> traits = Context.Traits.Where(t => traitIds.Contains(t.Id)).Include(t => t.Entity).ToList();
foreach (var item in (JArray) obj.SelectToken("Traits"))
foreach (JToken item in (JArray) obj.SelectToken("Traits"))
{
JObject o = (JObject) item;
int id = o.SelectToken("Id").ToObject<int>();
@@ -57,42 +54,12 @@ internal class EntityConventor : JsonConverter
obj.Remove("Description");
return obj;
}
private JArray GetFromSet<T>(DbSet<T> set, Func<T, bool> where) where T : Type
{
return new(set.Where(where).Select(JToken.FromObject).ToArray());
}
private JObject Process(JsonWriter writer, Entity e, JsonSerializer serializer)
{
JObject result = new();
// result.Add("Aliases", GetFromSet<EntityAlias>(context.EntityAliases, o => o.Entity == e));
result.Add("Sources", new JArray(e.Sources.Select(o => JToken.FromObject(o)).ToArray()));
result.Add("Keywords", new JArray(e.Keywords.Select(o => JToken.FromObject(o)).ToArray()));
result.Add("Externals", new JArray(e.Externals.Select(o => JToken.FromObject(o)).ToArray()));
result.Add("Traits", new JArray(e.Traits.Select(o => JToken.FromObject(o)).ToArray()));
return result;
}
public override bool CanRead => false;
public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)