Продолжение работы

2025-05-14 01:28:48 +04:00
parent 1b76893b32
commit 6426ecfe40
40 changed files with 362 additions and 53 deletions
@@ -26,6 +26,11 @@ public class ProcessorAttribute(string name) : Attribute
    /// Коллекция названий обработчиков, которые должны быть выполнены до этого оброботчика.
    /// </summary>
    public string? InnerType { get; init; } = null;
+
+    /// <summary>
+    /// Процессор включён по умолчанию.
+    /// </summary>
+    public bool Active { get; init; } = true;
 }

 /// <summary>
@@ -20,6 +20,13 @@ internal class ProcessorCollection
    /// </summary>
    public List<ProcessorCollectionItem> Items { get; private set; } = [];

+    /// <summary>
+    /// Обеспечение доступа к элементам обработчиков.
+    /// </summary>
+    /// <param name="name"></param>
+    /// <returns></returns>
+    public ProcessorCollectionItem this[string name] => Items.First(item => item.Name == name);
+
    /// <summary>
    /// Конструктор класса <see cref="ProcessorCollection"/>.
    /// </summary>
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using System.Reflection;

 namespace Pf2eDataScrapper.App;

@@ -22,3 +23,15 @@ public enum ProcessorGroupEnum
    [Description("Foundry EN: Основные сущности")]
    FoundryEnEntities,
 }
