some refactorings

src/ModVerify.CliApp/Program.cs

@@ -5,6 +5,7 @@
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using AET.ModVerify;
+using AET.ModVerify.Steps;
 using AET.SteamAbstraction;
 using AnakinRaW.CommonUtilities.Hashing;
 using AnakinRaW.CommonUtilities.Registry;
@@ -14,7 +15,7 @@
 using Microsoft.Extensions.Logging;
 using PG.Commons.Extensibility;
 using PG.StarWarsGame.Engine;
-using PG.StarWarsGame.Engine.FileSystem;
+using PG.StarWarsGame.Engine.Database;
 using PG.StarWarsGame.Files.ALO;
 using PG.StarWarsGame.Files.DAT.Services.Builder;
 using PG.StarWarsGame.Files.MEG.Data.Archives;
@@ -97,9 +98,8 @@ private static VerifyGamePipeline BuildPipeline(IPlayableObject playableObject,
             playableObject.Game.Directory.FullName,
             fallbackGame.Directory.FullName);
 
-        var repo = _services.GetRequiredService<IGameRepositoryFactory>().Create(GameEngineType.Foc, gameLocations);
 
-        return new VerifyGamePipeline(repo, VerificationSettings.Default, _services);
+        return new ModVerifyPipeline(GameEngineType.Foc, gameLocations, VerificationSettings.Default, _services);
     }
 
     private static IServiceProvider CreateAppServices()
@@ -121,8 +121,9 @@ private static IServiceProvider CreateAppServices()
         RuntimeHelpers.RunClassConstructor(typeof(IMegArchive).TypeHandle);
         AloServiceContribution.ContributeServices(serviceCollection);
         serviceCollection.CollectPgServiceContributions();
-
+        
         PetroglyphEngineServiceContribution.ContributeServices(serviceCollection);
+        ModVerifyServiceContribution.ContributeServices(serviceCollection);
 
         return serviceCollection.BuildServiceProvider();
     }
@@ -139,5 +140,18 @@ private static void ConfigureLogging(ILoggingBuilder loggingBuilder)
 #endif
         loggingBuilder.AddConsole();
     }
-
+}
+
+internal class ModVerifyPipeline(
+    GameEngineType targetType,
+    GameLocations gameLocations,
+    VerificationSettings settings,
+    IServiceProvider serviceProvider)
+    : VerifyGamePipeline(targetType, gameLocations, settings, serviceProvider)
+{
+    protected override IEnumerable<GameVerificationStep> CreateVerificationSteps(IGameDatabase database)
+    {
+        var verifyProvider = ServiceProvider.GetRequiredService<IVerificationProvider>();
+        return verifyProvider.GetAllDefaultVerifiers(database, Settings);
+    }
 }

src/ModVerify/IVerificationProvider.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using AET.ModVerify.Steps;
+using PG.StarWarsGame.Engine.Database;
+
+namespace AET.ModVerify;
+
+public interface IVerificationProvider
+{
+    IEnumerable<GameVerificationStep> GetAllDefaultVerifiers(IGameDatabase database, VerificationSettings settings);
+}

src/ModVerify/ModVerifyServiceContribution.cs

@@ -0,0 +1,11 @@
+using Microsoft.Extensions.DependencyInjection;
+
+namespace AET.ModVerify;
+
+public static class ModVerifyServiceContribution
+{
+    public static void ContributeServices(IServiceCollection serviceCollection)
+    {
+        serviceCollection.AddSingleton<IVerificationProvider>(sp => new VerificationProvider(sp));
+    }
+}

src/ModVerify/Steps/GameVerificationStep.cs

@@ -6,13 +6,13 @@
 using AnakinRaW.CommonUtilities.SimplePipeline.Steps;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using PG.StarWarsGame.Engine;
-using PG.StarWarsGame.Engine.FileSystem;
+using PG.StarWarsGame.Engine.Database;
+using PG.StarWarsGame.Engine.Repositories;
 
 namespace AET.ModVerify.Steps;
 
 public abstract class GameVerificationStep(
-    GameDatabase gameDatabase,
+    IGameDatabase gameDatabase,
     VerificationSettings settings,
     IServiceProvider serviceProvider)
     : PipelineStep(serviceProvider)
