Капитальная чистка кода

Pf2eDataScrapper.sln

@@ -19,8 +19,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "output", "output", "{36D591
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pf2eModel", "Pf2eModel\Pf2eModel.csproj", "{D32B7787-D912-4B21-B341-7C1F42F62D36}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pf2eViewer", "Pf2eViewer\Pf2eViewer.csproj", "{9F492EA7-1E1A-439D-A028-506BA445ABE4}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,10 +33,6 @@ Global
 		{D32B7787-D912-4B21-B341-7C1F42F62D36}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D32B7787-D912-4B21-B341-7C1F42F62D36}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D32B7787-D912-4B21-B341-7C1F42F62D36}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F492EA7-1E1A-439D-A028-506BA445ABE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F492EA7-1E1A-439D-A028-506BA445ABE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F492EA7-1E1A-439D-A028-506BA445ABE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F492EA7-1E1A-439D-A028-506BA445ABE4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Pf2eDataScrapper/Forms/Controls/CoreBindingNavigator.cs

@@ -1,4 +1,4 @@
-namespace Pf2eViewer;
+namespace Pf2eDataScrapper.Forms.Controls;
 
 /// <summary>
 /// Элемент управления прокрутки страниц

Pf2eDataScrapper/Forms/Controls/DatabaseViewer/DatabaseQueryPerformer.cs

@@ -3,7 +3,7 @@ using Pf2eModel;
 using Pf2eModel.Model.Base;
 using Pf2eModel.Model.Enum;
 
-namespace Pf2eViewer.DatabaseViewer;
+namespace Pf2eDataScrapper.Forms.Controls.DatabaseViewer;
 
 /// <summary>
 /// Класс, выполняющий страничные запросы к базе данных.

Pf2eDataScrapper/Forms/Controls/DatabaseViewer/DatabaseViewerControl.Designer.cs

@@ -1,4 +1,4 @@
-namespace Pf2eViewer.DatabaseViewer;
+namespace Pf2eDataScrapper.Forms.Controls.DatabaseViewer;
 
 partial class DatabaseViewerControl
 {

Pf2eDataScrapper/Forms/Controls/DatabaseViewer/DatabaseViewerControl.cs

@@ -1,12 +1,13 @@
 using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
+using Pf2eDataScrapper.Helpers;
 using Pf2eModel;
 using Pf2eModel.Model.Base;
 using Pf2eModel.Model.Common.I18n;
 using Pf2eModel.Model.Enum;
 using Timer = System.Windows.Forms.Timer;
 
-namespace Pf2eViewer.DatabaseViewer;
+namespace Pf2eDataScrapper.Forms.Controls.DatabaseViewer;
 
 /// <summary>
 /// Класс элемента управления, который отображает сущности в виде таблицы.
@@ -87,7 +88,7 @@ public partial class DatabaseViewerControl : UserControl
     /// <summary>
     /// Флаг, указывающий, что элемент управления занят выполнением запроса к базе данных.
     /// </summary>
-    private bool _isBusy = true;
+    private bool _isBusy;
 
     /// <summary>
     /// Объект, который выполняет запрос к базе данных.

Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/EntityTreeViewerControl.Designer.cs

@@ -1,4 +1,4 @@
-namespace Pf2eViewer.EntityTreeViewer;
+namespace Pf2eDataScrapper.Forms.Controls.EntityTreeViewer;
 
 sealed partial class EntityTreeViewerControl
 {

Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/EntityTreeViewerControl.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
-using Pf2eDataScrapper.Forms.Controls.EntityTreeViewer;
+using Pf2eDataScrapper.Helpers;
 
-namespace Pf2eViewer.EntityTreeViewer;
+namespace Pf2eDataScrapper.Forms.Controls.EntityTreeViewer;
 
 /// <summary>
 /// Элемент управления для отображения структуры сущности.

Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/EntityTreeViewerControlRow.cs

@@ -1,10 +1,9 @@
 using FontAwesome.Sharp;
-using Pf2eDataScrapper.Forms.Controls.EntityTreeViewer;
 using Font = System.Drawing.Font;
 using FontStyle = System.Drawing.FontStyle;
 using Image = System.Drawing.Image;
 
-namespace Pf2eViewer.EntityTreeViewer;
+namespace Pf2eDataScrapper.Forms.Controls.EntityTreeViewer;
 
 /// <summary>
 /// Элемент управления для отображения строки поля сущности.
@@ -86,7 +85,7 @@ internal class EntityTreeViewerControlRow
             }
         }
     }
-    private bool _hovered = false;
+    private bool _hovered;
 
     /// <summary>
     /// Индекс строки в представлении.
