net7.0

2022-11-20 23:20:28 -07:00
parent c6aa7e8e3c
commit 3b988ba152
85 changed files with 1355 additions and 980 deletions
--- a/TestsWithFaceRecognitionDotNet/Models/Binder/AppSettings.cs
+++ b/TestsWithFaceRecognitionDotNet/Models/Binder/AppSettings.cs
@ -20,10 +20,10 @@ public class AppSettings
        return result;
    }

-    private static Models.AppSettings Get(AppSettings appSettings)
+    private static Models.AppSettings Get(AppSettings? appSettings)
    {
        Models.AppSettings result;
-        if (appSettings.MaxDegreeOfParallelism is null)
+        if (appSettings?.MaxDegreeOfParallelism is null)
            throw new NullReferenceException(nameof(appSettings.MaxDegreeOfParallelism));
        result = new(
            appSettings.Company,
@ -36,7 +36,7 @@ public class AppSettings
    public static Models.AppSettings Get(IConfigurationRoot configurationRoot)
    {
        Models.AppSettings result;
-        AppSettings appSettings = configurationRoot.Get<AppSettings>();
+        AppSettings? appSettings = configurationRoot.Get<AppSettings>();
        result = Get(appSettings);
        return result;
    }
--- a/TestsWithFaceRecognitionDotNet/Models/Binder/Configuration.cs
+++ b/TestsWithFaceRecognitionDotNet/Models/Binder/Configuration.cs
@ -82,9 +82,11 @@ public class Configuration
        return result;
    }

-    private static Models.Configuration Get(Configuration configuration)
+    private static Models.Configuration Get(Configuration? configuration)
    {
        Models.Configuration result;
+        if (configuration is null)
+            throw new NullReferenceException(nameof(configuration));
        if (configuration.CheckDFaceAndUpWriteDates is null)
            throw new NullReferenceException(nameof(configuration.CheckDFaceAndUpWriteDates));
        if (configuration.CheckJsonForDistanceResults is null)
@ -115,10 +117,8 @@ public class Configuration
            throw new NullReferenceException(nameof(configuration.IgnoreExtensions));
        if (configuration.IgnoreRelativePaths is null)
            throw new NullReferenceException(nameof(configuration.IgnoreRelativePaths));
-        if (configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions is null)
-            configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions = Array.Empty<string>();
-        if (configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions is null)
-            configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions = Array.Empty<string>();
+        configuration.LoadOrCreateThenSaveDistanceResultsForOutputResolutions ??= Array.Empty<string>();
+        configuration.LoadOrCreateThenSaveImageFacesResultsForOutputResolutions ??= Array.Empty<string>();
        if (configuration.LoadOrCreateThenSaveIndex is null)
            throw new NullReferenceException(nameof(configuration.LoadOrCreateThenSaveIndex));
        if (configuration.LocationDigits is null)
@ -175,16 +175,13 @@ public class Configuration
            throw new NullReferenceException(nameof(configuration.RetryImagesWithoutAFace));
        if (configuration.Reverse is null)
            throw new NullReferenceException(nameof(configuration.Reverse));
-        if (configuration.SaveFaceLandmarkForOutputResolutions is null)
-            configuration.SaveFaceLandmarkForOutputResolutions = Array.Empty<string>();
+        configuration.SaveFaceLandmarkForOutputResolutions ??= Array.Empty<string>();
        if (configuration.SaveFullYearOfRandomFiles is null)
            throw new NullReferenceException(nameof(configuration.SaveFullYearOfRandomFiles));
-        if (configuration.SaveResizedImagesByPersonKeyFormattedForOutputResolutions is null)
-            configuration.SaveResizedImagesByPersonKeyFormattedForOutputResolutions = Array.Empty<string>();
+        configuration.SaveResizedImagesByPersonKeyFormattedForOutputResolutions ??= Array.Empty<string>();
        if (configuration.SaveResizedSubfiles is null)
            throw new NullReferenceException(nameof(configuration.SaveResizedSubfiles));
-        if (configuration.SaveShortcutsForOutputResolutions is null)
-            configuration.SaveShortcutsForOutputResolutions = Array.Empty<string>();
+        configuration.SaveShortcutsForOutputResolutions ??= Array.Empty<string>();
        if (configuration.SkipSearch is null)
            throw new NullReferenceException(nameof(configuration.SkipSearch));
        if (configuration.SortingMaximumPerFaceShouldBeHigh is null)
@ -267,7 +264,7 @@ public class Configuration
    public static Models.Configuration Get(IsEnvironment isEnvironment, IConfigurationRoot configurationRoot, Property.Models.Configuration propertyConfiguration)
    {
        Models.Configuration result;
-        Configuration configuration;
+        Configuration? configuration;
        if (isEnvironment is null)
            configuration = configurationRoot.Get<Configuration>();
        else
--- a/TestsWithFaceRecognitionDotNet/TestsWithFaceRecognitionDotNet.csproj
+++ b/TestsWithFaceRecognitionDotNet/TestsWithFaceRecognitionDotNet.csproj
@ -5,7 +5,7 @@
        <LangVersion>10.0</LangVersion>
        <Nullable>enable</Nullable>
        <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
    </PropertyGroup>
    <PropertyGroup>
        <VSTestLogger>trx</VSTestLogger>
@ -27,17 +27,17 @@
        <DefineConstants>Linux</DefineConstants>
    </PropertyGroup>
    <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="3.1.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
-        <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
-        <PackageReference Include="Serilog.Settings.Configuration" Version="3.3.0" />
-        <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
+        <PackageReference Include="coverlet.collector" Version="3.2.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+        <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+        <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
+        <PackageReference Include="Serilog.Settings.Configuration" Version="3.4.0" />
+        <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
        <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
-        <PackageReference Include="Serilog" Version="2.10.0" />
+        <PackageReference Include="Serilog" Version="2.12.0" />
    </ItemGroup>
    <ItemGroup>
        <ProjectReference Include="..\Shared\View-by-Distance.Shared.csproj" />
--- a/TestsWithFaceRecognitionDotNet/UnitTestFace.cs
+++ b/TestsWithFaceRecognitionDotNet/UnitTestFace.cs
@ -172,6 +172,7 @@ public class UnitTestFace
        Item item;
        bool reverse = false;
        string original = "Original";
+        FileHolder resizedFileHolder;
        string aResultsFullGroupDirectory;
        string bResultsFullGroupDirectory;
        string cResultsFullGroupDirectory;
@ -198,46 +199,30 @@ public class UnitTestFace
        (ImageCodecInfo imageCodecInfo, EncoderParameters encoderParameters, string filenameExtension) = C_Resize.GetTuple(_Configuration.OutputExtension, _Configuration.OutputQuality);
        C_Resize resize = new(_Configuration.ForceResizeLastWriteTimeToCreationTime, _Configuration.OverrideForResizeImages, _Configuration.PropertiesChangedForResize, _Configuration.ValidResolutions, imageCodecInfo, encoderParameters, filenameExtension);
        _ = resize.ToString();
-        propertyLogic.AngleBracketCollection.AddRange(Property.Models.Stateless.IResult.GetDirectoryInfoCollection(
-            _PropertyConfiguration,
-            sourceDirectory,
-            aResultsFullGroupDirectory,
-            contentDescription: string.Empty,
-            singletonDescription: "Properties for each image",
-            collectionDescription: string.Empty,
-            converted: false));
-        metadata.AngleBracketCollection.AddRange(Property.Models.Stateless.IResult.GetDirectoryInfoCollection(
-            _PropertyConfiguration,
-            sourceDirectory,
-            bResultsFullGroupDirectory,
-            contentDescription: string.Empty,
-            singletonDescription: "Metadata as key value pairs",
-            collectionDescription: string.Empty,
-            converted: true));
-        resize.AngleBracketCollection.AddRange(Property.Models.Stateless.IResult.GetDirectoryInfoCollection(
-            _PropertyConfiguration,
-            sourceDirectory,
-            cResultsFullGroupDirectory,
-            contentDescription: "Resized image",
-            singletonDescription: "Resize dimensions for each resolution",
-            collectionDescription: string.Empty,
-            converted: true));
        string sourceDirectoryFile = ".json";
        FileHolder fileHolder = new(Path.Combine(sourceDirectory, sourceFileName));
        string relativePath = IPath.GetRelativePath(fileHolder.FullName, length);
        sourceDirectory = Path.Combine(aPropertySingletonDirectory, sourceDirectoryName);
-        item = new(sourceDirectoryFile, relativePath, fileHolder, isValidImageFormatExtension, property, false, false);
+        propertyLogic.SetAngleBracketCollection(aResultsFullGroupDirectory, sourceDirectory);
+        resize.SetAngleBracketCollection(_Configuration.PropertyConfiguration, cResultsFullGroupDirectory, sourceDirectory);
+        metadata.SetAngleBracketCollection(_Configuration.PropertyConfiguration, bResultsFullGroupDirectory, sourceDirectory);
+        item = new(sourceDirectoryFile, relativePath, fileHolder, isValidImageFormatExtension, property, false, false, false);
        Assert.IsNotNull(item.ImageFileHolder);
        if (item.Property is null)
        {
            property = propertyLogic.GetProperty(item, subFileTuples, parseExceptions);
            item.Update(property);
        }
-        (int _, metadataCollection) = metadata.GetMetadataCollection(_Configuration.PropertyConfiguration, bResultsFullGroupDirectory, subFileTuples, parseExceptions, item);
-        imageResizeKeyValuePairs = resize.GetResizeKeyValuePairs(_Configuration.PropertyConfiguration, cResultsFullGroupDirectory, subFileTuples, parseExceptions, original, metadataCollection, item);
-        Assert.IsNotNull(item.ResizedFileHolder);
-        resize.SaveResizedSubfile(outputResolution, cResultsFullGroupDirectory, subFileTuples, item, original, imageResizeKeyValuePairs);
-        Image image = FaceRecognition.LoadImageFile(item.ResizedFileHolder.FullName);
+        if (property is null || item.Property is null)
+            throw new NullReferenceException(nameof(property));
+        resizedFileHolder = resize.GetResizedFileHolder(item);
+        item.SetResizedFileHolder(resize.FileNameExtension, resizedFileHolder);
+        MappingFromItem mappingFromItem = IMappingFromItem.GetMappingFromItem(item);
+        (int _, metadataCollection) = metadata.GetMetadataCollection(_Configuration.PropertyConfiguration, bResultsFullGroupDirectory, subFileTuples, parseExceptions, mappingFromItem);
+        imageResizeKeyValuePairs = resize.GetResizeKeyValuePairs(_Configuration.PropertyConfiguration, cResultsFullGroupDirectory, subFileTuples, parseExceptions, original, metadataCollection, item.Property, mappingFromItem);
+        Assert.IsNotNull(mappingFromItem.ResizedFileHolder);
+        resize.SaveResizedSubfile(_Configuration.PropertyConfiguration, outputResolution, cResultsFullGroupDirectory, subFileTuples, item, item.Property, mappingFromItem, original, imageResizeKeyValuePairs);
+        Image image = FaceRecognition.LoadImageFile(mappingFromItem.ResizedFileHolder.FullName);
        Assert.IsNotNull(image);
        (Model model, PredictorModel predictorModel, ModelParameter modelParameter) = GetModel(_Configuration);
        FaceRecognition faceRecognition = new(_Configuration.NumberOfTimesToUpsample, _Configuration.NumberOfJitters, predictorModel, model, modelParameter);