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-17 17:26:27 +04:00
parent a0eb739363
commit efaa6c71d7
12 changed files with 1206 additions and 1233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/AbstractProcessor.cs
+6 -6
View File
@@ -77,13 +77,13 @@ internal abstract partial class AbstractProcessor(ProcessorInput input)
Context.EntityAliases.Add(alias);
var legacyIdArray = Input.GetOptional<JArray>("legacy_id");
JArray? legacyIdArray = Input.GetOptional<JArray>("legacy_id");
if (legacyIdArray is not null)
{
string legacyId = legacyIdArray[0].ToString();
if (LegacyAliases.TryGetValue(legacyId, out var legacyName))
if (LegacyAliases.TryGetValue(legacyId, out string? legacyName))
{
if (legacyName != Entity.Name)
{
@@ -171,14 +171,14 @@ internal abstract partial class AbstractProcessor(ProcessorInput input)
throw new Exception("'trait' is expected to be an array");
}
var names = traitsJson.ToArray().Select(jToken => jToken.ToString());
var traitEntities = Context.Traits
IEnumerable<string> names = traitsJson.ToArray().Select(jToken => jToken.ToString());
List<Entity> traitEntities = Context.Traits
.SelectMany(t => t.Entity.Aliases)
.Where(a => names.Contains(a.Alias))
.Select(a => a.Entity)
.ToList();
var traits = Context.Traits
List<Trait> traits = Context.Traits
.Where(t => traitEntities.Contains(t.Entity))
.ToList();
@@ -249,7 +249,7 @@ internal abstract partial class AbstractProcessor(ProcessorInput input)
using MD5 md5 = MD5.Create();
byte[] byteHash = md5.ComputeHash(Encoding.UTF8.GetBytes(input));
string hash = BitConverter.ToString(byteHash).Replace("-", "");
return (isLowercase) ? hash.ToLower() : hash;
return isLowercase ? hash.ToLower() : hash;
}
protected static ExternalTarget? AonprdTarget = null;
Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/AonprdDataBuilder.cs
+7 -13
View File
@@ -1,11 +1,5 @@
using Konsole;
using Newtonsoft.Json.Linq;
using Pf2eDataScrapper.Importers.Implementations.Aonprd.Compendium;
using Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.Compendium;
using Pf2eDataScrapper.Model.Base;
using System;
using System.ComponentModel;
using System.Reflection;
using static Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.AbstractProcessor;
namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder;
@@ -39,29 +33,29 @@ internal class AonprdDataBuilder(AonprdLoader loader)
{
Console.WriteLine("Building data...");
var window = new Window(0, 0, Console.WindowWidth, Console.WindowHeight).Concurrent();
ConcurrentWriter window = new Window(0, 0, Console.WindowWidth, Console.WindowHeight).Concurrent();
var bars = window.OpenBox("Progress", Console.WindowWidth, 4, new BoxStyle { Body = Colors.WhiteOnBlack });
IConsole bars = window.OpenBox("Progress", Console.WindowWidth, 4, new BoxStyle { Body = Colors.WhiteOnBlack });
var output = new Window(0, 4, Console.WindowWidth, Console.WindowHeight - 4, window);
Window output = new Window(0, 4, Console.WindowWidth, Console.WindowHeight - 4, window);
ProgressBar bar1 = new(bars, Loader.ItemCount, 15);
ProgressBar bar2 = new(bars, 1, 15);
int i = 0;
foreach (var item in Processors.Items)
foreach (AonprdProcessorCollection.ProcessorItem item in Processors.Items)
{
bar1.Refresh(i++, $"{item.Attribute.Name}");
bar2.Max = Compendium.Count([item.Attribute.Type]);
int j = 0;
foreach(var entry in Loader.Entries(item.Attribute.Type))
foreach (AonprdLoader.LoaderEntry entry in Loader.Entries(item.Attribute.Type))
{
bar2.Refresh(i++, $"{entry.Id}");
var input = new ProcessorInput(entry.Json);
var processor = (AbstractProcessor) item.Constructor.Invoke([input]);
ProcessorInput input = new ProcessorInput(entry.Json);
AbstractProcessor processor = (AbstractProcessor) item.Constructor.Invoke([input]);
try
{
Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/AonprdEnumAttribute.cs
+1 -7
View File
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder;
namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder;
[AttributeUsage(AttributeTargets.Field)]
internal class AonprdEnumAttribute(string value) : Attribute
Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/AonprdProcessorCollection.cs
+4 -4
View File
@@ -33,7 +33,7 @@ internal class AonprdProcessorCollection
ConstructorInfo constructor = type.GetConstructor([typeof(ProcessorInput)])!;
var collision = Items.FirstOrDefault(i => i.Attribute.Name == attribute.Name);
ProcessorItem? collision = Items.FirstOrDefault(i => i.Attribute.Name == attribute.Name);
if (collision is not null)
{
throw new Exception($"Multiply attributes 'AonprdProcessor' have same name '{attribute.Name}'." +
@@ -50,14 +50,14 @@ internal class AonprdProcessorCollection
while (priorities.Count < Items.Count)
{
foreach (var item in Items)
foreach (ProcessorItem item in Items)
{
if (item.Priority > 0)
{
continue;
}
var dependencyPriorities = item.Attribute.Dependencies.Select(d => priorities.TryGetValue(d, out int value) ? value : -1);
IEnumerable<int> dependencyPriorities = item.Attribute.Dependencies.Select(d => priorities.TryGetValue(d, out int value) ? value : -1);
if (dependencyPriorities.Any(p => p == -1))
{
@@ -76,7 +76,7 @@ internal class AonprdProcessorCollection
{
SortItems();
foreach (var item in Items)
foreach (ProcessorItem item in Items)
{
yield return item;
}
Pf2eDataScrapper/Importers/Implementations/Aonprd/DataBuilder/Processors/TraitTraitsProcessor.cs
+1 -6
View File
@@ -1,11 +1,6 @@
using Newtonsoft.Json.Linq;
using Pf2eDataScrapper.Model.Enum;
using Pf2eDataScrapper.Model.Structure;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder.Processors;
@@ -29,7 +24,7 @@ internal class TraitTraitsProcessor(ProcessorInput input) : AbstractProcessor(in
// base.Process();
string url = Input.GetRequired<string>("url");
var external = Context.EntityExternals.FirstOrDefault(x => x.Suffix == url) ?? throw new Exception("Entity not found?");
Model.Base.Targets.EntityExternal external = Context.EntityExternals.FirstOrDefault(x => x.Suffix == url) ?? throw new Exception("Entity not found?");
Entity = external.Entity;
AddTraits();
Pf2eDataScrapper/Importers/Implementations/Pf2eFoundry/DataBuilder/AbstractProcessor.cs
+3 -7
View File
@@ -1,17 +1,13 @@
using LinqToDB.Common;
using Newtonsoft.Json.Linq;
using NpgsqlTypes;
using Newtonsoft.Json.Linq;
using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder;
using Pf2eDataScrapper.Model;
using Pf2eDataScrapper.Model.Base;
using Pf2eDataScrapper.Model.Base.Source;
using Pf2eDataScrapper.Model.Base.Targets;
using Pf2eDataScrapper.Model.Common;
using Pf2eDataScrapper.Model.Enum;
using Pf2eDataScrapper.Model.Structure;
using System.Security.Cryptography;
using System.Text;
using static LinqToDB.Reflection.Methods.LinqToDB.Insert;
namespace Pf2eDataScrapper.Importers.Implementations.Pf2eFoundry.DataBuilder;
@@ -88,7 +84,7 @@ internal abstract class AbstractProcessor(JObject input)
throw new Exception("system.traits.value is expected to be an array");
}
foreach(Trait trait in GetTraits(traitsJson.ToArray().Select(jToken => jToken.ToString())))
foreach (Trait trait in GetTraits(traitsJson.ToArray().Select(jToken => jToken.ToString())))
{
Entity.Traits.Add(trait);
}
@@ -198,6 +194,6 @@ internal abstract class AbstractProcessor(JObject input)
using MD5 md5 = MD5.Create();
byte[] byteHash = md5.ComputeHash(Encoding.UTF8.GetBytes(input));
string hash = BitConverter.ToString(byteHash).Replace("-", "");
return (isLowercase) ? hash.ToLower() : hash;
return isLowercase ? hash.ToLower() : hash;
}
}
Pf2eDataScrapper/Migrations/20250417082248_V2.cs
+5 -7
View File
@@ -1,15 +1,14 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Pf2eDataScrapper.Model.Enum;
#nullable disable
namespace Pf2eDataScrapper.Migrations
namespace Pf2eDataScrapper.Migrations;
/// <inheritdoc />
public partial class V2 : Migration
{
/// <inheritdoc />
public partial class V2 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
@@ -1248,5 +1247,4 @@ $func$;
migrationBuilder.DropTable(
name: "entities");
}
}
}
Pf2eDataScrapper/Migrations/20250417085326_DateOnly.cs
+5 -7
View File
@@ -1,13 +1,12 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Pf2eDataScrapper.Migrations
namespace Pf2eDataScrapper.Migrations;
/// <inheritdoc />
public partial class DateOnly : Migration
{
/// <inheritdoc />
public partial class DateOnly : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
@@ -33,5 +32,4 @@ namespace Pf2eDataScrapper.Migrations
oldType: "date",
oldNullable: true);
}
}
}
Pf2eDataScrapper/Model/Base/Entity.cs
-1
View File
@@ -2,7 +2,6 @@
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 System.ComponentModel.DataAnnotations;
Pf2eDataScrapper/Model/Enum/ActionCategory.cs
-1
View File
@@ -1,5 +1,4 @@
using NpgsqlTypes;
using Pf2eDataScrapper.Importers.Implementations.Aonprd.DataBuilder;
namespace Pf2eDataScrapper.Model.Enum;