@@ -96,7 +95,7 @@ internal class EntityTreeViewerControlRow
     /// <summary>
     /// Кнопка раскрытия/сворачивания.
     /// </summary>
-    public IconButton? Button { get; set; } = null;
+    public IconButton? Button { get; set; }
 
     #endregion
 
@@ -440,7 +439,7 @@ internal class EntityTreeViewerControlRow
             Width,
         ];
 
-        Pen p = new(Color.Aqua, 1);
+        Pen _ = new(Color.Aqua, 1);
 
         for (int i = 0; i < 3; i++)
         {

Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/StructureBuilder.cs

@@ -153,7 +153,7 @@ internal class StructureProcessedObject(object value)
 {
     public readonly object Value = value;
 
-    private StructureFieldComplex? _field = null;
+    private StructureFieldComplex? _field;
 
     public StructureFieldComplex? Field
     {
@@ -422,7 +422,7 @@ internal class StructureFieldComplex : StructureField
             UpdateFieldVisibility();
         }
     }
-    private bool _collapsed = false;
+    private bool _collapsed;
 
     /// <inheritdoc/>
     public override bool Visible

Pf2eDataScrapper/Forms/Controls/ProcessorCollectionControl.cs

@@ -90,7 +90,7 @@ internal partial class ProcessorCollectionControl : UserControl
 
         foreach ((string key, CheckBox checkBox) in ItemCheckBoxes)
         {
-            ProcessorCollectionItem item = Collection![key];
+            ProcessorCollectionItem item = Collection[key];
 
             if (checkStates.TryGetValue(item.Group, out CheckState state))
             {

Pf2eDataScrapper/Forms/EntityViewForm.Designer.cs

@@ -1,7 +1,7 @@
-using Microsoft.EntityFrameworkCore.Scaffolding.Metadata;
+using Pf2eDataScrapper.Forms.Controls.DatabaseViewer;
-using Pf2eViewer.DatabaseViewer;
+using Pf2eDataScrapper.Forms.Controls.EntityTreeViewer;
 
-namespace Pf2eViewer;
+namespace Pf2eDataScrapper.Forms;
 
 partial class EntityViewForm
 {
@@ -37,7 +37,7 @@ partial class EntityViewForm
         ResultSplitContainer = new SplitContainer();
         DescriptionTextBox = new TextBox();
         DatabaseViewer = new DatabaseViewerControl();
-        EntityTreeViewerControl = new Pf2eViewer.EntityTreeViewer.EntityTreeViewerControl();
+        EntityTreeViewerControl = new EntityTreeViewerControl();
         MainMenuStrip = new MenuStrip();
         FileToolStripMenuItem = new ToolStripMenuItem();
         ExitToolStripMenuItem = new ToolStripMenuItem();
@@ -233,7 +233,7 @@ partial class EntityViewForm
     private ListBox TypesListBox;
     private SplitContainer ResultSplitContainer;
     private TextBox DescriptionTextBox;
-    private EntityTreeViewer.EntityTreeViewerControl EntityTreeViewerControl;
+    private EntityTreeViewerControl EntityTreeViewerControl;
     private DatabaseViewerControl DatabaseViewer;
     private MenuStrip MainMenuStrip;
     private ToolStripMenuItem FileToolStripMenuItem;

Pf2eDataScrapper/Forms/EntityViewForm.cs

@@ -1,9 +1,9 @@
 using System.ComponentModel;
-using Pf2eDataScrapper;
+using Pf2eDataScrapper.Helpers;
 using Pf2eModel;
 using Pf2eModel.Model.Enum;
 
-namespace Pf2eViewer;
+namespace Pf2eDataScrapper.Forms;
 
 /// <summary>
 /// Основная форма приложения.

Pf2eDataScrapper/Forms/ProgressForm.cs

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

Pf2eDataScrapper/Helpers/EntityView.cs

@@ -5,7 +5,7 @@ using Pf2eModel.Model.Base;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;
 
-namespace Pf2eViewer;
+namespace Pf2eDataScrapper.Helpers;
 
 /// <summary>
 /// Класс, обрабатывающий запросы к сущностям и подключающий необходимые данные.

Pf2eDataScrapper/Helpers/ProcessProgress.cs

@@ -63,7 +63,7 @@ internal class ProcessProgress : AbstractLogger
                 Update?.Invoke();
             }
         }
-        private int _count = 0;
+        private int _count;
 
         /// <summary>
         /// Индекс текущего обрабатываемого процесса.
@@ -77,7 +77,7 @@ internal class ProcessProgress : AbstractLogger
                 Update?.Invoke();
             }
         }