+
+public static class ProcessorGroupEnumExtension
+{
+    public static string GetDescription(this ProcessorGroupEnum group)
+    {
+        return group
+                .GetType()
+                .GetField(group.ToString())
+                ?.GetCustomAttribute<DescriptionAttribute>()
+                ?.Description ?? group.ToString();
+    }
+}
@@ -0,0 +1,60 @@
+namespace Pf2eDataScrapper.Forms.Controls;
+
+partial class ProcessorCollectionControl
+{
+    /// <summary> 
+    /// Обязательная переменная конструктора.
+    /// </summary>
+    private System.ComponentModel.IContainer components = null;
+
+    /// <summary> 
+    /// Освободить все используемые ресурсы.
+    /// </summary>
+    /// <param name="disposing">истинно, если управляемый ресурс должен быть удален; иначе ложно.</param>
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing && (components != null))
+        {
+            components.Dispose();
+        }
+        base.Dispose(disposing);
+    }
+
+    #region Код, автоматически созданный конструктором компонентов
+
+    /// <summary> 
+    /// Требуемый метод для поддержки конструктора — не изменяйте 
+    /// содержимое этого метода с помощью редактора кода.
+    /// </summary>
+    private void InitializeComponent()
+    {
+        RootFlowLayoutPanel = new FlowLayoutPanel();
+        SuspendLayout();
+        // 
+        // RootFlowLayoutPanel
+        // 
+        RootFlowLayoutPanel.AutoScroll = true;
+        RootFlowLayoutPanel.BackColor = SystemColors.Window;
+        RootFlowLayoutPanel.BorderStyle = BorderStyle.FixedSingle;
+        RootFlowLayoutPanel.Dock = DockStyle.Fill;
+        RootFlowLayoutPanel.FlowDirection = FlowDirection.TopDown;
+        RootFlowLayoutPanel.Location = new Point(0, 0);
+        RootFlowLayoutPanel.Name = "RootFlowLayoutPanel";
+        RootFlowLayoutPanel.Size = new Size(432, 406);
+        RootFlowLayoutPanel.TabIndex = 0;
+        RootFlowLayoutPanel.WrapContents = false;
+        // 
+        // ProcessorCollectionControl
+        // 
+        AutoScaleDimensions = new SizeF(7F, 15F);
+        AutoScaleMode = AutoScaleMode.Font;
+        Controls.Add(RootFlowLayoutPanel);
+        Name = "ProcessorCollectionControl";
+        Size = new Size(432, 406);
+        ResumeLayout(false);
+    }
+
+    #endregion
+
+    private FlowLayoutPanel RootFlowLayoutPanel;
+}
@@ -0,0 +1,87 @@
+using System.ComponentModel;
+using Pf2eDataScrapper.App;
+
+namespace Pf2eDataScrapper.Forms.Controls;
+
+internal partial class ProcessorCollectionControl : UserControl
+{
+    [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
+    public ProcessorCollection? Collection
+    {
+        get => _collection;
+        set
+        {
+            _collection = value;
+            UpdateContent();
+        }
+    }
+    private ProcessorCollection? _collection = null;
+
+    public ProcessorCollectionControl()
+    {
+        InitializeComponent();
+    }
+
+    private Dictionary<ProcessorGroupEnum, CheckBox> GroupCheckBoxes { get; } = [];
+
+    private Dictionary<ProcessorGroupEnum, FlowLayoutPanel> GroupFlowLayoutPanels { get; } = [];
+
+    private Dictionary<string, CheckBox> ItemCheckBoxes { get; } = [];
+
+    private void UpdateContent()
+    {
+        RootFlowLayoutPanel.Controls.Clear();
+
+        if (Collection == null)
+        {
+            return;
+        }
+
+        foreach (ProcessorGroupEnum group in Enum.GetValues<ProcessorGroupEnum>())
+        {
+            GroupCheckBoxes[group] = new()
+            {
+                Text = group.GetDescription(),
+                //AutoSize = false,
+                Dock = DockStyle.Fill,
+                Checked = true,
+                CheckAlign = ContentAlignment.TopLeft,
+            };
+
+            GroupCheckBoxes[group].CheckedChanged += GroupCheckBox_CheckedChanged;
+
+            GroupFlowLayoutPanels[group] = new()
+            {
+                AutoSize = true,
+                Dock = DockStyle.Fill,
+                FlowDirection = FlowDirection.LeftToRight,
+                WrapContents = true,
+                BorderStyle = BorderStyle.FixedSingle,
+            };
+
+            RootFlowLayoutPanel.Controls.Add(GroupCheckBoxes[group]);
+            RootFlowLayoutPanel.Controls.Add(GroupFlowLayoutPanels[group]);
+        }
+
+        foreach (ProcessorCollectionItem item in Collection.AllItems)
+        {
+            ItemCheckBoxes[item.Name] = new()
+            {
+                Text = item.Description,
+                AutoSize = true,
+                // Dock = DockStyle.Fill,
+                // MaximumSize = new Size(Width, 20),
+                // Width = 200,
+                Checked = true,
+                CheckAlign = ContentAlignment.TopLeft,
+            };
+
+            GroupFlowLayoutPanels[item.Group].Controls.Add(ItemCheckBoxes[item.Name]);
+        }
+    }
+
+    private void GroupCheckBox_CheckedChanged(object? sender, EventArgs e)
+    {
+        //
+    }
+}
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
@@ -1,4 +1,5 @@
-using Pf2eDataScrapper.Processors;
+using Pf2eDataScrapper.Helpers;
+using Pf2eDataScrapper.Processors;

 namespace Pf2eDataScrapper.Forms;

@@ -32,7 +32,7 @@ partial class StartForm
        PropertiesGroupBox = new GroupBox();
        SettingsPropertyGrid = new PropertyGrid();
        ProcessorsGroupBox = new GroupBox();
-        ProcessorsListView = new ListView();
+        ProcessorCollectionControl = new Pf2eDataScrapper.Forms.Controls.ProcessorCollectionControl();
        SelectAllButton = new Button();
        DeselectAllButton = new Button();
        StartButton = new Button();
@@ -87,7 +87,7 @@ partial class StartForm
        // ProcessorsGroupBox
        // 
        ProcessorsGroupBox.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
-        ProcessorsGroupBox.Controls.Add(ProcessorsListView);
+        ProcessorsGroupBox.Controls.Add(ProcessorCollectionControl);
        ProcessorsGroupBox.Controls.Add(SelectAllButton);
        ProcessorsGroupBox.Controls.Add(DeselectAllButton);
        ProcessorsGroupBox.Location = new Point(3, 3);
@@ -97,17 +97,13 @@ partial class StartForm
        ProcessorsGroupBox.TabStop = false;
        ProcessorsGroupBox.Text = "Обработчики";
        // 
-        // ProcessorsListView
+        // ProcessorCollectionControl
        // 
-        ProcessorsListView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
-        ProcessorsListView.CheckBoxes = true;
-        ProcessorsListView.Location = new Point(6, 48);
-        ProcessorsListView.MultiSelect = false;
-        ProcessorsListView.Name = "ProcessorsListView";
-        ProcessorsListView.Size = new Size(606, 548);
-        ProcessorsListView.TabIndex = 2;
-        ProcessorsListView.UseCompatibleStateImageBehavior = false;
-        ProcessorsListView.View = View.SmallIcon;
+        ProcessorCollectionControl.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
+        ProcessorCollectionControl.Location = new Point(6, 48);
+        ProcessorCollectionControl.Name = "ProcessorCollectionControl";
+        ProcessorCollectionControl.Size = new Size(609, 548);
+        ProcessorCollectionControl.TabIndex = 2;
        // 
        // SelectAllButton
        // 
@@ -166,5 +162,5 @@ partial class StartForm
    private GroupBox ProcessorsGroupBox;
    private Button SelectAllButton;
    private Button DeselectAllButton;
-    private ListView ProcessorsListView;
+    private Controls.ProcessorCollectionControl ProcessorCollectionControl;
 }