@@ -26,7 +26,7 @@ public abstract class GameVerificationStep(
 
     protected VerificationSettings Settings { get; } = settings;
 
-    protected GameDatabase Database { get; } = gameDatabase ?? throw new ArgumentNullException(nameof(gameDatabase));
+    protected IGameDatabase Database { get; } = gameDatabase ?? throw new ArgumentNullException(nameof(gameDatabase));
 
     protected IGameRepository Repository => gameDatabase.GameRepository;
 

src/ModVerify/Steps/VerifyReferencedModelsStep.cs → src/ModVerify/Steps/VerifyModelsStep.cs

@@ -8,6 +8,7 @@
 using PG.Commons.Files;
 using PG.Commons.Utilities;
 using PG.StarWarsGame.Engine;
+using PG.StarWarsGame.Engine.Database;
 using PG.StarWarsGame.Files.ALO.Files.Models;
 using PG.StarWarsGame.Files.ALO.Files.Particles;
 using PG.StarWarsGame.Files.ALO.Services;
@@ -16,7 +17,7 @@
 namespace AET.ModVerify.Steps;
 
 internal sealed class VerifyReferencedModelsStep(
-    GameDatabase database,
+    IGameDatabase database,
     VerificationSettings settings,
     IServiceProvider serviceProvider)
     : GameVerificationStep(database, settings, serviceProvider)
@@ -42,7 +43,7 @@ protected override void RunVerification(CancellationToken token)
         var aloQueue = new Queue<string>(Database.GameObjects
             .SelectMany(x => x.Models)
             .Concat(FocHardcodedConstants.HardcodedModels));
-
+        
         var visitedAloFiles = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
 
         while (aloQueue.Count != 0)

src/ModVerify/VerificationProvider.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using AET.ModVerify.Steps;
+using PG.StarWarsGame.Engine.Database;
+
+namespace AET.ModVerify;
+
+internal class VerificationProvider(IServiceProvider serviceProvider) : IVerificationProvider
+{
+    public IEnumerable<GameVerificationStep> GetAllDefaultVerifiers(IGameDatabase database, VerificationSettings settings)
+    {
+        yield return new VerifyReferencedModelsStep(database, settings, serviceProvider);
+    }
+}

src/ModVerify/VerificationSettings.cs

@@ -2,6 +2,8 @@
 
 public record VerificationSettings
 {
+    public int ParallelWorkers { get; init; } = 4;
+
     public static readonly VerificationSettings Default = new()
     {
         ThrowBehavior = VerifyThrowBehavior.None

src/ModVerify/VerifyGamePipeline.cs

@@ -5,42 +5,70 @@
 using System.Threading.Tasks;
 using AET.ModVerify.Steps;
 using AnakinRaW.CommonUtilities.SimplePipeline;
+using AnakinRaW.CommonUtilities.SimplePipeline.Runners;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using PG.StarWarsGame.Engine.FileSystem;
+using PG.StarWarsGame.Engine;
+using PG.StarWarsGame.Engine.Database;
 using PG.StarWarsGame.Engine.Pipeline;
 
 namespace AET.ModVerify;
 
 public abstract class VerifyGamePipeline : Pipeline
 {
-    private IList<GameVerificationStep> _verificationSteps = new List<GameVerificationStep>();
+    private readonly List<GameVerificationStep> _verificationSteps = new();
+    private readonly GameEngineType _targetType;
     private readonly GameLocations _gameLocations;
-    private readonly VerificationSettings _settings;
+    private readonly ParallelRunner _verifyRunner;
 
-    protected VerifyGamePipeline(GameLocations gameLocations, VerificationSettings settings, IServiceProvider serviceProvider) 
+    protected VerificationSettings Settings { get; }
+
+    protected VerifyGamePipeline(GameEngineType targetType, GameLocations gameLocations, VerificationSettings settings, IServiceProvider serviceProvider) 
         : base(serviceProvider)
     {
+        _targetType = targetType;
         _gameLocations = gameLocations ?? throw new ArgumentNullException(nameof(gameLocations));
-        _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+        Settings = settings ?? throw new ArgumentNullException(nameof(settings));
+
+        if (settings.ParallelWorkers is < 0 or > 64)
+            throw new ArgumentException("Settings has invalid parallel worker number.", nameof(settings));
+
+        _verifyRunner = new ParallelRunner(settings.ParallelWorkers, serviceProvider);
     }
 
 
-    protected override Task<bool> PrepareCoreAsync()
+    protected sealed override Task<bool> PrepareCoreAsync()
     {
-        throw new NotImplementedException();
+        _verificationSteps.Clear();
+        return Task.FromResult(true);
     }
 
-    protected override async Task RunCoreAsync(CancellationToken token)
+    protected sealed override async Task RunCoreAsync(CancellationToken token)
     {
         Logger?.LogInformation("Verifying game...");
         try
         {
             var databaseService = ServiceProvider.GetRequiredService<IGameDatabaseService>();
 
-            await databaseService.CreateDatabaseAsync()
+            var database = await databaseService.CreateDatabaseAsync(_targetType, _gameLocations, token);
 
+            foreach (var gameVerificationStep in CreateVerificationSteps(database))
+            {
+                _verifyRunner.AddStep(gameVerificationStep);
+                _verificationSteps.Add(gameVerificationStep);
+            }
 
+            try
+            {
+                Logger?.LogInformation("Verifying...");
+                _verifyRunner.Error += OnError;
+                await _verifyRunner.RunAsync(token);
+            }
+            finally
+            {
+                _verifyRunner.Error -= OnError;
+                Logger?.LogInformation("Finished Verifying");
+            }
 
             var stepsWithVerificationErrors = _verificationSteps.Where(x => x.VerifyErrors.Any()).ToList();
 
@@ -54,7 +82,7 @@ await databaseService.CreateDatabaseAsync()
                 }
             }
 
-            if (_settings.ThrowBehavior == VerifyThrowBehavior.FinalThrow && failedSteps.Count > 0)
+            if (Settings.ThrowBehavior == VerifyThrowBehavior.FinalThrow && failedSteps.Count > 0)
                 throw new GameVerificationException(stepsWithVerificationErrors);
         }
         finally
@@ -63,25 +91,5 @@ await databaseService.CreateDatabaseAsync()
         }
     }
 
-
-    //protected sealed override async Task<IList<IStep>> BuildSteps()
-    //{
-    //    var buildIndexStep = new CreateGameDatabaseStep(_repository, ServiceProvider);
-
-    //    _verificationSteps = new List<GameVerificationStep>
-    //    {
-    //        new VerifyReferencedModelsStep(buildIndexStep, _repository, _settings, ServiceProvider),
-    //    };
-
-    //    var allSteps = new List<IStep>
-    //    {
-    //        buildIndexStep
-    //    };
-    //    allSteps.AddRange(CreateVeificationSteps());
-
-    //    return allSteps;
-    //}
-
-
-    protected abstract IEnumerable<GameVerificationStep> CreateVerificationSteps();
+    protected abstract IEnumerable<GameVerificationStep> CreateVerificationSteps(IGameDatabase database);
 }

src/PetroglyphTools/PG.StarWarsGame.Engine/GameDatabase.cs → src/PetroglyphTools/PG.StarWarsGame.Engine/Database/GameDatabase.cs

@@ -1,10 +1,10 @@
 using System.Collections.Generic;
 using PG.StarWarsGame.Engine.DataTypes;
-using PG.StarWarsGame.Engine.FileSystem;
+using PG.StarWarsGame.Engine.Repositories;
 
-namespace PG.StarWarsGame.Engine;
+namespace PG.StarWarsGame.Engine.Database;
 
-public class GameDatabase
+internal class GameDatabase : IGameDatabase
 {
     public required IGameRepository GameRepository { get; init; }
 

src/PetroglyphTools/PG.StarWarsGame.Engine/Database/IGameDatabase.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+using PG.StarWarsGame.Engine.DataTypes;
+using PG.StarWarsGame.Engine.Repositories;
+
+namespace PG.StarWarsGame.Engine.Database;
+
+public interface IGameDatabase
+{
+    public IGameRepository GameRepository { get; }
+
+    public GameConstants GameConstants { get; }
+
+    public IList<GameObject> GameObjects { get; }
+}