From 10e3e274d52dbf6af05f4d49ebe81ca1ab0789b3 Mon Sep 17 00:00:00 2001 From: kozhilya Date: Thu, 17 Apr 2025 18:46:55 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20ActionPr?= =?UTF-8?q?ocessor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DataBuilder/AonprdProcessorAttribute.cs | 4 +-- .../DataBuilder/Processors/ActionProcessor.cs | 25 ++++++++++++++ .../DataBuilder/Processors/TraitProcessor.cs | 2 +- .../Processors/TraitTraitsProcessor.cs | 33 ------------------- Pf2eDataScrapper/Model/Enum/ActionType.cs | 10 +++--- 5 files changed, 34 insertions(+), 40 deletions(-) create mode 100644 Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/ActionProcessor.cs delete mode 100644 Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/TraitTraitsProcessor.cs diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/AonprdProcessorAttribute.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/AonprdProcessorAttribute.cs index d010fa1..fa30e37 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/AonprdProcessorAttribute.cs +++ b/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/AonprdProcessorAttribute.cs @@ -9,13 +9,13 @@ public class AonprdProcessorAttribute(string name, string type, string[] depende public readonly IEnumerable Dependencies = dependencies; - public AonprdProcessorAttribute(string type) : this(type, type, []) + public AonprdProcessorAttribute(string type) : this(type, type, ["trait"]) { } public AonprdProcessorAttribute(string type, string[] dependencies) : this(type, type, dependencies) { } - public AonprdProcessorAttribute(string name, string type) : this(name, type, []) + public AonprdProcessorAttribute(string name, string type) : this(name, type, ["trait"]) { } } diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/ActionProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/ActionProcessor.cs new file mode 100644 index 0000000..e67b10a --- /dev/null +++ b/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/ActionProcessor.cs @@ -0,0 +1,25 @@ +using Pf2eDataScrapper.Model.Enum; +using Pf2eDataScrapper.Model.Structure; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Processors; + +[AonprdProcessor("action")] +internal class ActionProcessor(ProcessorInput input) : AbstractProcessor(input) +{ + public override EntityType Type => EntityType.Trait; + + public override Model.Structure.Action Object { get; } = new(); + + public override void Process() + { + + + } + + +} diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/TraitProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/TraitProcessor.cs index e852086..e09d124 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/TraitProcessor.cs +++ b/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/TraitProcessor.cs @@ -3,7 +3,7 @@ using Pf2eDataScrapper.Model.Structure; namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Processors; -[AonprdProcessor("trait")] +[AonprdProcessor("trait", [])] internal class TraitProcessor(ProcessorInput input) : AbstractProcessor(input) { public override EntityType Type => EntityType.Trait; diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/TraitTraitsProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/TraitTraitsProcessor.cs deleted file mode 100644 index f6b7154..0000000 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/TraitTraitsProcessor.cs +++ /dev/null @@ -1,33 +0,0 @@ -using Newtonsoft.Json.Linq; -using Pf2eDataScrapper.Model.Enum; -using Pf2eDataScrapper.Model.Structure; - -namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Processors; - -[AonprdProcessor("trait_traits", "trait", ["trait"])] -internal class TraitTraitsProcessor(ProcessorInput input) : AbstractProcessor(input) -{ - public override EntityType Type => EntityType.Trait; - - public override Trait Object { get; } = new(); - - public override void Process() - { - string id = Input.GetRequired("id"); - string name = Input.GetRequired("name"); - - if (Input.GetOptional("remaster_id") is not null) - { - throw new LegacyItemException(name); - } - - // base.Process(); - string url = Input.GetRequired("url"); - - Model.Base.Targets.EntityExternal external = Context.EntityExternals.FirstOrDefault(x => x.Suffix == url) ?? throw new Exception("Entity not found?"); - Entity = external.Entity; - - AddTraits(); - } - -} diff --git a/Pf2eDataScrapper/Model/Enum/ActionType.cs b/Pf2eDataScrapper/Model/Enum/ActionType.cs index ce0e335..cd9f0b5 100644 --- a/Pf2eDataScrapper/Model/Enum/ActionType.cs +++ b/Pf2eDataScrapper/Model/Enum/ActionType.cs @@ -5,14 +5,16 @@ namespace Pf2eDataScrapper.Model.Enum; public enum ActionType { [PgName("action")] - action, + Action, [PgName("free")] - free, + Free, [PgName("reaction")] - reaction, + Reaction, [PgName("passive")] - passive, + Passive, + + } \ No newline at end of file