@@ -17,9 +17,10 @@ internal partial class StartForm : Form

    private void StartForm_Load(object sender, EventArgs e)
    {
-        PopulateListView();
+        ProcessorCollectionControl.Collection = ProcessorCollection;
    }

+    /*
    private void PopulateListView()
    {
        Dictionary<ProcessorGroupEnum, List<ProcessorCollectionItem>> items = [];
@@ -39,14 +40,10 @@ internal partial class StartForm : Form
                continue;
            }

-            string name =
-                group
-                    .GetType()
-                    .GetField(group.ToString())
-                    ?.GetCustomAttribute<DescriptionAttribute>()
-                    ?.Description ?? group.ToString();
-
-            ListViewGroup listViewGroup = new(name);
+            ListViewGroup listViewGroup = new(group.GetDescription())
+            {
+                TaskLink = "Выбрать/снять все",
+            };
            ProcessorsListView.Groups.Add(listViewGroup);

            foreach (ProcessorCollectionItem item in list)
@@ -55,13 +52,26 @@ internal partial class StartForm : Form
                {
                    Group = listViewGroup,
                    Text = item.Description,
-                    Selected = true,
+                    Checked = true,
+                    ToolTipText = item.Name,
                };
                ProcessorsListView.Items.Add(listViewItem);
            }
        }
    }

+    private void ProcessorsListView_GroupTaskLinkClick(object sender, ListViewGroupEventArgs e)
+    {
+        ListViewGroup group = ProcessorsListView.Groups[e.GroupIndex];
+
+        bool allSelected = group.Items.Cast<ListViewItem>().All(item => item.Checked);
+
+        foreach (ListViewItem item in group.Items.Cast<ListViewItem>())
+        {
+            item.Checked = !allSelected;
+        }
+    }
+    */
    #region "Кнопка старта"

    private void StartButton_Click(object sender, EventArgs e)
