From 0c95c6d68b2d6f47ffb8eb536620f92649c429a3 Mon Sep 17 00:00:00 2001 From: kozhilya Date: Wed, 16 Apr 2025 13:07:57 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D1=87=D0=B8=D1=81=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BA=D0=BE=D0=B4=D0=B0=20=D0=BF=D0=BE=D1=81=D0=BB?= =?UTF-8?q?=D0=B5=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8?= =?UTF-8?q?=D0=BD=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Model/Base/Keywords/KeywordAlias.cs | 2 +- Pf2eDataScrapper/Model/Pf2eDbContextModel.cs | 13 ++++++------- Pf2eDataScrapper/Model/Structure/Action.cs | 1 - .../Structure/AncestryRelation/AncestryItem.cs | 4 +--- .../Structure/AncestryRelation/AncestryLanguage.cs | 1 - Pf2eDataScrapper/Model/Structure/Background.cs | 6 +++--- .../Structure/BackgroundRelation/BackgroundBoost.cs | 4 ++-- .../Structure/BackgroundRelation/BackgroundItem.cs | 4 +--- .../BackgroundRelation/BackgroundTraining.cs | 6 +++--- Pf2eDataScrapper/Model/Structure/Class.cs | 6 +++--- .../Structure/ClassRelation/ClassProgression.cs | 4 ++-- .../Model/Structure/ClassRelation/ClassTraining.cs | 2 +- Pf2eDataScrapper/Model/Structure/Condition.cs | 4 ++-- Pf2eDataScrapper/Model/Structure/Deity.cs | 10 +++++----- .../Model/Structure/DeityRelation/DeityDomain.cs | 4 ++-- .../Model/Structure/DeityRelation/DeitySpell.cs | 6 +++--- .../Model/Structure/DeityRelation/DeityWeapon.cs | 4 ++-- Pf2eDataScrapper/Model/Structure/Feat.cs | 8 ++++---- .../Structure/FeatRelation/FeatPrerequisite.cs | 3 +-- Pf2eDataScrapper/Model/Structure/Heritage.cs | 4 ++-- Pf2eDataScrapper/Model/Structure/Spell.cs | 7 +++---- .../Model/Structure/SpellRelation/SpellArea.cs | 5 ++--- .../Model/Structure/SpellRelation/SpellDamage.cs | 5 ++--- .../Model/Structure/SpellRelation/SpellDefense.cs | 3 +-- .../Model/Structure/SpellRelation/SpellRitual.cs | 3 +-- Pf2eDataScrapper/Program.cs | 1 - 26 files changed, 53 insertions(+), 67 deletions(-) diff --git a/Pf2eDataScrapper/Model/Base/Keywords/KeywordAlias.cs b/Pf2eDataScrapper/Model/Base/Keywords/KeywordAlias.cs index 569a5fd..1f93afd 100644 --- a/Pf2eDataScrapper/Model/Base/Keywords/KeywordAlias.cs +++ b/Pf2eDataScrapper/Model/Base/Keywords/KeywordAlias.cs @@ -8,7 +8,7 @@ public partial class KeywordAlias [Key] [DatabaseGenerated(DatabaseGeneratedOption.Identity)] [Column(Order = 1)] - public int Id { get; set; } + public int Id { get; set; } [Column(Order = 2)] public int KeywordId { get; set; } diff --git a/Pf2eDataScrapper/Model/Pf2eDbContextModel.cs b/Pf2eDataScrapper/Model/Pf2eDbContextModel.cs index 74fa9c4..11f1299 100644 --- a/Pf2eDataScrapper/Model/Pf2eDbContextModel.cs +++ b/Pf2eDataScrapper/Model/Pf2eDbContextModel.cs @@ -1,19 +1,18 @@ using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Metadata.Builders; +using Pf2eDataScrapper.Model.Base; +using Pf2eDataScrapper.Model.Base.Keywords; +using Pf2eDataScrapper.Model.Base.Source; +using Pf2eDataScrapper.Model.Base.Targets; using Pf2eDataScrapper.Model.Common; using Pf2eDataScrapper.Model.Enum; +using Pf2eDataScrapper.Model.Structure; using Pf2eDataScrapper.Model.Structure.AncestryRelation; using Pf2eDataScrapper.Model.Structure.BackgroundRelation; using Pf2eDataScrapper.Model.Structure.ClassRelation; using Pf2eDataScrapper.Model.Structure.DeityRelation; using Pf2eDataScrapper.Model.Structure.FeatRelation; using Pf2eDataScrapper.Model.Structure.SpellRelation; -using Pf2eDataScrapper.Model.Structure; -using Pf2eDataScrapper.Model.Base.Source; -using Pf2eDataScrapper.Model.Base.Targets; -using Pf2eDataScrapper.Model.Base; -using Pf2eDataScrapper.Model.Base.Keywords; -using Microsoft.EntityFrameworkCore.Metadata.Builders; -using System.Reflection.Metadata; namespace Pf2eDataScrapper.Model; diff --git a/Pf2eDataScrapper/Model/Structure/Action.cs b/Pf2eDataScrapper/Model/Structure/Action.cs index 6165cc4..1f45451 100644 --- a/Pf2eDataScrapper/Model/Structure/Action.cs +++ b/Pf2eDataScrapper/Model/Structure/Action.cs @@ -1,6 +1,5 @@ using Pf2eDataScrapper.Model.Base; using Pf2eDataScrapper.Model.Enum; -using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure; diff --git a/Pf2eDataScrapper/Model/Structure/AncestryRelation/AncestryItem.cs b/Pf2eDataScrapper/Model/Structure/AncestryRelation/AncestryItem.cs index 6e2aea3..2fb4616 100644 --- a/Pf2eDataScrapper/Model/Structure/AncestryRelation/AncestryItem.cs +++ b/Pf2eDataScrapper/Model/Structure/AncestryRelation/AncestryItem.cs @@ -1,7 +1,5 @@ -using Pf2eDataScrapper.Model.Structure; +using Microsoft.EntityFrameworkCore; using Pf2eDataScrapper.Model.Base; -using System.ComponentModel.DataAnnotations; -using Microsoft.EntityFrameworkCore; using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure.AncestryRelation; diff --git a/Pf2eDataScrapper/Model/Structure/AncestryRelation/AncestryLanguage.cs b/Pf2eDataScrapper/Model/Structure/AncestryRelation/AncestryLanguage.cs index cf7988d..fbfbd00 100644 --- a/Pf2eDataScrapper/Model/Structure/AncestryRelation/AncestryLanguage.cs +++ b/Pf2eDataScrapper/Model/Structure/AncestryRelation/AncestryLanguage.cs @@ -1,6 +1,5 @@ using Microsoft.EntityFrameworkCore; using Pf2eDataScrapper.Model.Common; -using Pf2eDataScrapper.Model.Structure; using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure.AncestryRelation; diff --git a/Pf2eDataScrapper/Model/Structure/Background.cs b/Pf2eDataScrapper/Model/Structure/Background.cs index 12e6a39..85db81c 100644 --- a/Pf2eDataScrapper/Model/Structure/Background.cs +++ b/Pf2eDataScrapper/Model/Structure/Background.cs @@ -1,7 +1,7 @@ -using Pf2eDataScrapper.Model.Structure.BackgroundRelation; -using System.ComponentModel.DataAnnotations.Schema; +using Pf2eDataScrapper.Model.Base; +using Pf2eDataScrapper.Model.Structure.BackgroundRelation; using System.ComponentModel.DataAnnotations; -using Pf2eDataScrapper.Model.Base; +using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure; diff --git a/Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundBoost.cs b/Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundBoost.cs index d7cfd37..0bfce65 100644 --- a/Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundBoost.cs +++ b/Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundBoost.cs @@ -1,6 +1,6 @@ -using System.ComponentModel.DataAnnotations.Schema; +using Pf2eDataScrapper.Model.Enum; using System.ComponentModel.DataAnnotations; -using Pf2eDataScrapper.Model.Enum; +using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure.BackgroundRelation; diff --git a/Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundItem.cs b/Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundItem.cs index ddd22d3..5002f3f 100644 --- a/Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundItem.cs +++ b/Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundItem.cs @@ -1,8 +1,6 @@ -using Pf2eDataScrapper.Model.Structure; +using Microsoft.EntityFrameworkCore; using Pf2eDataScrapper.Model.Base; -using Microsoft.EntityFrameworkCore; using System.ComponentModel.DataAnnotations.Schema; -using System.ComponentModel.DataAnnotations; namespace Pf2eDataScrapper.Model.Structure.BackgroundRelation; diff --git a/Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundTraining.cs b/Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundTraining.cs index aa282a3..e12f0cd 100644 --- a/Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundTraining.cs +++ b/Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundTraining.cs @@ -1,7 +1,7 @@ -using System.ComponentModel.DataAnnotations.Schema; -using System.ComponentModel.DataAnnotations; -using Pf2eDataScrapper.Model.Common; +using Pf2eDataScrapper.Model.Common; using Pf2eDataScrapper.Model.Enum; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure.BackgroundRelation; diff --git a/Pf2eDataScrapper/Model/Structure/Class.cs b/Pf2eDataScrapper/Model/Structure/Class.cs index d34389c..5035834 100644 --- a/Pf2eDataScrapper/Model/Structure/Class.cs +++ b/Pf2eDataScrapper/Model/Structure/Class.cs @@ -1,7 +1,7 @@ -using Pf2eDataScrapper.Model.Structure.ClassRelation; -using System.ComponentModel.DataAnnotations.Schema; +using Pf2eDataScrapper.Model.Base; +using Pf2eDataScrapper.Model.Structure.ClassRelation; using System.ComponentModel.DataAnnotations; -using Pf2eDataScrapper.Model.Base; +using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure; diff --git a/Pf2eDataScrapper/Model/Structure/ClassRelation/ClassProgression.cs b/Pf2eDataScrapper/Model/Structure/ClassRelation/ClassProgression.cs index 6562640..5db01d2 100644 --- a/Pf2eDataScrapper/Model/Structure/ClassRelation/ClassProgression.cs +++ b/Pf2eDataScrapper/Model/Structure/ClassRelation/ClassProgression.cs @@ -1,9 +1,9 @@ -namespace Pf2eDataScrapper.Model.Structure.ClassRelation; -using Pf2eDataScrapper.Model.Base; +using Pf2eDataScrapper.Model.Base; using Pf2eDataScrapper.Model.Enum; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +namespace Pf2eDataScrapper.Model.Structure.ClassRelation; public partial class ClassProgression { [Key] diff --git a/Pf2eDataScrapper/Model/Structure/ClassRelation/ClassTraining.cs b/Pf2eDataScrapper/Model/Structure/ClassRelation/ClassTraining.cs index 69eb832..b659089 100644 --- a/Pf2eDataScrapper/Model/Structure/ClassRelation/ClassTraining.cs +++ b/Pf2eDataScrapper/Model/Structure/ClassRelation/ClassTraining.cs @@ -1,6 +1,6 @@ using Pf2eDataScrapper.Model.Common; -using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure.ClassRelation; diff --git a/Pf2eDataScrapper/Model/Structure/Condition.cs b/Pf2eDataScrapper/Model/Structure/Condition.cs index 9208d9e..51ee3e9 100644 --- a/Pf2eDataScrapper/Model/Structure/Condition.cs +++ b/Pf2eDataScrapper/Model/Structure/Condition.cs @@ -1,5 +1,5 @@ -using Pf2eDataScrapper.Model.Enum; -using Pf2eDataScrapper.Model.Base; +using Pf2eDataScrapper.Model.Base; +using Pf2eDataScrapper.Model.Enum; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; diff --git a/Pf2eDataScrapper/Model/Structure/Deity.cs b/Pf2eDataScrapper/Model/Structure/Deity.cs index 667188d..825cc1f 100644 --- a/Pf2eDataScrapper/Model/Structure/Deity.cs +++ b/Pf2eDataScrapper/Model/Structure/Deity.cs @@ -1,9 +1,9 @@ -using Pf2eDataScrapper.Model.Common; -using Pf2eDataScrapper.Model.Base; -using System.ComponentModel.DataAnnotations.Schema; -using System.ComponentModel.DataAnnotations; -using Pf2eDataScrapper.Model.Structure.DeityRelation; +using Pf2eDataScrapper.Model.Base; +using Pf2eDataScrapper.Model.Common; using Pf2eDataScrapper.Model.Enum; +using Pf2eDataScrapper.Model.Structure.DeityRelation; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure; diff --git a/Pf2eDataScrapper/Model/Structure/DeityRelation/DeityDomain.cs b/Pf2eDataScrapper/Model/Structure/DeityRelation/DeityDomain.cs index a44e33a..8223e96 100644 --- a/Pf2eDataScrapper/Model/Structure/DeityRelation/DeityDomain.cs +++ b/Pf2eDataScrapper/Model/Structure/DeityRelation/DeityDomain.cs @@ -1,5 +1,5 @@ -using System.ComponentModel.DataAnnotations.Schema; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure.DeityRelation; diff --git a/Pf2eDataScrapper/Model/Structure/DeityRelation/DeitySpell.cs b/Pf2eDataScrapper/Model/Structure/DeityRelation/DeitySpell.cs index 3a12b8a..ae36447 100644 --- a/Pf2eDataScrapper/Model/Structure/DeityRelation/DeitySpell.cs +++ b/Pf2eDataScrapper/Model/Structure/DeityRelation/DeitySpell.cs @@ -1,5 +1,5 @@ -using System.ComponentModel.DataAnnotations.Schema; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure.DeityRelation; @@ -9,7 +9,7 @@ public partial class DeitySpell [DatabaseGenerated(DatabaseGeneratedOption.Identity)] [Column(Order = 1)] public int Id { get; set; } - + [Column(Order = 2)] public int DeityId { get; set; } diff --git a/Pf2eDataScrapper/Model/Structure/DeityRelation/DeityWeapon.cs b/Pf2eDataScrapper/Model/Structure/DeityRelation/DeityWeapon.cs index 28f8aec..b1b5a7e 100644 --- a/Pf2eDataScrapper/Model/Structure/DeityRelation/DeityWeapon.cs +++ b/Pf2eDataScrapper/Model/Structure/DeityRelation/DeityWeapon.cs @@ -1,5 +1,5 @@ -using System.ComponentModel.DataAnnotations.Schema; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure.DeityRelation; diff --git a/Pf2eDataScrapper/Model/Structure/Feat.cs b/Pf2eDataScrapper/Model/Structure/Feat.cs index 4ad9bc4..4e65378 100644 --- a/Pf2eDataScrapper/Model/Structure/Feat.cs +++ b/Pf2eDataScrapper/Model/Structure/Feat.cs @@ -1,8 +1,8 @@ -using Pf2eDataScrapper.Model.Structure.FeatRelation; -using Pf2eDataScrapper.Model.Base; -using System.ComponentModel.DataAnnotations.Schema; -using System.ComponentModel.DataAnnotations; +using Pf2eDataScrapper.Model.Base; using Pf2eDataScrapper.Model.Enum; +using Pf2eDataScrapper.Model.Structure.FeatRelation; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure; diff --git a/Pf2eDataScrapper/Model/Structure/FeatRelation/FeatPrerequisite.cs b/Pf2eDataScrapper/Model/Structure/FeatRelation/FeatPrerequisite.cs index 4ee96c3..3125871 100644 --- a/Pf2eDataScrapper/Model/Structure/FeatRelation/FeatPrerequisite.cs +++ b/Pf2eDataScrapper/Model/Structure/FeatRelation/FeatPrerequisite.cs @@ -1,5 +1,4 @@ -using Pf2eDataScrapper.Model.Structure; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure.FeatRelation; diff --git a/Pf2eDataScrapper/Model/Structure/Heritage.cs b/Pf2eDataScrapper/Model/Structure/Heritage.cs index 5b2bc2b..0d44d8c 100644 --- a/Pf2eDataScrapper/Model/Structure/Heritage.cs +++ b/Pf2eDataScrapper/Model/Structure/Heritage.cs @@ -1,6 +1,6 @@ -using System.ComponentModel.DataAnnotations.Schema; +using Pf2eDataScrapper.Model.Base; using System.ComponentModel.DataAnnotations; -using Pf2eDataScrapper.Model.Base; +using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure; diff --git a/Pf2eDataScrapper/Model/Structure/Spell.cs b/Pf2eDataScrapper/Model/Structure/Spell.cs index 09a3e13..63d0347 100644 --- a/Pf2eDataScrapper/Model/Structure/Spell.cs +++ b/Pf2eDataScrapper/Model/Structure/Spell.cs @@ -1,8 +1,7 @@ -using Pf2eDataScrapper.Model.Structure.DeityRelation; +using Pf2eDataScrapper.Model.Base; using Pf2eDataScrapper.Model.Structure.SpellRelation; -using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; -using Pf2eDataScrapper.Model.Base; +using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure; @@ -49,7 +48,7 @@ public partial class Spell : IEntity [Column(Order = 11)] public bool CanHeightening { get; set; } - + public virtual SpellArea? SpellArea { get; set; } public virtual SpellRitual? SpellRitual { get; set; } diff --git a/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellArea.cs b/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellArea.cs index 20d2252..87f1163 100644 --- a/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellArea.cs +++ b/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellArea.cs @@ -1,7 +1,6 @@ -using Pf2eDataScrapper.Model.Structure; -using System.ComponentModel.DataAnnotations.Schema; +using Pf2eDataScrapper.Model.Enum; using System.ComponentModel.DataAnnotations; -using Pf2eDataScrapper.Model.Enum; +using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure.SpellRelation; diff --git a/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellDamage.cs b/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellDamage.cs index b9f0bc1..a05791e 100644 --- a/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellDamage.cs +++ b/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellDamage.cs @@ -1,7 +1,6 @@ -using Pf2eDataScrapper.Model.Structure; -using System.ComponentModel.DataAnnotations.Schema; +using Pf2eDataScrapper.Model.Enum; using System.ComponentModel.DataAnnotations; -using Pf2eDataScrapper.Model.Enum; +using System.ComponentModel.DataAnnotations.Schema; namespace Pf2eDataScrapper.Model.Structure.SpellRelation; diff --git a/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellDefense.cs b/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellDefense.cs index a062cbc..79c8322 100644 --- a/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellDefense.cs +++ b/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellDefense.cs @@ -1,6 +1,5 @@ -using Pf2eDataScrapper.Model.Structure; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.ComponentModel.DataAnnotations; namespace Pf2eDataScrapper.Model.Structure.SpellRelation; diff --git a/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellRitual.cs b/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellRitual.cs index e1b9b53..4956d7a 100644 --- a/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellRitual.cs +++ b/Pf2eDataScrapper/Model/Structure/SpellRelation/SpellRitual.cs @@ -1,6 +1,5 @@ -using Pf2eDataScrapper.Model.Structure; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; -using System.ComponentModel.DataAnnotations; namespace Pf2eDataScrapper.Model.Structure.SpellRelation; diff --git a/Pf2eDataScrapper/Program.cs b/Pf2eDataScrapper/Program.cs index 8fdeff4..b3bf3f2 100644 --- a/Pf2eDataScrapper/Program.cs +++ b/Pf2eDataScrapper/Program.cs @@ -1,5 +1,4 @@ using Pf2eDataScrapper; -using Pf2eDataScrapper.Importers.Implementations.Aonprd; using Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry; EnvSettings.Load();