kozhilya/Pf2eDataScrapper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Отчистка кода после рефакторинга

Browse Source
This commit is contained in:
kozhilya
2025-04-16 13:07:57 +04:00
parent d095001caf
commit 0c95c6d68b
26 changed files with 53 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pf2eDataScrapper/Model/Base/Keywords/KeywordAlias.cs
+1 -1
View File
@@ -8,7 +8,7 @@ public partial class KeywordAlias
[Key] [Key]
[DatabaseGenerated(DatabaseGeneratedOption.Identity)] [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[Column(Order = 1)] [Column(Order = 1)]
public int Id { get; set; } public int Id { get; set; }
[Column(Order = 2)] [Column(Order = 2)]
public int KeywordId { get; set; } public int KeywordId { get; set; }
Pf2eDataScrapper/Model/Pf2eDbContextModel.cs
+6 -7
View File
@@ -1,19 +1,18 @@
using Microsoft.EntityFrameworkCore; 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.Common;
using Pf2eDataScrapper.Model.Enum; using Pf2eDataScrapper.Model.Enum;
using Pf2eDataScrapper.Model.Structure;
using Pf2eDataScrapper.Model.Structure.AncestryRelation; using Pf2eDataScrapper.Model.Structure.AncestryRelation;
using Pf2eDataScrapper.Model.Structure.BackgroundRelation; using Pf2eDataScrapper.Model.Structure.BackgroundRelation;
using Pf2eDataScrapper.Model.Structure.ClassRelation; using Pf2eDataScrapper.Model.Structure.ClassRelation;
using Pf2eDataScrapper.Model.Structure.DeityRelation; using Pf2eDataScrapper.Model.Structure.DeityRelation;
using Pf2eDataScrapper.Model.Structure.FeatRelation; using Pf2eDataScrapper.Model.Structure.FeatRelation;
using Pf2eDataScrapper.Model.Structure.SpellRelation; 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; namespace Pf2eDataScrapper.Model;
Pf2eDataScrapper/Model/Structure/Action.cs
-1
View File
@@ -1,6 +1,5 @@
using Pf2eDataScrapper.Model.Base; using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Enum; using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure; namespace Pf2eDataScrapper.Model.Structure;
Pf2eDataScrapper/Model/Structure/AncestryRelation/AncestryItem.cs
+1 -3
View File
@@ -1,7 +1,5 @@
using Pf2eDataScrapper.Model.Structure; using Microsoft.EntityFrameworkCore;
using Pf2eDataScrapper.Model.Base; using Pf2eDataScrapper.Model.Base;
using System.ComponentModel.DataAnnotations;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.AncestryRelation; namespace Pf2eDataScrapper.Model.Structure.AncestryRelation;
Pf2eDataScrapper/Model/Structure/AncestryRelation/AncestryLanguage.cs
-1
View File
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Pf2eDataScrapper.Model.Common; using Pf2eDataScrapper.Model.Common;
using Pf2eDataScrapper.Model.Structure;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.AncestryRelation; namespace Pf2eDataScrapper.Model.Structure.AncestryRelation;
Pf2eDataScrapper/Model/Structure/Background.cs
+3 -3
View File
@@ -1,7 +1,7 @@
using Pf2eDataScrapper.Model.Structure.BackgroundRelation; using Pf2eDataScrapper.Model.Base;
using System.ComponentModel.DataAnnotations.Schema; using Pf2eDataScrapper.Model.Structure.BackgroundRelation;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Base; using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure; namespace Pf2eDataScrapper.Model.Structure;
Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundBoost.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations.Schema; using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Enum; using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.BackgroundRelation; namespace Pf2eDataScrapper.Model.Structure.BackgroundRelation;
Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundItem.cs
+1 -3
View File
@@ -1,8 +1,6 @@
using Pf2eDataScrapper.Model.Structure; using Microsoft.EntityFrameworkCore;
using Pf2eDataScrapper.Model.Base; using Pf2eDataScrapper.Model.Base;
using Microsoft.EntityFrameworkCore;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
namespace Pf2eDataScrapper.Model.Structure.BackgroundRelation; namespace Pf2eDataScrapper.Model.Structure.BackgroundRelation;
Pf2eDataScrapper/Model/Structure/BackgroundRelation/BackgroundTraining.cs
+3 -3
View File
@@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations.Schema; using Pf2eDataScrapper.Model.Common;
using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Common;
using Pf2eDataScrapper.Model.Enum; using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.BackgroundRelation; namespace Pf2eDataScrapper.Model.Structure.BackgroundRelation;
Pf2eDataScrapper/Model/Structure/Class.cs
+3 -3
View File
@@ -1,7 +1,7 @@
using Pf2eDataScrapper.Model.Structure.ClassRelation; using Pf2eDataScrapper.Model.Base;
using System.ComponentModel.DataAnnotations.Schema; using Pf2eDataScrapper.Model.Structure.ClassRelation;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Base; using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure; namespace Pf2eDataScrapper.Model.Structure;
Pf2eDataScrapper/Model/Structure/ClassRelation/ClassProgression.cs
+2 -2
View File
@@ -1,9 +1,9 @@
namespace Pf2eDataScrapper.Model.Structure.ClassRelation; using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Enum; using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.ClassRelation;
public partial class ClassProgression public partial class ClassProgression
{ {
[Key] [Key]
Pf2eDataScrapper/Model/Structure/ClassRelation/ClassTraining.cs
+1 -1
View File
@@ -1,6 +1,6 @@
using Pf2eDataScrapper.Model.Common; using Pf2eDataScrapper.Model.Common;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.ClassRelation; namespace Pf2eDataScrapper.Model.Structure.ClassRelation;
Pf2eDataScrapper/Model/Structure/Condition.cs
+2 -2
View File
@@ -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;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
Pf2eDataScrapper/Model/Structure/Deity.cs
+5 -5
View File
@@ -1,9 +1,9 @@
using Pf2eDataScrapper.Model.Common; using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Base; using Pf2eDataScrapper.Model.Common;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Structure.DeityRelation;
using Pf2eDataScrapper.Model.Enum; using Pf2eDataScrapper.Model.Enum;
using Pf2eDataScrapper.Model.Structure.DeityRelation;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure; namespace Pf2eDataScrapper.Model.Structure;
Pf2eDataScrapper/Model/Structure/DeityRelation/DeityDomain.cs
+2 -2
View File
@@ -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; namespace Pf2eDataScrapper.Model.Structure.DeityRelation;
Pf2eDataScrapper/Model/Structure/DeityRelation/DeitySpell.cs
+3 -3
View File
@@ -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; namespace Pf2eDataScrapper.Model.Structure.DeityRelation;
@@ -9,7 +9,7 @@ public partial class DeitySpell
[DatabaseGenerated(DatabaseGeneratedOption.Identity)] [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
[Column(Order = 1)] [Column(Order = 1)]
public int Id { get; set; } public int Id { get; set; }
[Column(Order = 2)] [Column(Order = 2)]
public int DeityId { get; set; } public int DeityId { get; set; }
Pf2eDataScrapper/Model/Structure/DeityRelation/DeityWeapon.cs
+2 -2
View File
@@ -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; namespace Pf2eDataScrapper.Model.Structure.DeityRelation;
Pf2eDataScrapper/Model/Structure/Feat.cs
+4 -4
View File
@@ -1,8 +1,8 @@
using Pf2eDataScrapper.Model.Structure.FeatRelation; using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Base;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Enum; using Pf2eDataScrapper.Model.Enum;
using Pf2eDataScrapper.Model.Structure.FeatRelation;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure; namespace Pf2eDataScrapper.Model.Structure;
Pf2eDataScrapper/Model/Structure/FeatRelation/FeatPrerequisite.cs
+1 -2
View File
@@ -1,5 +1,4 @@
using Pf2eDataScrapper.Model.Structure; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.FeatRelation; namespace Pf2eDataScrapper.Model.Structure.FeatRelation;
Pf2eDataScrapper/Model/Structure/Heritage.cs
+2 -2
View File
@@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations.Schema; using Pf2eDataScrapper.Model.Base;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Base; using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure; namespace Pf2eDataScrapper.Model.Structure;
Pf2eDataScrapper/Model/Structure/Spell.cs
+3 -4
View File
@@ -1,8 +1,7 @@
using Pf2eDataScrapper.Model.Structure.DeityRelation; using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Structure.SpellRelation; using Pf2eDataScrapper.Model.Structure.SpellRelation;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Base; using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure; namespace Pf2eDataScrapper.Model.Structure;
@@ -49,7 +48,7 @@ public partial class Spell : IEntity
[Column(Order = 11)] [Column(Order = 11)]
public bool CanHeightening { get; set; } public bool CanHeightening { get; set; }
public virtual SpellArea? SpellArea { get; set; } public virtual SpellArea? SpellArea { get; set; }
public virtual SpellRitual? SpellRitual { get; set; } public virtual SpellRitual? SpellRitual { get; set; }
Pf2eDataScrapper/Model/Structure/SpellRelation/SpellArea.cs
+2 -3
View File
@@ -1,7 +1,6 @@
using Pf2eDataScrapper.Model.Structure; using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Enum; using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.SpellRelation; namespace Pf2eDataScrapper.Model.Structure.SpellRelation;
Pf2eDataScrapper/Model/Structure/SpellRelation/SpellDamage.cs
+2 -3
View File
@@ -1,7 +1,6 @@
using Pf2eDataScrapper.Model.Structure; using Pf2eDataScrapper.Model.Enum;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
using Pf2eDataScrapper.Model.Enum; using System.ComponentModel.DataAnnotations.Schema;
namespace Pf2eDataScrapper.Model.Structure.SpellRelation; namespace Pf2eDataScrapper.Model.Structure.SpellRelation;
Pf2eDataScrapper/Model/Structure/SpellRelation/SpellDefense.cs
+1 -2
View File
@@ -1,6 +1,5 @@
using Pf2eDataScrapper.Model.Structure; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
namespace Pf2eDataScrapper.Model.Structure.SpellRelation; namespace Pf2eDataScrapper.Model.Structure.SpellRelation;
Pf2eDataScrapper/Model/Structure/SpellRelation/SpellRitual.cs
+1 -2
View File
@@ -1,6 +1,5 @@
using Pf2eDataScrapper.Model.Structure; using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
namespace Pf2eDataScrapper.Model.Structure.SpellRelation; namespace Pf2eDataScrapper.Model.Structure.SpellRelation;
Pf2eDataScrapper/Program.cs
-1
View File
@@ -1,5 +1,4 @@
using Pf2eDataScrapper; using Pf2eDataScrapper;
using Pf2eDataScrapper.Importers.Implementations.Aonprd;
using Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry; using Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry;
EnvSettings.Load(); EnvSettings.Load();