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

update

parent 8526e7d6

SimpleOCRCLI/SimpleOCRCLI.sln

+0 −8
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleOCRCLI", "SimpleOCRCL 
EndProject

Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleOCRCLITests", "SimpleOCRCLITests\SimpleOCRCLITests.csproj", "{C6110F13-7E67-4CD1-9333-D984EE5C4BFC}"

EndProject

Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleOCRLibrary", "..\SimpleOCRLibrary\SimpleOCRLibrary\SimpleOCRLibrary.csproj", "{2AB3E305-EF7C-6DBF-0AA4-328145001C56}"

EndProject

Global

	GlobalSection(SolutionConfigurationPlatforms) = preSolution

		Development|Any CPU = Development|Any CPU
@@ -28,12 +26,6 @@ Global 
		{C6110F13-7E67-4CD1-9333-D984EE5C4BFC}.Productive|Any CPU.Build.0 = Productive|Any CPU

		{C6110F13-7E67-4CD1-9333-D984EE5C4BFC}.QualityCheck|Any CPU.ActiveCfg = QualityCheck|Any CPU

		{C6110F13-7E67-4CD1-9333-D984EE5C4BFC}.QualityCheck|Any CPU.Build.0 = QualityCheck|Any CPU

		{2AB3E305-EF7C-6DBF-0AA4-328145001C56}.Development|Any CPU.ActiveCfg = Development|Any CPU

		{2AB3E305-EF7C-6DBF-0AA4-328145001C56}.Development|Any CPU.Build.0 = Development|Any CPU

		{2AB3E305-EF7C-6DBF-0AA4-328145001C56}.Productive|Any CPU.ActiveCfg = Productive|Any CPU

		{2AB3E305-EF7C-6DBF-0AA4-328145001C56}.Productive|Any CPU.Build.0 = Productive|Any CPU

		{2AB3E305-EF7C-6DBF-0AA4-328145001C56}.QualityCheck|Any CPU.ActiveCfg = QualityCheck|Any CPU

		{2AB3E305-EF7C-6DBF-0AA4-328145001C56}.QualityCheck|Any CPU.Build.0 = QualityCheck|Any CPU

	EndGlobalSection

	GlobalSection(SolutionProperties) = preSolution

		HideSolutionNode = FALSE

SimpleOCRCLI/SimpleOCRCLI/SimpleOCRCLI.csproj

+4 −4
Original line number Diff line number Diff line
@@ -62,11 +62,11 @@ 
        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

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

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

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

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

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

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

    </ItemGroup>

    <ItemGroup>

      <ProjectReference Include="..\..\SimpleOCRLibrary\SimpleOCRLibrary\SimpleOCRLibrary.csproj" />

        <Reference Include="SimpleOCRLibrary">

            <HintPath>..\Other\Resources\DependentCodeUnits\SimpleOCRLibrary\BuildResult_DotNet_win-x64\SimpleOCRLibrary.dll</HintPath>

        </Reference>

    </ItemGroup>

</Project>
 
 No newline at end of file

SimpleOCRCLI/SimpleOCRCLITests/SimpleOCRCLITests.csproj

+8 −6
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
        <ErrorReport>none</ErrorReport>

    </PropertyGroup>

    <ItemGroup>

        <ProjectReference Include="..\..\SimpleOCRLibrary\SimpleOCRLibrary\SimpleOCRLibrary.csproj" />

        <ProjectReference Include="..\SimpleOCRCLI\SimpleOCRCLI.csproj" />

        <PackageReference Include="coverlet.collector" Version="6.0.4">

          <PrivateAssets>all</PrivateAssets>
@@ -71,9 +70,12 @@ 
        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.8" />

        <PackageReference Include="Microsoft.Extensions.Options" Version="9.0.8" />

        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />

        <PackageReference Include="MSTest.TestAdapter" Version="3.10.1" />

        <PackageReference Include="MSTest.TestFramework" Version="3.10.1" />

        <PackageReference Include="MSTest.TestAdapter" Version="3.10.2" />

        <PackageReference Include="MSTest.TestFramework" Version="3.10.2" />

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

        <Reference Include="SimpleOCRLibrary">

            <HintPath>..\Other\Resources\DependentCodeUnits\SimpleOCRLibrary\BuildResult_DotNet_win-x64\SimpleOCRLibrary.dll</HintPath>

        </Reference>

    </ItemGroup>

    <ItemGroup>

        <Content Include="TestData\**">

SimpleOCRCLI/SimpleOCRCLITests/Testcases/BasicTests.cs

+5 −5
Original line number Diff line number Diff line
@@ -17,16 +17,16 @@ namespace SimpleOCR.CLI.Tests.Testcases 
Test2");

            string dataFolder = Path.Join(SimpleOCR.CLI.Tests.TestUtilities.Constants.GeneralConstants.CodeUnitFolder, "Other", "Resources", "OCRData");

            GRYLibrary.Core.Misc.Utilities.EnsureDirectoryExists(dataFolder);

            string[] arguments = new string[] { "--File", "./TestData/Test.png", "--Languages", "eng", "--OCRDataFolder", dataFolder };

            ProgramStarter pe = new ProgramStarter();

            string[] arguments = new string[] { "--File", "./TestData/Test.png", "--Languages", "deu", "eng", "--OCRDataFolder", dataFolder };

            ProgramStarter programStarter = new ProgramStarter();



            // act

            int result = pe.Main(arguments);

            int result = programStarter.Main(arguments);



            // assert

            Assert.AreEqual(0, result);

            Assert.IsNotNull(pe.VerbVisitor);

            if(pe.VerbVisitor is VerbVisitor verbVisitor)

            Assert.IsNotNull(programStarter.VerbVisitor);

            if(programStarter.VerbVisitor is VerbVisitor verbVisitor)

            {

                RunBase runBase = verbVisitor.RunBase;

                string actualOutput = runBase.Result;

SimpleOCRLibrary/SimpleOCRLibrary/OCRService.cs

+2 −1
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ namespace SimpleOCR.Library.Core 
        {

            var result = new HashSet<string>();

            string pattern = @"([a-z][a-z][a-z])\.traineddata";

            foreach (var file in Directory.GetFiles(this.GetTessDataPath()))

            var files = Directory.GetFiles(this.GetTessDataPath());

            foreach (var file in files)

            {

                string filename = Path.GetFileName(file);

                Match match = Regex.Match(filename, pattern);