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

Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/AonprdEnumResolver.cs

@@ -1,12 +1,4 @@
-using Pf2eDataScrapper.Importers.Repositories;
+using Pf2eModel.Model.Enum;
-using Pf2eModel.Model.Enum;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using static LinqToDB.Reflection.Methods.LinqToDB.Insert;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder;
 public static class AonprdEnumResolver
@@ -48,7 +40,7 @@ public static class AonprdEnumResolver
 
         Solver<T> tSolver = (Solver<T>) solver;
 
-        return tSolver.Data.TryGetValue(value, out var data) ? data : throw new EnumResolverValueUnknownException(type, value);
+        return tSolver.Data.TryGetValue(value, out T? data) ? data : throw new EnumResolverValueUnknownException(type, value);
     }
 
     private abstract class Solver

Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/TraitProcessor.cs

@@ -3,7 +3,7 @@ using Pf2eModel.Model.Structure;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Processors;
 
-[AonprdProcessor("trait", new string[] {})]
+[AonprdProcessor("trait", new string[] { })]
 internal class TraitProcessor(ProcessorInput input) : AbstractProcessor(input)
 {
     public override EntityType Type => EntityType.Trait;

Pf2eModel/EntityOfTypeAttribute.cs

@@ -1,5 +1,5 @@
-using Pf2eModel.Model.Base;
+using Pf2eModel.Model;
-using Pf2eModel.Model;
+using Pf2eModel.Model.Base;
 using Pf2eModel.Model.Enum;
 using System.Reflection;
 

Pf2eModel/Migrations/20250418062358_Function.cs

@@ -2,11 +2,11 @@
 
 #nullable disable
 
-namespace Pf2eModel.Migrations
+namespace Pf2eModel.Migrations;
+
+/// <inheritdoc />
+public partial class Function : Migration
 {
-    /// <inheritdoc />
-    public partial class Function : Migration
-    {
     /// <inheritdoc />
     protected override void Up(MigrationBuilder migrationBuilder)
     {
@@ -71,5 +71,4 @@ $func$;
         migrationBuilder.Sql("DROP FUNCTION f_drop_tables;");
         migrationBuilder.Sql("DROP FUNCTION f_permission_tables;");
     }
-    }
 }

Pf2eModel/Migrations/20250418083111_1.cs

@@ -1,15 +1,14 @@
-using System;
+using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
 using Pf2eModel.Model.Enum;
 
 #nullable disable
 
-namespace Pf2eModel.Migrations
+namespace Pf2eModel.Migrations;
+
+/// <inheritdoc />
+public partial class _1 : Migration
 {
-    /// <inheritdoc />
-    public partial class _1 : Migration
-    {
     /// <inheritdoc />
     protected override void Up(MigrationBuilder migrationBuilder)
     {
@@ -1195,5 +1194,4 @@ namespace Pf2eModel.Migrations
         migrationBuilder.DropTable(
             name: "entities");
     }
-    }
 }

Pf2eModel/Model/Base/Targets/EntityExternal.cs

@@ -1,5 +1,4 @@
 using Microsoft.EntityFrameworkCore;
-using Newtonsoft.Json;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 

Pf2eModel/Pf2eDbContextModel.cs

@@ -1,5 +1,4 @@
-using LinqToDB.Common;
+using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Pf2eModel.Model.Base;
 using Pf2eModel.Model.Base.Keywords;
@@ -14,7 +13,6 @@ using Pf2eModel.Model.Structure.ClassRelation;
 using Pf2eModel.Model.Structure.DeityRelation;
 using Pf2eModel.Model.Structure.FeatRelation;
 using Pf2eModel.Model.Structure.SpellRelation;
-using System.Reflection;
 
 namespace Pf2eModel.Model;
 

Pf2eViewer/EntityConventor.cs

@@ -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();
+        List<int> traitIds = e.Traits.Select(t => t.Id).ToList();
-        var traits = Context.Traits.Where(t => traitIds.Contains(t.Id)).Include(t => t.Entity).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>();
@@ -63,36 +60,6 @@ internal class EntityConventor : JsonConverter
     }
 
 
-
-
-    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)

Pf2eViewer/MainViewForm.cs

@@ -1,12 +1,10 @@
 using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Newtonsoft.Json.Serialization;
 using Pf2eModel;
 using Pf2eModel.Model;
 using Pf2eModel.Model.Base;
 using Pf2eModel.Model.Enum;
-using static LinqToDB.Common.Configuration;
 
 namespace Pf2eViewer;
 
@@ -50,16 +48,17 @@ public partial class MainViewForm : Form
 
     private void EntityGridView_RowStateChanged(object sender, DataGridViewRowStateChangedEventArgs e)
     {
-        var rowsCount = EntityGridView.SelectedRows.Count;
+        int rowsCount = EntityGridView.SelectedRows.Count;
-        if (rowsCount == 0 || rowsCount > 1){
+        if (rowsCount == 0 || rowsCount > 1)
+        {
             return;
         }
 
-        var row = EntityGridView.SelectedRows[0];
+        DataGridViewRow row = EntityGridView.SelectedRows[0];
 
-        var data = (EntityGridRow) row.DataBoundItem;
+        EntityGridRow data = (EntityGridRow) row.DataBoundItem;
 
-        var json = SerializeEntity(data.GetEntity());
+        string json = SerializeEntity(data.GetEntity());
 
         JsonToTreeview(EntityTreeView, json, "Entity");
 
@@ -68,9 +67,9 @@ public partial class MainViewForm : Form
 
     public string SerializeEntity(Entity entity)
     {
-        var settings = new JsonSerializerSettings()
+        JsonSerializerSettings settings = new JsonSerializerSettings()
         {
-            Converters = [ new EntityConventor() ]
+            Converters = [new EntityConventor()]
             // ContractResolver = new CamelCasePropertyNamesContractResolver(),
         };
 
@@ -92,7 +91,7 @@ public partial class MainViewForm : Form
 
         treeView.Nodes.Clear();
 
-        foreach(TreeNode node in Element2TreeNode(json, rootName).Nodes)
+        foreach (TreeNode node in Element2TreeNode(json, rootName).Nodes)
         {
             treeView.Nodes.Add(node);
         }