@@ -1,4 +1,6 @@
-namespace Pf2eDataScrapper.Processors;
+using Pf2eDataScrapper.Processors;
+
+namespace Pf2eDataScrapper.Helpers;

 internal class ProcessProgress
 {
@@ -1,4 +1,5 @@
 using Newtonsoft.Json.Linq;
+using Pf2eDataScrapper.Helpers;
 using Pf2eDataScrapper.Importers.Repositories;
 using Pf2eDataScrapper.Processors;

@@ -1,4 +1,5 @@
 using Pf2eDataScrapper.App;
+using Pf2eDataScrapper.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Compendium;
 using Pf2eDataScrapper.Processors;

@@ -1,6 +1,6 @@
 using Pf2eDataScrapper.App;
+using Pf2eDataScrapper.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Compendium;
-using Pf2eDataScrapper.Processors;
 using Pf2eDataScrapper.SchemaBuilder;

 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Common;
@@ -10,7 +10,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Common;
 [Processor(
    "aonprd:skill",
    InnerType = "skill",
-    Description = "Создание цели внешних ссылок",
+    Description = "Навыки",
    Group = ProcessorGroupEnum.AonprdPreparation
 )]
 internal class SkillProcessor(ProcessorInput input, Pf2eDbContext context)
@@ -9,7 +9,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Common;
 [Processor(
    "aonprd:source",
    InnerType = "source",
-    Description = "Создание цели внешних ссылок",
+    Description = "Источники",
    Group = ProcessorGroupEnum.AonprdPreparation
 )]
 [ProcessorDependencies(["aonprd:repository"])]
@@ -15,7 +15,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Subclasse
 [Processor(
    "aonprd:apparition",
    InnerType = "apparition",
-    Description = "Создание цели внешних ссылок",
+    Description = "Apparitions",
    Group = ProcessorGroupEnum.AonprdSubclasses
 )]
 [ProcessorDependencies(
@@ -11,7 +11,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 [Processor(
    "aonprd:action",
    InnerType = "action",
-    Description = "Создание цели внешних ссылок",
+    Description = "Действия",
    Group = ProcessorGroupEnum.AonprdEntities
 )]
 [ProcessorDependencies(["aonprd:trait", "aonprd:source"])]
@@ -13,7 +13,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 [Processor(
    "aonprd:ancestry",
    InnerType = "ancestry",
-    Description = "Создание цели внешних ссылок",
+    Description = "Родословные",
    Group = ProcessorGroupEnum.AonprdEntities
 )]
 [ProcessorDependencies(["aonprd:trait", "aonprd:source", "aonprd:language"])]
@@ -12,7 +12,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 [Processor(
    "aonprd:archetype",
    InnerType = "archetype",
-    Description = "Создание цели внешних ссылок",
+    Description = "Архетипы",
    Group = ProcessorGroupEnum.AonprdEntities
 )]
 [ProcessorDependencies(["aonprd:trait", "aonprd:source"])]
@@ -14,7 +14,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 [Processor(
    "aonprd:background",
    InnerType = "background",
-    Description = "Создание цели внешних ссылок",
+    Description = "Предыстории",
    Group = ProcessorGroupEnum.AonprdEntities
 )]
 [ProcessorDependencies(["aonprd:trait", "aonprd:source"])]
@@ -18,7 +18,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 [Processor(
    "aonprd:class",
    InnerType = "class",
-    Description = "Создание цели внешних ссылок",
+    Description = "Классы",
    Group = ProcessorGroupEnum.AonprdEntities
 )]
 [ProcessorDependencies(["aonprd:trait", "aonprd:source", "aonprd:skill"])]
@@ -13,7 +13,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 [Processor(
    "aonprd:feat",
    InnerType = "feat",
-    Description = "Создание цели внешних ссылок",
+    Description = "Черты",
    Group = ProcessorGroupEnum.AonprdEntities
 )]
 [ProcessorDependencies(["aonprd:trait", "aonprd:source", "aonprd:archetype"])]
@@ -12,7 +12,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 [Processor(
    "aonprd:language",
    InnerType = "language",
-    Description = "Создание цели внешних ссылок",
+    Description = "Языки",
    Group = ProcessorGroupEnum.AonprdEntities
 )]
 [ProcessorDependencies(["aonprd:trait", "aonprd:source"])]
@@ -16,7 +16,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 [Processor(
    "aonprd:ritual",
    InnerType = "ritual",
-    Description = "Создание цели внешних ссылок",
+    Description = "Ритуалы",
    Group = ProcessorGroupEnum.AonprdEntities
 )]
 [ProcessorDependencies(["aonprd:trait", "aonprd:source", "aonprd:skill"])]
@@ -16,7 +16,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types.Rul
 [Processor(
    "aonprd:rules",
    InnerType = "rules",
-    Description = "Создание цели внешних ссылок",
+    Description = "Правила",
    Group = ProcessorGroupEnum.AonprdEntities
 )]
 [ProcessorDependencies(["aonprd:trait", "aonprd:source", "aonprd:rules-toc"])]
@@ -15,7 +15,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types.Rul

 [Processor(
    "aonprd:rules-order",
-    Description = "Создание цели внешних ссылок",
+    Description = "Формирование порядка правил",
    Group = ProcessorGroupEnum.AonprdEntities
 )]
 [ProcessorDependencies(["aonprd:rules"])]
@@ -12,7 +12,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types.Rul

 [Processor(
    "aonprd:rules-toc",
-    Description = "Создание цели внешних ссылок",
+    Description = "Загрузка содержания правил",
    Group = ProcessorGroupEnum.AonprdEntities
 )]
 [ProcessorDependencies(["aonprd:source"])]
@@ -15,7 +15,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 [Processor(
    "aonprd:spell",
    InnerType = "spell",
-    Description = "Создание цели внешних ссылок",
+    Description = "Заклинания",
    Group = ProcessorGroupEnum.AonprdEntities
 )]
 [ProcessorDependencies(["aonprd:trait", "aonprd:source"])]
@@ -12,7 +12,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 [Processor(
    "aonprd:trait",
    InnerType = "trait",
-    Description = "Создание цели внешних ссылок",
+    Description = "Признаки",
    Group = ProcessorGroupEnum.AonprdEntities
 )]
 [ProcessorDependencies(["aonprd:external"])]
@@ -1,17 +1,16 @@
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.FoundryEn.DataBuilder;
 using Pf2eDataScrapper.Processors;
 using Pf2eModel;
 using Pf2eModel.Model.Enum;

-namespace Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.DataBuilder.Processors;
+namespace Pf2eDataScrapper.Importers.Implementations.FoundryEn.Processors.Entities;

 [Processor(
    "foundry-en:action",
    InnerType = "action",
-    Description = "Создание цели внешних ссылок",
+    Description = "Действия",
    Group = ProcessorGroupEnum.FoundryEnEntities
 )]
 [ProcessorDependencies(["foundry-en:compendium"])]
@@ -1,18 +1,17 @@
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.FoundryEn.DataBuilder;
 using Pf2eDataScrapper.Processors;
 using Pf2eModel;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;

-namespace Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.DataBuilder.Processors;
+namespace Pf2eDataScrapper.Importers.Implementations.FoundryEn.Processors.Entities;

 [Processor(
    "foundry-en:condition",
    InnerType = "Item.condition",
-    Description = "Создание цели внешних ссылок",
+    Description = "Состояния",
    Group = ProcessorGroupEnum.FoundryEnEntities
 )]
 [ProcessorDependencies(["foundry-en:compendium"])]
@@ -13,7 +13,7 @@ using Pf2eModel.Model.Common.I18n;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;

-namespace Pf2eDataScrapper.Importers.Implementations.FoundryEn.DataBuilder;
+namespace Pf2eDataScrapper.Importers.Implementations.FoundryEn.Processors;

 internal abstract class FoundryEnAbstractProcessor(
    DatabaseHelper databaseHelper,
@@ -1,5 +1,6 @@
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.App;
+using Pf2eDataScrapper.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.FoundryEn.Compendium;
 using Pf2eDataScrapper.Processors;

@@ -1,4 +1,5 @@
 using Pf2eDataScrapper.App;
+using Pf2eDataScrapper.Helpers;
 using Pf2eDataScrapper.Processors;

 namespace Pf2eDataScrapper.Importers.Implementations.FoundryEn.Processors.Preparation;
@@ -1,6 +1,5 @@
 using Pf2eDataScrapper.App;
-using Pf2eDataScrapper.Importers.Implementations.FoundryEn.Compendium;
-using Pf2eDataScrapper.Processors;
+using Pf2eDataScrapper.Helpers;
 using Pf2eDataScrapper.SchemaBuilder;

 namespace Pf2eDataScrapper.Importers.Implementations.FoundryEn.Processors.Preparation;
@@ -8,7 +7,7 @@ namespace Pf2eDataScrapper.Importers.Implementations.FoundryEn.Processors.Prepar
 [Processor(
    "foundry-en:schema",
    Description = "Построение схемы данных",
-    Group = ProcessorGroupEnum.AonprdPreparation
+    Group = ProcessorGroupEnum.FoundryEnPreparation
 )]
 [ProcessorDependencies(["foundry-en:compendium"])]
 internal class SchemaBuildProcessor(
@@ -1,4 +1,5 @@
-using Pf2eDataScrapper.Processors;
+using Pf2eDataScrapper.Helpers;
+using Pf2eDataScrapper.Processors;

 namespace Pf2eDataScrapper.Importers.Repositories;

@@ -1,4 +1,5 @@
 using System.Diagnostics;
+using Pf2eDataScrapper.Helpers;
 using Pf2eDataScrapper.Processors;

 namespace Pf2eDataScrapper.Importers.Repositories;
@@ -33,4 +33,7 @@
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </None>
  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Importers\Implementations\FoundryEn\DataBuilder\" />
+  </ItemGroup>
 </Project>
@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.App;
+using Pf2eDataScrapper.Helpers;
 using Pf2eDataScrapper.Importers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Compendium;
@@ -1,4 +1,5 @@
 using Newtonsoft.Json.Linq;
+using Pf2eDataScrapper.Helpers;
 using Pf2eDataScrapper.Importers;
 using Pf2eDataScrapper.Processors;