Unverified Commit 78e55d68 authored by Marius Göcke's avatar Marius Göcke
Browse files

update

parent cd061088

SimpleOCRCLI/SimpleOCRCLI/SimpleOCRCLI.csproj

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />

        <PackageReference Include="Swashbuckle.AspNetCore" Version="10.1.5" />

        <PackageReference Include="CommandLineParser" Version="2.9.1" />

        <PackageReference Include="GRYLibrary" Version="2.0.11" />

        <PackageReference Include="GRYLibrary" Version="2.0.12" />

        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.5" />

        <PackageReference Include="Tesseract" Version="5.2.0" />

    </ItemGroup>

SimpleOCRLibrary/SimpleOCRLibrary/SimpleOCRLibrary.csproj

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
    </PropertyGroup>

    <ItemGroup>

        <PackageReference Include="ExtendedXmlSerializer" Version="3.9.6" />

        <PackageReference Include="GRYLibrary" Version="2.0.11" />

        <PackageReference Include="GRYLibrary" Version="2.0.12" />

        <PackageReference Include="Magick.NET-Q16-x64" Version="14.11.0" />

        <PackageReference Include="Magick.NET.Core" Version="14.11.0" />

        <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.0" />

SimpleOCRService/SimpleOCRService/Program.cs

+4 −2
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ using GRYLibrary.Core.Misc; 
using GRYLibrary.Core.Misc.FilePath;

using Microsoft.Extensions.DependencyInjection;

using Microsoft.Extensions.Diagnostics.HealthChecks;

using Microsoft.Extensions.Logging;

using SimpleOCR.Library.Core;

using SimpleOCR.Service.Core.Configuration;

using SimpleOCR.Service.Core.Constants;
@@ -22,6 +23,7 @@ using SimpleOCR.Service.Core.Misc; 
using SimpleOCR.Service.Core.Services;

using System.Collections.Generic;

using System.IO;

using System.Linq;

using GUtilities = GRYLibrary.Core.Misc.Utilities;



namespace SimpleOCR.Service.Core
@@ -83,9 +85,9 @@ namespace SimpleOCR.Service.Core 
                {

                    functionalInformation.WebApplicationBuilder.Services.AddSingleton(functionalInformation.PersistedAPIServerConfiguration.ApplicationSpecificConfiguration.ConfigurationForLoggingMiddleware);

                    functionalInformation.WebApplicationBuilder.Services.AddSingleton(functionalInformation.PersistedAPIServerConfiguration.ApplicationSpecificConfiguration.ConfigurationForDLoggingMiddleware);

                    IGeneralLogger logger = functionalInformation.Logger;

                    IGRYLog logger = functionalInformation.Logger;



                    IAuditLog auditLog = new AuditLog(functionalInformation.InitializationInformation.ApplicationConstants.ExecutionMode.Accept(new GetLoggerVisitor(functionalInformation.PersistedAPIServerConfiguration.ApplicationSpecificConfiguration.AuditLogConfiguration, functionalInformation.InitializationInformation.ApplicationConstants.GetLogFolder(), "AuditLog",GRYLog.Create())));

                    IAuditLog auditLog = new AuditLog(functionalInformation.InitializationInformation.ApplicationConstants.ExecutionMode.Accept(new GetLoggerVisitor(functionalInformation.PersistedAPIServerConfiguration.ApplicationSpecificConfiguration.AuditLogConfiguration, functionalInformation.InitializationInformation.ApplicationConstants.GetLogFolder(), "AuditLog", GRYLog.Create(), logger.Configuration.LogTargets.Where(t => t.LogLevels.Contains(LogLevel.Debug)).Any())));

                    functionalInformation.WebApplicationBuilder.Services.AddSingleton<IAuditLog>(auditLog);



                    functionalInformation.WebApplicationBuilder.Services.AddSingleton(functionalInformation.PersistedAPIServerConfiguration.ApplicationSpecificConfiguration.CommonRoutesInformation);

SimpleOCRService/SimpleOCRService/Services/OCRService.cs

+5 −0
Original line number Diff line number Diff line
@@ -77,5 +77,10 @@ namespace SimpleOCR.Service.Core.Services 
        {

            throw new NotImplementedException();

        }



        public void WaitUntilAvailable(TimeSpan timeSpan)

        {

            GRYLibrary.Core.Misc.Utilities.NoOperation();

        }

    }

}

SimpleOCRService/SimpleOCRService/SimpleOCRService.csproj

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
    <ItemGroup>

        <PackageReference Include="CommandLineParser" Version="2.9.1" />

        <PackageReference Include="ExtendedXmlSerializer" Version="3.9.6" />

        <PackageReference Include="GRYLibrary" Version="2.0.5" />

        <PackageReference Include="GRYLibrary" Version="2.0.12" />

        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.2" />

        <PackageReference Include="HtmlAgilityPack" Version="1.12.4" />

        <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.9" />