-        private int _current = 0;
+        private int _current;
 
         /// <summary>
         /// Название текущего обрабатываемого процесса.

Pf2eDataScrapper/ImportApplication.cs

@@ -4,7 +4,6 @@ using Pf2eDataScrapper.Forms;
 using Pf2eDataScrapper.Helpers;
 using Pf2eDataScrapper.Processors;
 using Pf2eModel;
-using Pf2eViewer;
 using Slugify;
 
 namespace Pf2eDataScrapper;
@@ -57,7 +56,7 @@ internal sealed class ImportApplication : ApplicationContext
 
     #region "Жизненный цикл"
 
-    private Form? CurrentForm { get; set; } = null;
+    private Form? CurrentForm { get; set; }
 
     public delegate void ApplicationStateChangeDelegate(object sender, ApplicationStage nextStage);
 

Pf2eDataScrapper/Importers/AbstractImporter.cs

@@ -1,6 +1,4 @@
-using Pf2eDataScrapper.Importers.Repositories;
+namespace Pf2eDataScrapper.Importers;
-
-namespace Pf2eDataScrapper.Importers;
 
 /// <summary>
 /// Абстрактный класс импортёра.

Pf2eDataScrapper/Importers/Implementations/Aonprd/AonprdImporter.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Compendium;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd;
 

Pf2eDataScrapper/Importers/Implementations/Aonprd/AonprdRepository.cs

@@ -1,7 +1,6 @@
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.Helpers;
 using Pf2eDataScrapper.Importers.Repositories;
-using Pf2eDataScrapper.Processors;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd;
 
@@ -13,7 +12,7 @@ internal class AonprdRepository(AonprdImporter importer) : AbstractImporterRepos
     /// <summary>
     /// URL для доступа к API Aonprd.
     /// </summary>
-    public readonly string SearchUrl = "https://elasticsearch.aonprd.com";
+    public const string SearchUrl = "https://elasticsearch.aonprd.com";
 
     /// <summary>
     /// Текущая ревизия данных. Значение обновляется при обновлении репозитория.

Pf2eDataScrapper/Importers/Implementations/Aonprd/Helpers/StringHelper.cs

@@ -1,6 +1,6 @@
 using System.Text.RegularExpressions;
 
-namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
+namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 
 /// <summary>
 /// Класс-помощник, для обработки строкового ввода с Архивов Нефиса.

Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/AbstractEntityProcessor.cs

@@ -1,9 +1,7 @@
-using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
 using Pf2eModel;
@@ -15,6 +13,7 @@ using Pf2eModel.Model.Base.Targets;
 using Pf2eModel.Model.Common.I18n;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors;
 

Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/AbstractSubclassProcessor.cs

@@ -1,6 +1,5 @@
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
 using Pf2eModel;
@@ -8,6 +7,7 @@ using Pf2eModel.Model.Base;
 using Pf2eModel.Model.Common.I18n;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors;
 

Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Common/LegacyProcessor.cs

@@ -1,11 +1,11 @@
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.App;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
 using Pf2eModel;
 using Pf2eModel.Model.Base.Legacy;
 using Pf2eModel.Model.Common.I18n;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Common;
 
@@ -108,6 +108,4 @@ internal class LegacyProcessor(
         Context.SaveChanges(false);
         Context.Dispose();
     }
-
-    private static readonly Lock Lock = new();
 }

Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Subclasses/ApparitionProcessor.cs

@@ -1,6 +1,5 @@
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
 using Pf2eModel;
@@ -9,6 +8,7 @@ using Pf2eModel.Model.Common;
 using Pf2eModel.Model.Common.I18n;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Subclasses;
 

Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/ActionProcessor.cs

@@ -1,10 +1,9 @@
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
-using Pf2eModel;
 using Pf2eModel.Model.Enum;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 

Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/AncestryProcessor.cs

@@ -1,12 +1,11 @@
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
-using Pf2eModel;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 

Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/ArchetypeProcessor.cs

@@ -1,11 +1,10 @@
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
-using Pf2eModel;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 

Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/BackgroundProcessor.cs

@@ -1,13 +1,12 @@
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
-using Pf2eModel;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;
 using Pf2eModel.Model.Structure.BackgroundRelation;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 

Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/ClassProcessor.cs

@@ -2,7 +2,6 @@
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
 using Pf2eModel;
@@ -12,6 +11,7 @@ using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;
 using Pf2eModel.Model.Structure.ClassRelation;
 using static System.Text.RegularExpressions.Regex;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 

Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/FeatProcessor.cs

