From 4a7067f0b991ed878b76170056b44ca5a8536d69 Mon Sep 17 00:00:00 2001 From: Ilya Kozhemyakin Date: Thu, 15 May 2025 02:05:18 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=B0=D0=BF=D0=B8=D1=82=D0=B0=D0=BB?= =?UTF-8?q?=D1=8C=D0=BD=D0=B0=D1=8F=20=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B0?= =?UTF-8?q?=20=D0=BA=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Pf2eDataScrapper.sln | 6 ---- .../Forms/Controls/CoreBindingNavigator.cs | 2 +- .../DatabaseViewer/DatabaseQueryPerformer.cs | 2 +- .../DatabaseViewerControl.Designer.cs | 2 +- .../DatabaseViewer/DatabaseViewerControl.cs | 5 +-- .../EntityTreeViewerControl.Designer.cs | 2 +- .../EntityTreeViewerControl.cs | 4 +-- .../EntityTreeViewerControlRow.cs | 9 +++--- .../EntityTreeViewer/StructureBuilder.cs | 4 +-- .../Controls/ProcessorCollectionControl.cs | 2 +- .../Forms/EntityViewForm.Designer.cs | 10 +++--- Pf2eDataScrapper/Forms/EntityViewForm.cs | 4 +-- Pf2eDataScrapper/Forms/ProgressForm.cs | 1 - Pf2eDataScrapper/Helpers/EntityView.cs | 2 +- Pf2eDataScrapper/Helpers/ProcessProgress.cs | 4 +-- Pf2eDataScrapper/ImportApplication.cs | 3 +- .../Importers/AbstractImporter.cs | 4 +-- .../Implementations/Aonprd/AonprdImporter.cs | 2 +- .../Aonprd/AonprdRepository.cs | 3 +- .../Aonprd/Helpers/StringHelper.cs | 2 +- .../Processors/AbstractEntityProcessor.cs | 5 ++- .../Processors/AbstractSubclassProcessor.cs | 2 +- .../Processors/Common/LegacyProcessor.cs | 4 +-- .../Subclasses/ApparitionProcessor.cs | 2 +- .../Processors/Types/ActionProcessor.cs | 3 +- .../Processors/Types/AncestryProcessor.cs | 3 +- .../Processors/Types/ArchetypeProcessor.cs | 3 +- .../Processors/Types/BackgroundProcessor.cs | 3 +- .../Aonprd/Processors/Types/ClassProcessor.cs | 2 +- .../Aonprd/Processors/Types/FeatProcessor.cs | 2 +- .../Processors/Types/LanguageProcessor.cs | 3 +- .../Processors/Types/RitualProcessor.cs | 6 ++-- .../Processors/Types/Rules/RuleProcessor.cs | 3 +- .../Aonprd/Processors/Types/SpellProcessor.cs | 7 ++-- .../Aonprd/Processors/Types/TraitProcessor.cs | 4 +-- .../Processors/FoundryEnAbstractProcessor.cs | 1 - .../Preparation/CompendiumFolderProcessor.cs | 2 +- .../AbstractImporterRepository.cs | 1 - .../Importers/Repositories/GitRepository.cs | 1 - .../Processors/AbstractProcessor.cs | 4 +-- .../Processors/ProcessorExecutor.cs | 5 +-- Pf2eModel/EfCleanHelper.cs | 2 +- Pf2eModel/Pf2eDbContextModel.cs | 32 ------------------- 43 files changed, 55 insertions(+), 118 deletions(-) diff --git a/Pf2eDataScrapper.sln b/Pf2eDataScrapper.sln index 9c6ae20..2326c11 100644 --- a/Pf2eDataScrapper.sln +++ b/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 diff --git a/Pf2eDataScrapper/Forms/Controls/CoreBindingNavigator.cs b/Pf2eDataScrapper/Forms/Controls/CoreBindingNavigator.cs index dc1f2e2..e0d4f03 100644 --- a/Pf2eDataScrapper/Forms/Controls/CoreBindingNavigator.cs +++ b/Pf2eDataScrapper/Forms/Controls/CoreBindingNavigator.cs @@ -1,4 +1,4 @@ -namespace Pf2eViewer; +namespace Pf2eDataScrapper.Forms.Controls; /// /// Элемент управления прокрутки страниц diff --git a/Pf2eDataScrapper/Forms/Controls/DatabaseViewer/DatabaseQueryPerformer.cs b/Pf2eDataScrapper/Forms/Controls/DatabaseViewer/DatabaseQueryPerformer.cs index 3623ce1..b6d8d2a 100644 --- a/Pf2eDataScrapper/Forms/Controls/DatabaseViewer/DatabaseQueryPerformer.cs +++ b/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; /// /// Класс, выполняющий страничные запросы к базе данных. diff --git a/Pf2eDataScrapper/Forms/Controls/DatabaseViewer/DatabaseViewerControl.Designer.cs b/Pf2eDataScrapper/Forms/Controls/DatabaseViewer/DatabaseViewerControl.Designer.cs index 51bca07..374dca0 100644 --- a/Pf2eDataScrapper/Forms/Controls/DatabaseViewer/DatabaseViewerControl.Designer.cs +++ b/Pf2eDataScrapper/Forms/Controls/DatabaseViewer/DatabaseViewerControl.Designer.cs @@ -1,4 +1,4 @@ -namespace Pf2eViewer.DatabaseViewer; +namespace Pf2eDataScrapper.Forms.Controls.DatabaseViewer; partial class DatabaseViewerControl { diff --git a/Pf2eDataScrapper/Forms/Controls/DatabaseViewer/DatabaseViewerControl.cs b/Pf2eDataScrapper/Forms/Controls/DatabaseViewer/DatabaseViewerControl.cs index d056a03..f0dc02a 100644 --- a/Pf2eDataScrapper/Forms/Controls/DatabaseViewer/DatabaseViewerControl.cs +++ b/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; /// /// Класс элемента управления, который отображает сущности в виде таблицы. @@ -87,7 +88,7 @@ public partial class DatabaseViewerControl : UserControl /// /// Флаг, указывающий, что элемент управления занят выполнением запроса к базе данных. /// - private bool _isBusy = true; + private bool _isBusy; /// /// Объект, который выполняет запрос к базе данных. diff --git a/Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/EntityTreeViewerControl.Designer.cs b/Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/EntityTreeViewerControl.Designer.cs index a0d535f..e6444fd 100644 --- a/Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/EntityTreeViewerControl.Designer.cs +++ b/Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/EntityTreeViewerControl.Designer.cs @@ -1,4 +1,4 @@ -namespace Pf2eViewer.EntityTreeViewer; +namespace Pf2eDataScrapper.Forms.Controls.EntityTreeViewer; sealed partial class EntityTreeViewerControl { diff --git a/Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/EntityTreeViewerControl.cs b/Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/EntityTreeViewerControl.cs index e41f95c..c286747 100644 --- a/Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/EntityTreeViewerControl.cs +++ b/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; /// /// Элемент управления для отображения структуры сущности. diff --git a/Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/EntityTreeViewerControlRow.cs b/Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/EntityTreeViewerControlRow.cs index 601ea84..672bd51 100644 --- a/Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/EntityTreeViewerControlRow.cs +++ b/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; /// /// Элемент управления для отображения строки поля сущности. @@ -86,7 +85,7 @@ internal class EntityTreeViewerControlRow } } } - private bool _hovered = false; + private bool _hovered; /// /// Индекс строки в представлении. @@ -96,7 +95,7 @@ internal class EntityTreeViewerControlRow /// /// Кнопка раскрытия/сворачивания. /// - 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++) { diff --git a/Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/StructureBuilder.cs b/Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/StructureBuilder.cs index d1681c9..731b64e 100644 --- a/Pf2eDataScrapper/Forms/Controls/EntityTreeViewer/StructureBuilder.cs +++ b/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; /// public override bool Visible diff --git a/Pf2eDataScrapper/Forms/Controls/ProcessorCollectionControl.cs b/Pf2eDataScrapper/Forms/Controls/ProcessorCollectionControl.cs index 07b2a5c..2e33460 100644 --- a/Pf2eDataScrapper/Forms/Controls/ProcessorCollectionControl.cs +++ b/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)) { diff --git a/Pf2eDataScrapper/Forms/EntityViewForm.Designer.cs b/Pf2eDataScrapper/Forms/EntityViewForm.Designer.cs index a063fba..e2982e4 100644 --- a/Pf2eDataScrapper/Forms/EntityViewForm.Designer.cs +++ b/Pf2eDataScrapper/Forms/EntityViewForm.Designer.cs @@ -1,7 +1,7 @@ -using Microsoft.EntityFrameworkCore.Scaffolding.Metadata; -using Pf2eViewer.DatabaseViewer; +using Pf2eDataScrapper.Forms.Controls.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; diff --git a/Pf2eDataScrapper/Forms/EntityViewForm.cs b/Pf2eDataScrapper/Forms/EntityViewForm.cs index 8aa18e1..bed9bc3 100644 --- a/Pf2eDataScrapper/Forms/EntityViewForm.cs +++ b/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; /// /// Основная форма приложения. diff --git a/Pf2eDataScrapper/Forms/ProgressForm.cs b/Pf2eDataScrapper/Forms/ProgressForm.cs index 18f6a89..32cdd08 100644 --- a/Pf2eDataScrapper/Forms/ProgressForm.cs +++ b/Pf2eDataScrapper/Forms/ProgressForm.cs @@ -1,5 +1,4 @@ using Pf2eDataScrapper.Helpers; -using Pf2eDataScrapper.Processors; namespace Pf2eDataScrapper.Forms; diff --git a/Pf2eDataScrapper/Helpers/EntityView.cs b/Pf2eDataScrapper/Helpers/EntityView.cs index cd440b2..dd9c5fe 100644 --- a/Pf2eDataScrapper/Helpers/EntityView.cs +++ b/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; /// /// Класс, обрабатывающий запросы к сущностям и подключающий необходимые данные. diff --git a/Pf2eDataScrapper/Helpers/ProcessProgress.cs b/Pf2eDataScrapper/Helpers/ProcessProgress.cs index bb3d6b7..d4f6d26 100644 --- a/Pf2eDataScrapper/Helpers/ProcessProgress.cs +++ b/Pf2eDataScrapper/Helpers/ProcessProgress.cs @@ -63,7 +63,7 @@ internal class ProcessProgress : AbstractLogger Update?.Invoke(); } } - private int _count = 0; + private int _count; /// /// Индекс текущего обрабатываемого процесса. @@ -77,7 +77,7 @@ internal class ProcessProgress : AbstractLogger Update?.Invoke(); } } - private int _current = 0; + private int _current; /// /// Название текущего обрабатываемого процесса. diff --git a/Pf2eDataScrapper/ImportApplication.cs b/Pf2eDataScrapper/ImportApplication.cs index 3400960..ff3510f 100644 --- a/Pf2eDataScrapper/ImportApplication.cs +++ b/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); diff --git a/Pf2eDataScrapper/Importers/AbstractImporter.cs b/Pf2eDataScrapper/Importers/AbstractImporter.cs index d8641a6..8c35683 100644 --- a/Pf2eDataScrapper/Importers/AbstractImporter.cs +++ b/Pf2eDataScrapper/Importers/AbstractImporter.cs @@ -1,6 +1,4 @@ -using Pf2eDataScrapper.Importers.Repositories; - -namespace Pf2eDataScrapper.Importers; +namespace Pf2eDataScrapper.Importers; /// /// Абстрактный класс импортёра. diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/AonprdImporter.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/AonprdImporter.cs index 2bbf2a3..21d2094 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/AonprdImporter.cs +++ b/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; diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/AonprdRepository.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/AonprdRepository.cs index 7569127..c5b523b 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/AonprdRepository.cs +++ b/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 /// /// URL для доступа к API Aonprd. /// - public readonly string SearchUrl = "https://elasticsearch.aonprd.com"; + public const string SearchUrl = "https://elasticsearch.aonprd.com"; /// /// Текущая ревизия данных. Значение обновляется при обновлении репозитория. diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Helpers/StringHelper.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Helpers/StringHelper.cs index 12e25b0..159ade1 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Helpers/StringHelper.cs +++ b/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; /// /// Класс-помощник, для обработки строкового ввода с Архивов Нефиса. diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/AbstractEntityProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/AbstractEntityProcessor.cs index 1395ede..d035a3c 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/AbstractEntityProcessor.cs +++ b/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; diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/AbstractSubclassProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/AbstractSubclassProcessor.cs index 5d3eb47..f0b9ba1 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/AbstractSubclassProcessor.cs +++ b/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; diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Common/LegacyProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Common/LegacyProcessor.cs index 692f8ae..e376d9b 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Common/LegacyProcessor.cs +++ b/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(); } diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Subclasses/ApparitionProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Subclasses/ApparitionProcessor.cs index a8632e7..ec100ae 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Subclasses/ApparitionProcessor.cs +++ b/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; diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/ActionProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/ActionProcessor.cs index 88204dd..50f0559 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/ActionProcessor.cs +++ b/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; diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/AncestryProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/AncestryProcessor.cs index 9891f4b..b6b9d2d 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/AncestryProcessor.cs +++ b/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; diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/ArchetypeProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/ArchetypeProcessor.cs index afa6f1b..dfbfa11 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/ArchetypeProcessor.cs +++ b/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; diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/BackgroundProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/BackgroundProcessor.cs index d8313e8..7408247 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/BackgroundProcessor.cs +++ b/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; diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/ClassProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/ClassProcessor.cs index a6c50bf..19c407d 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/ClassProcessor.cs +++ b/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; diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/FeatProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/FeatProcessor.cs index 146883f..636ddc4 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/FeatProcessor.cs +++ b/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; diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/LanguageProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/LanguageProcessor.cs index eccfc72..9cfc4ef 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/LanguageProcessor.cs +++ b/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; diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/RitualProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/RitualProcessor.cs index 617e8d2..407af42 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/RitualProcessor.cs +++ b/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("level"); - Object.Duration = Input.GetOptional("duration", -1); + Object.Duration = Input.GetOptional("duration", -1); - Object.Range = Input.GetOptional("range", -1); + Object.Range = Input.GetOptional("range", -1); Object.RangeString = Input.GetOptionalLocale("range_raw", LocaleType.English); Object.CastTime = CalculateCastTime(Input.GetRequired("actions")); diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/Rules/RuleProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/Rules/RuleProcessor.cs index f62bf09..d60aa25 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/Rules/RuleProcessor.cs +++ b/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; diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/SpellProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/SpellProcessor.cs index dcfa38b..631ff74 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/SpellProcessor.cs +++ b/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("level"); Object.Actions = Input.EnumOptional("actions", ActionEnum.Unknown); Object.IsFocus = Input.GetRequired("spell_type") == "Focus"; - Object.Duration = Input.GetOptional("duration", -1); - Object.Range = Input.GetOptional("range", -1); + Object.Duration = Input.GetOptional("duration", -1); + Object.Range = Input.GetOptional("range", -1); Object.Cost = Input.GetOptionalLocale("cost_markdown", LocaleType.English); Object.Trigger = Input.GetOptionalLocale("trigger_markdown", LocaleType.English); diff --git a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/TraitProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/TraitProcessor.cs index 7e4d907..fb5cd39 100644 --- a/Pf2eDataScrapper/Importers/Implementations/Aonprd/Processors/Types/TraitProcessor.cs +++ b/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 diff --git a/Pf2eDataScrapper/Importers/Implementations/FoundryEn/Processors/FoundryEnAbstractProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/FoundryEn/Processors/FoundryEnAbstractProcessor.cs index 5874ed4..829fc9d 100644 --- a/Pf2eDataScrapper/Importers/Implementations/FoundryEn/Processors/FoundryEnAbstractProcessor.cs +++ b/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; diff --git a/Pf2eDataScrapper/Importers/Implementations/FoundryEn/Processors/Preparation/CompendiumFolderProcessor.cs b/Pf2eDataScrapper/Importers/Implementations/FoundryEn/Processors/Preparation/CompendiumFolderProcessor.cs index da6b757..c073400 100644 --- a/Pf2eDataScrapper/Importers/Implementations/FoundryEn/Processors/Preparation/CompendiumFolderProcessor.cs +++ b/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() { diff --git a/Pf2eDataScrapper/Importers/Repositories/AbstractImporterRepository.cs b/Pf2eDataScrapper/Importers/Repositories/AbstractImporterRepository.cs index 9d09d4a..ce3682f 100644 --- a/Pf2eDataScrapper/Importers/Repositories/AbstractImporterRepository.cs +++ b/Pf2eDataScrapper/Importers/Repositories/AbstractImporterRepository.cs @@ -1,5 +1,4 @@ using Pf2eDataScrapper.Helpers; -using Pf2eDataScrapper.Processors; namespace Pf2eDataScrapper.Importers.Repositories; diff --git a/Pf2eDataScrapper/Importers/Repositories/GitRepository.cs b/Pf2eDataScrapper/Importers/Repositories/GitRepository.cs index db78e45..a63b640 100644 --- a/Pf2eDataScrapper/Importers/Repositories/GitRepository.cs +++ b/Pf2eDataScrapper/Importers/Repositories/GitRepository.cs @@ -1,6 +1,5 @@ using System.Diagnostics; using Pf2eDataScrapper.Helpers; -using Pf2eDataScrapper.Processors; namespace Pf2eDataScrapper.Importers.Repositories; diff --git a/Pf2eDataScrapper/Processors/AbstractProcessor.cs b/Pf2eDataScrapper/Processors/AbstractProcessor.cs index 0731b1c..216dfc9 100644 --- a/Pf2eDataScrapper/Processors/AbstractProcessor.cs +++ b/Pf2eDataScrapper/Processors/AbstractProcessor.cs @@ -1,6 +1,4 @@ -using Microsoft.Extensions.DependencyInjection; -using Pf2eDataScrapper.App; -using Pf2eModel; +using Pf2eDataScrapper.App; namespace Pf2eDataScrapper.Processors; diff --git a/Pf2eDataScrapper/Processors/ProcessorExecutor.cs b/Pf2eDataScrapper/Processors/ProcessorExecutor.cs index 78e431a..8ea6ec1 100644 --- a/Pf2eDataScrapper/Processors/ProcessorExecutor.cs +++ b/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() { diff --git a/Pf2eModel/EfCleanHelper.cs b/Pf2eModel/EfCleanHelper.cs index f26bc7e..524e14f 100644 --- a/Pf2eModel/EfCleanHelper.cs +++ b/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; diff --git a/Pf2eModel/Pf2eDbContextModel.cs b/Pf2eModel/Pf2eDbContextModel.cs index 94afdf3..0d53019 100644 --- a/Pf2eModel/Pf2eDbContextModel.cs +++ b/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); } - /// - /// Определяет перечисления, используемые в модели. - /// - /// Построитель модели. - private void DefineEnums(ModelBuilder modelBuilder) - { - modelBuilder - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum() - .HasPostgresEnum(); - } - /// /// Определяет базовые сущности и их связи. ///