@@ -1,12 +1,12 @@
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
 using Pf2eModel;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 

Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/LanguageProcessor.cs

@@ -1,11 +1,10 @@
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
-using Pf2eModel;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 

Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/RitualProcessor.cs

@@ -2,7 +2,6 @@
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
 using Pf2eModel;
@@ -10,6 +9,7 @@ using Pf2eModel.Model.Common.I18n;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;
 using Pf2eModel.Model.Structure.RitualRelation;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 
@@ -43,9 +43,9 @@ internal partial class RitualProcessor(
         base.Process();
 
         Object.Level = Input.GetRequired<int>("level");
-        Object.Duration = Input.GetOptional<int>("duration", -1);
+        Object.Duration = Input.GetOptional("duration", -1);
 
-        Object.Range = Input.GetOptional<int>("range", -1);
+        Object.Range = Input.GetOptional("range", -1);
         Object.RangeString = Input.GetOptionalLocale("range_raw", LocaleType.English);
 
         Object.CastTime = CalculateCastTime(Input.GetRequired<string>("actions"));

Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/Rules/RuleProcessor.cs

@@ -1,15 +1,14 @@
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
-using Pf2eModel;
 using Pf2eModel.Model.Base.Source;
 using Pf2eModel.Model.Base.Targets;
 using Pf2eModel.Model.Common.I18n;
 using Pf2eModel.Model.Enum;
 using Rule = Pf2eModel.Model.Structure.Rule;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types.Rules;
 

Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/SpellProcessor.cs

@@ -1,14 +1,13 @@
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
-using Pf2eModel;
 using Pf2eModel.Model.Common.I18n;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;
 using Pf2eModel.Model.Structure.SpellRelation;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 
@@ -44,8 +43,8 @@ internal class SpellProcessor(
         Object.Level = Input.GetRequired<int>("level");
         Object.Actions = Input.EnumOptional("actions", ActionEnum.Unknown);
         Object.IsFocus = Input.GetRequired<string>("spell_type") == "Focus";
-        Object.Duration = Input.GetOptional<int>("duration", -1);
+        Object.Duration = Input.GetOptional("duration", -1);
-        Object.Range = Input.GetOptional<int>("range", -1);
+        Object.Range = Input.GetOptional("range", -1);
 
         Object.Cost = Input.GetOptionalLocale("cost_markdown", LocaleType.English);
         Object.Trigger = Input.GetOptionalLocale("trigger_markdown", LocaleType.English);

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

@@ -1,13 +1,12 @@
 using Pf2eDataScrapper.App;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Helpers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers;
 using Pf2eDataScrapper.Processors;
-using Pf2eModel;
 using Pf2eModel.Model.Base.Legacy;
 using Pf2eModel.Model.Common.I18n;
 using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;
+using StringHelper = Pf2eDataScrapper.Importers.Implementations.Aonprd.Helpers.StringHelper;
 
 namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 
@@ -21,7 +20,6 @@ namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.Processors.Types;
 [ProcessorDependencies(["aonprd:legacy"])]
 internal class TraitProcessor(
     ProcessorInput input,
-    Pf2eDbContext context,
     StringHelper stringHelper,
     DatabaseHelper helper,
     AonprdBuilderGlobals globals

Pf2eDataScrapper/Importers/Implementations/FoundryEn/Processors/FoundryEnAbstractProcessor.cs

@@ -7,7 +7,6 @@ using Pf2eDataScrapper.Processors;
 using Pf2eModel;
 using Pf2eModel.Model;
 using Pf2eModel.Model.Base;
-using Pf2eModel.Model.Base.Legacy;
 using Pf2eModel.Model.Base.Source;
 using Pf2eModel.Model.Base.Targets;
 using Pf2eModel.Model.Common.I18n;

Pf2eDataScrapper/Importers/Implementations/FoundryEn/Processors/Preparation/CompendiumFolderProcessor.cs

@@ -21,7 +21,7 @@ internal class CompendiumFolderProcessor(
     private CompendiumFolderCollection Folders { get; } = folders;
 
     private string Dir => Repository.RepositoryDirPath;
-    private int NextFolderId { get; set; } = 0;
+    private int NextFolderId { get; set; }
 
     public void Process()
     {

Pf2eDataScrapper/Importers/Repositories/AbstractImporterRepository.cs

@@ -1,5 +1,4 @@
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Processors;
 
 namespace Pf2eDataScrapper.Importers.Repositories;
 

Pf2eDataScrapper/Importers/Repositories/GitRepository.cs

@@ -1,6 +1,5 @@
 using System.Diagnostics;
 using Pf2eDataScrapper.Helpers;
-using Pf2eDataScrapper.Processors;
 
 namespace Pf2eDataScrapper.Importers.Repositories;
 

Pf2eDataScrapper/Processors/AbstractProcessor.cs

@@ -1,6 +1,4 @@
-using Microsoft.Extensions.DependencyInjection;
+using Pf2eDataScrapper.App;
-using Pf2eDataScrapper.App;
-using Pf2eModel;
 
 namespace Pf2eDataScrapper.Processors;
 

Pf2eDataScrapper/Processors/ProcessorExecutor.cs

@@ -1,5 +1,4 @@
 using System.ComponentModel;
-using System.Diagnostics;
 using Microsoft.Extensions.DependencyInjection;
 using Newtonsoft.Json.Linq;
 using Pf2eDataScrapper.App;
@@ -7,7 +6,6 @@ using Pf2eDataScrapper.Helpers;
 using Pf2eDataScrapper.Importers;
 using Pf2eDataScrapper.Importers.Implementations.Aonprd.Compendium;
 using Pf2eDataScrapper.Importers.Implementations.FoundryEn;
-using Pf2eModel;
 
 namespace Pf2eDataScrapper.Processors;
 
@@ -15,7 +13,6 @@ internal sealed class ProcessorExecutor(
     IServiceProvider serviceProvider,
     ProcessorCollection collection,
     ProcessProgress progress,
-    Pf2eDbContext context,
     AonprdCompendium aonprdCompendium,
     FoundryEnCompendium foundryEnCompendium,
     ApplicationSettings settings
@@ -37,7 +34,7 @@ internal sealed class ProcessorExecutor(
         StartItem();
     }
 
-    private int _currentIndex = 0;
+    private int _currentIndex;
 
     private void StartItem()
     {

Pf2eModel/EfCleanHelper.cs

@@ -22,7 +22,7 @@ public static class EfCleanHelper
         object? schema = entityType.FindAnnotation("Relational:Schema")?.Value;
 
         string tableName =
-            entityType.GetAnnotation("Relational:TableName")?.Value?.ToString()
+            entityType.GetAnnotation("Relational:TableName").Value?.ToString()
             ?? throw new($"Не могу определить название таблицы для типа {entityType}");
 
         string schemaName = schema?.ToString() ?? defaultSchemaName;

Pf2eModel/Pf2eDbContextModel.cs

@@ -11,7 +11,6 @@ using Pf2eModel.Model.Base.Source;
 using Pf2eModel.Model.Base.Targets;
 using Pf2eModel.Model.Common;
 using Pf2eModel.Model.Common.I18n;
-using Pf2eModel.Model.Enum;
 using Pf2eModel.Model.Structure;
 using Pf2eModel.Model.Structure.AncestryRelation;
 using Pf2eModel.Model.Structure.ArchetypeRelation;
@@ -85,37 +84,6 @@ public partial class Pf2eDbContext
             .IsRequired(required);
     }
 
-    /// <summary>
-    /// Определяет перечисления, используемые в модели.
-    /// </summary>
-    /// <param name="modelBuilder">Построитель модели.</param>
-    private void DefineEnums(ModelBuilder modelBuilder)
-    {
-        modelBuilder
-            .HasPostgresEnum<LocaleType>()
-            .HasPostgresEnum<ActionCategory>()
-            .HasPostgresEnum<ActionEnum>()
-            .HasPostgresEnum<AttributeValues>()
-            .HasPostgresEnum<ClassProgressionType>()
-            .HasPostgresEnum<ConditionGroup>()
-            .HasPostgresEnum<DeityCategory>()
-            .HasPostgresEnum<DeityFonts>()
-            .HasPostgresEnum<DeitySanctification>()
-            .HasPostgresEnum<ElementEnum>()
-            .HasPostgresEnum<EntityRarity>()
-            .HasPostgresEnum<EntityType>()
-            .HasPostgresEnum<FeatCategory>()
-            .HasPostgresEnum<SizeEnum>()
-            .HasPostgresEnum<SourceCategory>()
-            .HasPostgresEnum<SpellAreaType>()
-            .HasPostgresEnum<SpellDamageCategory>()
-            .HasPostgresEnum<SpellDamageKinds>()
-            .HasPostgresEnum<SpellTradition>()
-            .HasPostgresEnum<TrainingRank>()
-            .HasPostgresEnum<TraitType>()
-            .HasPostgresEnum<VisionEnum>();
-    }
-
     /// <summary>
     /// Определяет базовые сущности и их связи.
     /// </summary>