From 1f8c4569ee2515f5648e753bc2a4b7adcf4072fc Mon Sep 17 00:00:00 2001 From: Mike Phares Date: Sun, 29 Dec 2024 10:46:13 -0700 Subject: [PATCH] Removed Methods Namespace --- .vscode/mklink.md | 11 + .vscode/settings.json | 2 + .vscode/tasks.json | 431 +++++++++++++++--- Compare/Compare.cs | 8 +- Distance/.editorconfig | 285 ++++++++++++ .../Models/Stateless/FaceEncodingLogic.cs | 12 +- Distance/Models/Stateless/FilterLogicA.cs | 14 +- Distance/Models/Stateless/FilterLogicB.cs | 8 +- Distance/Models/Stateless/FilterLogicC.cs | 6 +- Distance/Models/Stateless/FilterLogicD.cs | 24 +- .../Stateless/{Methods => }/IDistance.cs | 4 +- Distance/Models/Stateless/MappedLogicA.cs | 6 +- Distance/Models/Stateless/MappedLogicB.cs | 4 +- Face/Models/Stateless/Face.cs | 6 +- Face/Models/Stateless/{Methods => }/IFace.cs | 4 +- .../Dlib/Python/CnnFaceDetectionModelV1.cs | 1 + .../Dlib/Python/FaceRecognitionModelV1.cs | 1 + .../Dlib/Python/SimpleObjectDetector.cs | 1 + .../Extensions/FaceDetector.cs | 1 + .../Extensions/FaceLandmarkDetector.cs | 1 + .../{ => Models}/DisposableObject.cs | 2 +- .../{ => Models}/FaceEncoding.cs | 2 +- .../{ => Models}/FaceRecognition.cs | 3 +- .../{ => Models}/FaceRecognitionGroup.cs | 2 +- .../{ => Models}/FaceRecognitionModels.cs | 2 +- FaceRecognitionDotNet/{ => Models}/Image.cs | 2 +- .../{ => Models}/ModelParameter.cs | 2 +- FaceRecognitionDotNet/{ => Models}/Point.cs | 2 +- Metadata/Models/A_Metadata.cs | 2 +- Metadata/Models/Stateless/Base.cs | 2 +- Metadata/Models/Stateless/Dimensions.cs | 2 +- Metadata/Models/Stateless/Exif.cs | 2 +- Metadata/Models/Stateless/Face.cs | 2 +- Metadata/Models/Stateless/GPS.cs | 2 +- Metadata/Models/Stateless/Get.cs | 4 +- .../Stateless/{Methods => }/IMetadata.cs | 4 +- .../Models/Stateless/{Methods => }/IPeople.cs | 2 +- People/Models/Stateless/People.cs | 4 +- .../Stateless/ReadOnlyCollectionsLogic.cs | 4 +- Rename/Rename.cs | 4 +- Shared/Models/FilePath.cs | 2 +- Shared/Models/Location.cs | 2 +- Shared/Models/PersonContainer.cs | 3 +- Shared/Models/Stateless/{Methods => }/Age.cs | 2 +- Shared/Models/Stateless/Console.cs | 2 +- Shared/Models/Stateless/{Methods => }/IAge.cs | 2 +- .../Stateless/{Methods => }/ICompare.cs | 2 +- .../Stateless/{Methods => }/IConsole.cs | 2 +- .../Models/Stateless/{Methods => }/IDate.cs | 2 +- Shared/Models/Stateless/{Methods => }/IId.cs | 2 +- .../Stateless/{Methods => }/ILocation.cs | 2 +- .../Stateless/{Methods => }/IMapping.cs | 2 +- .../Models/Stateless/{Methods => }/IPath.cs | 2 +- .../Models/Stateless/{Methods => }/IPerson.cs | 2 +- .../{Methods => }/IPersonBirthday.cs | 2 +- .../Models/Stateless/{Methods => }/IRename.cs | 2 +- .../Models/Stateless/{Methods => }/IResult.cs | 2 +- Shared/Models/Stateless/Id.cs | 2 +- .../Stateless/{Methods => }/Location.cs | 2 +- .../Models/Stateless/{Methods => }/Mapping.cs | 2 +- .../Stateless/{Methods => }/PersonBirthday.cs | 2 +- Shared/Models/Stateless/XResult.cs | 2 +- 62 files changed, 755 insertions(+), 171 deletions(-) create mode 100644 Distance/.editorconfig rename Distance/Models/Stateless/{Methods => }/IDistance.cs (98%) rename Face/Models/Stateless/{Methods => }/IFace.cs (89%) rename FaceRecognitionDotNet/{ => Models}/DisposableObject.cs (97%) rename FaceRecognitionDotNet/{ => Models}/FaceEncoding.cs (98%) rename FaceRecognitionDotNet/{ => Models}/FaceRecognition.cs (99%) rename FaceRecognitionDotNet/{ => Models}/FaceRecognitionGroup.cs (79%) rename FaceRecognitionDotNet/{ => Models}/FaceRecognitionModels.cs (93%) rename FaceRecognitionDotNet/{ => Models}/Image.cs (98%) rename FaceRecognitionDotNet/{ => Models}/ModelParameter.cs (94%) rename FaceRecognitionDotNet/{ => Models}/Point.cs (98%) rename Metadata/Models/Stateless/{Methods => }/IMetadata.cs (97%) rename People/Models/Stateless/{Methods => }/IPeople.cs (98%) rename Shared/Models/Stateless/{Methods => }/Age.cs (95%) rename Shared/Models/Stateless/{Methods => }/IAge.cs (94%) rename Shared/Models/Stateless/{Methods => }/ICompare.cs (64%) rename Shared/Models/Stateless/{Methods => }/IConsole.cs (57%) rename Shared/Models/Stateless/{Methods => }/IDate.cs (94%) rename Shared/Models/Stateless/{Methods => }/IId.cs (98%) rename Shared/Models/Stateless/{Methods => }/ILocation.cs (94%) rename Shared/Models/Stateless/{Methods => }/IMapping.cs (96%) rename Shared/Models/Stateless/{Methods => }/IPath.cs (98%) rename Shared/Models/Stateless/{Methods => }/IPerson.cs (97%) rename Shared/Models/Stateless/{Methods => }/IPersonBirthday.cs (99%) rename Shared/Models/Stateless/{Methods => }/IRename.cs (85%) rename Shared/Models/Stateless/{Methods => }/IResult.cs (98%) rename Shared/Models/Stateless/{Methods => }/Location.cs (97%) rename Shared/Models/Stateless/{Methods => }/Mapping.cs (97%) rename Shared/Models/Stateless/{Methods => }/PersonBirthday.cs (99%) diff --git a/.vscode/mklink.md b/.vscode/mklink.md index d72b5c6..1b125cb 100644 --- a/.vscode/mklink.md +++ b/.vscode/mklink.md @@ -22,3 +22,14 @@ mklink /J "L:\Git\AA\.vscode\.UserSecrets" "C:\Users\mikep\AppData\Roaming\Micro mklink /J "L:\Git\AA\Rename\.vscode\.UserSecrets" "C:\Users\mikep\AppData\Roaming\Microsoft\UserSecrets\fa0fa59b-afe4-4960-9afc-18fcbc7fb41b" mklink /J "L:\Git\AA\Compare\.vscode\.UserSecrets" "C:\Users\mikep\AppData\Roaming\Microsoft\UserSecrets\770b6ae3-266e-4d5f-970a-173709b064de" ``` + +```json 1735493575037 = 638710903750370000 = Sun Dec 29 2024 10:32:54 GMT-0700 (Mountain Standard Time) +{ "label": "Build-Compare", "command": "dotnet", "type": "process", "args": [ "build", "${workspaceFolder}/Compare/AA.Compare.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], "problemMatcher": "$msCompile" }, +{ "label": "Build-Distance", "command": "dotnet", "type": "process", "args": [ "build", "${workspaceFolder}/Distance/AA.Distance.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], "problemMatcher": "$msCompile" }, +{ "label": "Build-Face", "command": "dotnet", "type": "process", "args": [ "build", "${workspaceFolder}/Face/AA.Face.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], "problemMatcher": "$msCompile" }, +{ "label": "Build-Face-Recognition-DotNet", "command": "dotnet", "type": "process", "args": [ "build", "${workspaceFolder}/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], "problemMatcher": "$msCompile" }, +{ "label": "Build-Metadata", "command": "dotnet", "type": "process", "args": [ "build", "${workspaceFolder}/Metadata/AA.Metadata.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], "problemMatcher": "$msCompile" }, +{ "label": "Build-People", "command": "dotnet", "type": "process", "args": [ "build", "${workspaceFolder}/People/AA.People.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], "problemMatcher": "$msCompile" }, +{ "label": "Build-Rename", "command": "dotnet", "type": "process", "args": [ "build", "${workspaceFolder}/Rename/AA.Rename.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], "problemMatcher": "$msCompile" }, +{ "label": "Build-Shared", "command": "dotnet", "type": "process", "args": [ "build", "${workspaceFolder}/Shared/AA.Shared.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" ], "problemMatcher": "$msCompile" }, +``` diff --git a/.vscode/settings.json b/.vscode/settings.json index 40c3c3a..5f67ab0 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "cSpell.words": [ + "accessibilities", "appsettings", "Argb", "ASPNETCORE", @@ -8,6 +9,7 @@ "Bday", "Beichler", "Bohdi", + "CAXXXX", "Cobertura", "cref", "CUDA", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 1888586..75b670f 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -28,12 +28,141 @@ "problemMatcher": "$msCompile" }, { - "label": "Format-Rename-Whitespaces", + "label": "Build-Compare", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/Compare/AA.Compare.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Build-Distance", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/Distance/AA.Distance.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Build-Face", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/Face/AA.Face.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Build-Face-Recognition-DotNet", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Build-Metadata", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/Metadata/AA.Metadata.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Build-People", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/People/AA.People.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Build-Rename", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/Rename/AA.Rename.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Build-Shared", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/Shared/AA.Shared.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Format-Compare-Whitespaces", "command": "dotnet", "type": "process", "args": [ "format", - "${workspaceFolder}/Rename/AA.Rename.csproj", + "${workspaceFolder}/Compare/AA.Compare.csproj", + "whitespace" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Format-Distance-Whitespaces", + "command": "dotnet", + "type": "process", + "args": [ + "format", + "${workspaceFolder}/Distance/AA.Distance.csproj", + "whitespace" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Format-Face-Whitespaces", + "command": "dotnet", + "type": "process", + "args": [ + "format", + "${workspaceFolder}/Face/AA.Face.csproj", + "whitespace" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Format-Face-Recognition-DotNet-Whitespaces", + "command": "dotnet", + "type": "process", + "args": [ + "format", + "${workspaceFolder}/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj", "whitespace" ], "problemMatcher": "$msCompile" @@ -50,12 +179,93 @@ "problemMatcher": "$msCompile" }, { - "label": "Format-Rename", + "label": "Format-People-Whitespaces", + "command": "dotnet", + "type": "process", + "args": [ + "format", + "${workspaceFolder}/People/AA.People.csproj", + "whitespace" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Format-Rename-Whitespaces", "command": "dotnet", "type": "process", "args": [ "format", "${workspaceFolder}/Rename/AA.Rename.csproj", + "whitespace" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Format-Shared-Whitespaces", + "command": "dotnet", + "type": "process", + "args": [ + "format", + "${workspaceFolder}/Shared/AA.Shared.csproj", + "whitespace" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Format-Compare", + "command": "dotnet", + "type": "process", + "args": [ + "format", + "${workspaceFolder}/Compare/AA.Compare.csproj", + "--report", + ".vscode", + "--verbosity", + "detailed", + "--severity", + "warn" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Format-Distance", + "command": "dotnet", + "type": "process", + "args": [ + "format", + "${workspaceFolder}/Distance/AA.Distance.csproj", + "--report", + ".vscode", + "--verbosity", + "detailed", + "--severity", + "warn" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Format-Face", + "command": "dotnet", + "type": "process", + "args": [ + "format", + "${workspaceFolder}/Face/AA.Face.csproj", + "--report", + ".vscode", + "--verbosity", + "detailed", + "--severity", + "warn" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "Format-Face-Recognition-DotNet", + "command": "dotnet", + "type": "process", + "args": [ + "format", + "${workspaceFolder}/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj", "--report", ".vscode", "--verbosity", @@ -82,95 +292,64 @@ "problemMatcher": "$msCompile" }, { - "label": "build-Shared", + "label": "Format-People", "command": "dotnet", "type": "process", "args": [ - "build", - "${workspaceFolder}/Shared/AA.Shared.csproj", - "/property:GenerateFullPaths=true", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - }, - { - "label": "build-Face", - "command": "dotnet", - "type": "process", - "args": [ - "build", - "${workspaceFolder}/Face/AA.Face.csproj", - "/property:GenerateFullPaths=true", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - }, - { - "label": "build-People", - "command": "dotnet", - "type": "process", - "args": [ - "build", + "format", "${workspaceFolder}/People/AA.People.csproj", - "/property:GenerateFullPaths=true", - "/consoleloggerparameters:NoSummary" + "--report", + ".vscode", + "--verbosity", + "detailed", + "--severity", + "warn" ], "problemMatcher": "$msCompile" }, { - "label": "build-Distance", + "label": "Format-Rename", "command": "dotnet", "type": "process", "args": [ - "build", - "${workspaceFolder}/Distance/AA.Distance.csproj", - "/property:GenerateFullPaths=true", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - }, - { - "label": "build-Metadata", - "command": "dotnet", - "type": "process", - "args": [ - "build", - "${workspaceFolder}/Metadata/AA.Metadata.csproj", - "/property:GenerateFullPaths=true", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - }, - { - "label": "build-FaceRecognitionDotNet", - "command": "dotnet", - "type": "process", - "args": [ - "build", - "${workspaceFolder}/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj", - "/property:GenerateFullPaths=true", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - }, - { - "label": "build-Rename", - "command": "dotnet", - "type": "process", - "args": [ - "build", + "format", "${workspaceFolder}/Rename/AA.Rename.csproj", - "/property:GenerateFullPaths=true", - "/consoleloggerparameters:NoSummary" + "--report", + ".vscode", + "--verbosity", + "detailed", + "--severity", + "warn" ], "problemMatcher": "$msCompile" }, { - "label": "build-Compare", + "label": "Format-Shared", "command": "dotnet", "type": "process", "args": [ - "build", + "format", + "${workspaceFolder}/Shared/AA.Shared.csproj", + "--report", + ".vscode", + "--verbosity", + "detailed", + "--severity", + "warn" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "AOT-Compare", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "-r", + "win-x64", + "-c", + "Release", + "-p:PublishAot=true", "${workspaceFolder}/Compare/AA.Compare.csproj", "/property:GenerateFullPaths=true", "/consoleloggerparameters:NoSummary" @@ -178,7 +357,92 @@ "problemMatcher": "$msCompile" }, { - "label": "Publish AOT", + "label": "AOT-Distance", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "-r", + "win-x64", + "-c", + "Release", + "-p:PublishAot=true", + "${workspaceFolder}/Distance/AA.Distance.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "AOT-Face", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "-r", + "win-x64", + "-c", + "Release", + "-p:PublishAot=true", + "${workspaceFolder}/Face/AA.Face.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "AOT-Face-Recognition-DotNet", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "-r", + "win-x64", + "-c", + "Release", + "-p:PublishAot=true", + "${workspaceFolder}/FaceRecognitionDotNet/AA.FaceRecognitionDotNet.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "AOT-Metadata", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "-r", + "win-x64", + "-c", + "Release", + "-p:PublishAot=true", + "${workspaceFolder}/Metadata/AA.Metadata.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "AOT-People", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "-r", + "win-x64", + "-c", + "Release", + "-p:PublishAot=true", + "${workspaceFolder}/People/AA.People.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "AOT-Rename", "command": "dotnet", "type": "process", "args": [ @@ -193,6 +457,23 @@ "/consoleloggerparameters:NoSummary" ], "problemMatcher": "$msCompile" - } + }, + { + "label": "AOT-Shared", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "-r", + "win-x64", + "-c", + "Release", + "-p:PublishAot=true", + "${workspaceFolder}/Shared/AA.Shared.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, ] } \ No newline at end of file diff --git a/Compare/Compare.cs b/Compare/Compare.cs index 5fb5703..4791912 100644 --- a/Compare/Compare.cs +++ b/Compare/Compare.cs @@ -2,12 +2,12 @@ using Microsoft.Extensions.Logging; using ShellProgressBar; using System.Collections.ObjectModel; using View_by_Distance.Compare.Models; -using View_by_Distance.Distance.Models.Stateless.Methods; -using View_by_Distance.Face.Models.Stateless.Methods; +using View_by_Distance.Distance.Models.Stateless; +using View_by_Distance.Face.Models.Stateless; using View_by_Distance.Metadata.Models; -using View_by_Distance.People.Models.Stateless.Methods; +using View_by_Distance.People.Models.Stateless; using View_by_Distance.Shared.Models; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; namespace View_by_Distance.Compare; diff --git a/Distance/.editorconfig b/Distance/.editorconfig new file mode 100644 index 0000000..4bc0a31 --- /dev/null +++ b/Distance/.editorconfig @@ -0,0 +1,285 @@ +[*.md] +end_of_line = crlf +file_header_template = unset +indent_size = 2 +indent_style = space +insert_final_newline = false +root = true +tab_width = 2 +[*.cs] +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents = true +csharp_indent_case_contents_when_block = true +csharp_indent_labels = one_less_than_current +csharp_indent_switch_labels = true +csharp_new_line_before_catch = true +csharp_new_line_before_else = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_open_brace = all +csharp_new_line_between_query_expression_clauses = true +csharp_prefer_braces = false +csharp_prefer_qualified_reference = true:error +csharp_prefer_simple_default_expression = true:warning +csharp_prefer_simple_using_statement = true:warning +csharp_prefer_static_local_function = true:warning +csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = false +csharp_space_after_cast = false +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_after_comma = true +csharp_space_after_dot = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_after_semicolon_in_for_statement = true +csharp_space_around_binary_operators = before_and_after +csharp_space_around_declaration_statements = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_open_square_brackets = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_between_square_brackets = false +csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true +csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true +csharp_style_allow_embedded_statements_on_same_line_experimental = true +csharp_style_conditional_delegate_call = true +csharp_style_deconstructed_variable_declaration = false +csharp_style_expression_bodied_accessors = when_on_single_line:warning +csharp_style_expression_bodied_constructors = when_on_single_line:warning +csharp_style_expression_bodied_indexers = when_on_single_line:warning +csharp_style_expression_bodied_lambdas = when_on_single_line:warning +csharp_style_expression_bodied_local_functions = when_on_single_line:warning +csharp_style_expression_bodied_methods = when_on_single_line:warning +csharp_style_expression_bodied_operators = when_on_single_line:warning +csharp_style_expression_bodied_properties = when_on_single_line:warning +csharp_style_implicit_object_creation_when_type_is_apparent = true:warning +csharp_style_inlined_variable_declaration = false +csharp_style_namespace_declarations = file_scoped:warning +csharp_style_pattern_local_over_anonymous_function = true:warning +csharp_style_pattern_matching_over_as_with_null_check = true:warning +csharp_style_pattern_matching_over_is_with_cast_check = true:warning +csharp_style_prefer_index_operator = true:warning +csharp_style_prefer_not_pattern = true:warning +csharp_style_prefer_null_check_over_type_check = true +csharp_style_prefer_pattern_matching = true:warning +csharp_style_prefer_range_operator = true:warning +csharp_style_prefer_switch_expression = true:warning +csharp_style_throw_expression = true +csharp_style_unused_value_assignment_preference = discard_variable:warning +csharp_style_unused_value_expression_statement_preference = discard_variable:warning +csharp_style_var_elsewhere = false:warning +csharp_style_var_for_built_in_types = false:warning +csharp_style_var_when_type_is_apparent = false:warning +csharp_using_directive_placement = outside_namespace +dotnet_analyzer_diagnostic.category-Design.severity = error +dotnet_analyzer_diagnostic.category-Documentation.severity = error +dotnet_analyzer_diagnostic.category-Globalization.severity = none +dotnet_analyzer_diagnostic.category-Interoperability.severity = error +dotnet_analyzer_diagnostic.category-Maintainability.severity = error +dotnet_analyzer_diagnostic.category-Naming.severity = none +dotnet_analyzer_diagnostic.category-Performance.severity = none +dotnet_analyzer_diagnostic.category-Reliability.severity = error +dotnet_analyzer_diagnostic.category-Security.severity = error +dotnet_analyzer_diagnostic.category-SingleFile.severity = error +dotnet_analyzer_diagnostic.category-Style.severity = error +dotnet_analyzer_diagnostic.category-Usage.severity = error +dotnet_code_quality_unused_parameters = all +dotnet_code_quality_unused_parameters = non_public # IDE0060: Remove unused parameter +dotnet_code_quality.CAXXXX.api_surface = private, internal +dotnet_diagnostic.CA1001.severity = error # CA1001: Types that own disposable fields should be disposable +dotnet_diagnostic.CA1051.severity = error # CA1051: Do not declare visible instance fields +dotnet_diagnostic.CA1825.severity = warning # CA1823: Avoid zero-length array allocations +dotnet_diagnostic.CA1829.severity = warning # CA1829: Use Length/Count property instead of Count() when available +dotnet_diagnostic.CA1834.severity = warning # CA1834: Consider using 'StringBuilder.Append(char)' when applicable +dotnet_diagnostic.CA1860.severity = error # CA1860: Prefer comparing 'Count' to 0 rather than using 'Any()', both for clarity and for performance +dotnet_diagnostic.CA1861.severity = error # CA1861: Prefer 'static readonly' fields over constant array arguments +dotnet_diagnostic.CA1869.severity = error # CA1869: Avoid creating a new 'JsonSerializerOptions' instance for every serialization operation. Cache and reuse instances instead. +dotnet_diagnostic.CA2201.severity = none # CA2201: Exception type System.NullReferenceException is reserved by the runtime +dotnet_diagnostic.CA2254.severity = error # CA2254: The logging message template should not vary between calls to 'LoggerExtensions.LogInformation(ILogger, string?, params object?[])' +dotnet_diagnostic.IDE0001.severity = warning # IDE0001: Simplify name +dotnet_diagnostic.IDE0002.severity = warning # Simplify (member access) - System.Version.Equals("1", "2"); Version.Equals("1", "2"); +dotnet_diagnostic.IDE0004.severity = warning # IDE0004: Cast is redundant. +dotnet_diagnostic.IDE0005.severity = warning # Using directive is unnecessary +dotnet_diagnostic.IDE0010.severity = error # Add missing cases to switch statement (IDE0010) +dotnet_diagnostic.IDE0028.severity = error # IDE0028: Collection initialization can be simplified +dotnet_diagnostic.IDE0031.severity = warning # Use null propagation (IDE0031) +dotnet_diagnostic.IDE0047.severity = warning # IDE0047: Parentheses can be removed +dotnet_diagnostic.IDE0048.severity = error # Parentheses preferences (IDE0047 and IDE0048) +dotnet_diagnostic.IDE0049.severity = warning # Use language keywords instead of framework type names for type references (IDE0049) +dotnet_diagnostic.IDE0051.severity = error # Private member '' is unused [, ] +dotnet_diagnostic.IDE0060.severity = warning # IDE0060: Remove unused parameter +dotnet_diagnostic.IDE0130.severity = none # Namespace does not match folder structure (IDE0130) +dotnet_diagnostic.IDE0230.severity = warning # IDE0230: Use UTF-8 string literal +dotnet_diagnostic.IDE0290.severity = error # Use primary constructor [Distance]csharp(IDE0290) +dotnet_diagnostic.IDE0300.severity = error # IDE0300: Collection initialization can be simplified +dotnet_diagnostic.IDE0301.severity = error #IDE0301: Collection initialization can be simplified +dotnet_diagnostic.IDE0305.severity = none # IDE0305: Collection initialization can be simplified +dotnet_diagnostic.JSON002.severity = warning # JSON002: Probable JSON string detected +dotnet_naming_rule.abstract_method_should_be_pascal_case.severity = warning +dotnet_naming_rule.abstract_method_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.abstract_method_should_be_pascal_case.symbols = abstract_method +dotnet_naming_rule.class_should_be_pascal_case.severity = warning +dotnet_naming_rule.class_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.class_should_be_pascal_case.symbols = class +dotnet_naming_rule.delegate_should_be_pascal_case.severity = warning +dotnet_naming_rule.delegate_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.delegate_should_be_pascal_case.symbols = delegate +dotnet_naming_rule.enum_should_be_pascal_case.severity = warning +dotnet_naming_rule.enum_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.enum_should_be_pascal_case.symbols = enum +dotnet_naming_rule.event_should_be_pascal_case.severity = warning +dotnet_naming_rule.event_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.event_should_be_pascal_case.symbols = event +dotnet_naming_rule.interface_should_be_begins_with_i.severity = warning +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.method_should_be_pascal_case.severity = warning +dotnet_naming_rule.method_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.method_should_be_pascal_case.symbols = method +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = warning +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.private_method_should_be_pascal_case.severity = warning +dotnet_naming_rule.private_method_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.private_method_should_be_pascal_case.symbols = private_method +dotnet_naming_rule.private_or_internal_field_should_be_private_of_internal_field.severity = warning +dotnet_naming_rule.private_or_internal_field_should_be_private_of_internal_field.style = private_of_internal_field +dotnet_naming_rule.private_or_internal_field_should_be_private_of_internal_field.symbols = private_or_internal_field +dotnet_naming_rule.private_or_internal_static_field_should_be_private_of_internal_field.severity = warning +dotnet_naming_rule.private_or_internal_static_field_should_be_private_of_internal_field.style = private_of_internal_field +dotnet_naming_rule.private_or_internal_static_field_should_be_private_of_internal_field.symbols = private_or_internal_static_field +dotnet_naming_rule.property_should_be_pascal_case.severity = warning +dotnet_naming_rule.property_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.property_should_be_pascal_case.symbols = property +dotnet_naming_rule.public_or_protected_field_should_be_private_of_internal_field.severity = warning +dotnet_naming_rule.public_or_protected_field_should_be_private_of_internal_field.style = private_of_internal_field +dotnet_naming_rule.public_or_protected_field_should_be_private_of_internal_field.symbols = public_or_protected_field +dotnet_naming_rule.static_field_should_be_pascal_case.severity = warning +dotnet_naming_rule.static_field_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.static_field_should_be_pascal_case.symbols = static_field +dotnet_naming_rule.static_method_should_be_pascal_case.severity = warning +dotnet_naming_rule.static_method_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.static_method_should_be_pascal_case.symbols = static_method +dotnet_naming_rule.struct_should_be_pascal_case.severity = warning +dotnet_naming_rule.struct_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.struct_should_be_pascal_case.symbols = struct +dotnet_naming_rule.types_should_be_pascal_case.severity = warning +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_style.begins_with_i.capitalization = pascal_case +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.private_of_internal_field.capitalization = pascal_case +dotnet_naming_style.private_of_internal_field.required_prefix = _ +dotnet_naming_style.private_of_internal_field.required_suffix = +dotnet_naming_style.private_of_internal_field.word_separator = +dotnet_naming_symbols.abstract_method.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.abstract_method.applicable_kinds = method +dotnet_naming_symbols.abstract_method.required_modifiers = abstract +dotnet_naming_symbols.class.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.class.applicable_kinds = class +dotnet_naming_symbols.class.required_modifiers = +dotnet_naming_symbols.delegate.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.delegate.applicable_kinds = delegate +dotnet_naming_symbols.delegate.required_modifiers = +dotnet_naming_symbols.enum.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.enum.applicable_kinds = enum +dotnet_naming_symbols.enum.required_modifiers = +dotnet_naming_symbols.event.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.event.applicable_kinds = event +dotnet_naming_symbols.event.required_modifiers = +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.required_modifiers = +dotnet_naming_symbols.method.applicable_accessibilities = public +dotnet_naming_symbols.method.applicable_kinds = method +dotnet_naming_symbols.method.required_modifiers = +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.required_modifiers = +dotnet_naming_symbols.private_method.applicable_accessibilities = private +dotnet_naming_symbols.private_method.applicable_kinds = method +dotnet_naming_symbols.private_method.required_modifiers = +dotnet_naming_symbols.private_or_internal_field.applicable_accessibilities = internal, private, private_protected +dotnet_naming_symbols.private_or_internal_field.applicable_kinds = field +dotnet_naming_symbols.private_or_internal_field.required_modifiers = +dotnet_naming_symbols.private_or_internal_static_field.applicable_accessibilities = internal, private, private_protected +dotnet_naming_symbols.private_or_internal_static_field.applicable_kinds = field +dotnet_naming_symbols.private_or_internal_static_field.required_modifiers = static +dotnet_naming_symbols.property.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.property.applicable_kinds = property +dotnet_naming_symbols.property.required_modifiers = +dotnet_naming_symbols.public_or_protected_field.applicable_accessibilities = public, protected +dotnet_naming_symbols.public_or_protected_field.applicable_kinds = field +dotnet_naming_symbols.public_or_protected_field.required_modifiers = +dotnet_naming_symbols.static_field.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.static_field.applicable_kinds = field +dotnet_naming_symbols.static_field.required_modifiers = static +dotnet_naming_symbols.static_method.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.static_method.applicable_kinds = method +dotnet_naming_symbols.static_method.required_modifiers = static +dotnet_naming_symbols.struct.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.struct.applicable_kinds = struct +dotnet_naming_symbols.struct.required_modifiers = +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.required_modifiers = +dotnet_remove_unnecessary_suppression_exclusions = 0 +dotnet_separate_import_directive_groups = false +dotnet_sort_system_directives_first = false +dotnet_style_allow_multiple_blank_lines_experimental = false:warning +dotnet_style_allow_statement_immediately_after_block_experimental = true +dotnet_style_coalesce_expression = true +dotnet_style_collection_initializer = true:warning +dotnet_style_explicit_tuple_names = true:warning +dotnet_style_namespace_match_folder = true +dotnet_style_null_propagation = true:warning +dotnet_style_object_initializer = true:warning +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_operators = never_if_unnecessary +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity +dotnet_style_predefined_type_for_locals_parameters_members = true +dotnet_style_predefined_type_for_member_access = true:warning +dotnet_style_prefer_auto_properties = true:warning +dotnet_style_prefer_compound_assignment = true:warning +dotnet_style_prefer_conditional_expression_over_assignment = false +dotnet_style_prefer_conditional_expression_over_return = false +dotnet_style_prefer_inferred_anonymous_type_member_names = true:warning +dotnet_style_prefer_inferred_tuple_names = true:warning +dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning +dotnet_style_prefer_simplified_boolean_expressions = true:warning +dotnet_style_prefer_simplified_interpolation = true +dotnet_style_qualification_for_event = false:error +dotnet_style_qualification_for_field = false +dotnet_style_qualification_for_method = false:error +dotnet_style_qualification_for_property = false:error +dotnet_style_readonly_field = true:warning +dotnet_style_require_accessibility_modifiers = for_non_interface_members +end_of_line = crlf +file_header_template = unset +indent_size = 4 +indent_style = space +insert_final_newline = false +root = true +tab_width = 4 +# https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/ca1822 +# https://github.com/dotnet/aspnetcore/blob/main/.editorconfig +# https://github.com/dotnet/project-system/blob/main/.editorconfig \ No newline at end of file diff --git a/Distance/Models/Stateless/FaceEncodingLogic.cs b/Distance/Models/Stateless/FaceEncodingLogic.cs index 13d0912..a34c467 100644 --- a/Distance/Models/Stateless/FaceEncodingLogic.cs +++ b/Distance/Models/Stateless/FaceEncodingLogic.cs @@ -1,9 +1,9 @@ using System.Collections.ObjectModel; using System.Text.Json; using View_by_Distance.Shared.Models; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; -namespace View_by_Distance.Distance.Models.Stateless.Methods; +namespace View_by_Distance.Distance.Models.Stateless; internal static class FaceEncodingLogic { @@ -14,18 +14,18 @@ internal static class FaceEncodingLogic string? json; FaceEncoding? faceEncoding; ExifDirectory exifDirectory; - FaceRecognitionDotNet.FaceEncoding? encoding; + FaceRecognitionDotNet.Models.FaceEncoding? encoding; int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds); string message = $") Building Mapped with Encoding Face Files Collection - {totalSeconds} total second(s)"; compare.ConstructProgressBar(exifDirectories.Count, message); foreach (ExifDirectory e in exifDirectories) { compare.Tick(); - json = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(e); - faceEncoding = json is null ? null : JsonSerializer.Deserialize(json); + json = Metadata.Models.Stateless.IMetadata.GetFaceEncoding(e); + faceEncoding = json is null ? null : JsonSerializer.Deserialize(json, FaceEncodingGenerationContext.Default.FaceEncoding); if (faceEncoding is null) continue; - encoding = FaceRecognitionDotNet.FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding); + encoding = FaceRecognitionDotNet.Models.FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding); exifDirectory = ExifDirectory.Get(encoding, e); results.Add(exifDirectory); } diff --git a/Distance/Models/Stateless/FilterLogicA.cs b/Distance/Models/Stateless/FilterLogicA.cs index 383aba9..194c75a 100644 --- a/Distance/Models/Stateless/FilterLogicA.cs +++ b/Distance/Models/Stateless/FilterLogicA.cs @@ -2,9 +2,9 @@ using System.Collections.ObjectModel; using System.Text.Json; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Properties; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; -namespace View_by_Distance.Distance.Models.Stateless.Methods; +namespace View_by_Distance.Distance.Models.Stateless; internal static class FilterLogicA { @@ -41,8 +41,8 @@ internal static class FilterLogicA bool? isFocusPerson; bool? inSkipCollection; FaceEncoding? faceEncoding; - FaceRecognitionDotNet.FaceEncoding? encoding; ReadOnlyDictionary? keyValues; + FaceRecognitionDotNet.Models.FaceEncoding? encoding; List? wholePercentagesCollection; ReadOnlyCollection locationContainers = FilterLogicB.GetLocationContainers(distanceSettings, compareSettings, compare, ticks, exifDirectories, nameof(FilterLogicA)); int totalSeconds = (int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds); @@ -71,7 +71,7 @@ internal static class FilterLogicA continue; if (!string.IsNullOrEmpty(distanceSettings.FocusModel)) { - model = Metadata.Models.Stateless.Methods.IMetadata.GetModel(locationContainer.ExifDirectory); + model = Metadata.Models.Stateless.IMetadata.GetModel(locationContainer.ExifDirectory); if (string.IsNullOrEmpty(model) || !model.Contains(distanceSettings.FocusModel)) continue; } @@ -80,11 +80,11 @@ internal static class FilterLogicA if (!locationContainer.FilePath.DirectoryFullPath.Contains(distanceSettings.FocusDirectory)) continue; } - json = Metadata.Models.Stateless.Methods.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory); - faceEncoding = json is null ? null : JsonSerializer.Deserialize(json); + json = Metadata.Models.Stateless.IMetadata.GetFaceEncoding(locationContainer.ExifDirectory); + faceEncoding = json is null ? null : JsonSerializer.Deserialize(json, FaceEncodingGenerationContext.Default.FaceEncoding); if (faceEncoding is null) continue; - encoding = FaceRecognitionDotNet.FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding); + encoding = FaceRecognitionDotNet.Models.FaceRecognition.LoadFaceEncoding(faceEncoding.RawEncoding); results.Add(LocationContainer.Get(locationContainer, encoding, keepExifDirectory: false)); } return results.AsReadOnly(); diff --git a/Distance/Models/Stateless/FilterLogicB.cs b/Distance/Models/Stateless/FilterLogicB.cs index 6042e46..61e88bb 100644 --- a/Distance/Models/Stateless/FilterLogicB.cs +++ b/Distance/Models/Stateless/FilterLogicB.cs @@ -3,9 +3,9 @@ using System.Drawing; using System.Text.Json; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Properties; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; -namespace View_by_Distance.Distance.Models.Stateless.Methods; +namespace View_by_Distance.Distance.Models.Stateless; internal static class FilterLogicB { @@ -30,7 +30,7 @@ internal static class FilterLogicB MoveUnableToMatch(exifDirectory.FilePath); return; } - json = Metadata.Models.Stateless.Methods.IMetadata.GetOutputResolution(exifDirectory); + json = Metadata.Models.Stateless.IMetadata.GetOutputResolution(exifDirectory); if (json is null || !json.Contains(nameof(DateTime))) { if (distanceSettings.DistanceMoveUnableToMatch) @@ -44,7 +44,7 @@ internal static class FilterLogicB MoveUnableToMatch(exifDirectory.FilePath); return; } - RectangleF? rectangle = Shared.Models.Stateless.Methods.ILocation.GetPercentagesRectangle(distanceSettings, wholePercentages.Value); + RectangleF? rectangle = Shared.Models.Stateless.ILocation.GetPercentagesRectangle(distanceSettings, wholePercentages.Value); if (rectangle is null) return; LocationContainer locationContainer = new(dateOnly, diff --git a/Distance/Models/Stateless/FilterLogicC.cs b/Distance/Models/Stateless/FilterLogicC.cs index dde92d0..f85850f 100644 --- a/Distance/Models/Stateless/FilterLogicC.cs +++ b/Distance/Models/Stateless/FilterLogicC.cs @@ -1,9 +1,9 @@ using System.Collections.ObjectModel; using View_by_Distance.Metadata.Models; using View_by_Distance.Shared.Models; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; -namespace View_by_Distance.Distance.Models.Stateless.Methods; +namespace View_by_Distance.Distance.Models.Stateless; internal static class FilterLogicC { @@ -47,7 +47,7 @@ internal static class FilterLogicC compare.Tick(); if (locationContainer.FilePath.Id is null) continue; - collection = FaceRecognitionDotNet.FaceRecognition.GetLocationContainers(distanceSettings.FaceDistancePermyriad, locationContainers, locationContainer); + collection = FaceRecognitionDotNet.Models.FaceRecognition.GetLocationContainers(distanceSettings.FaceDistancePermyriad, locationContainers, locationContainer); foreach (LocationContainer l in collection) { // if (locationContainer.FilePath.Id == -626078035 && l.FilePath.Id == -626078035) diff --git a/Distance/Models/Stateless/FilterLogicD.cs b/Distance/Models/Stateless/FilterLogicD.cs index 575a634..70cd99a 100644 --- a/Distance/Models/Stateless/FilterLogicD.cs +++ b/Distance/Models/Stateless/FilterLogicD.cs @@ -3,10 +3,10 @@ using System.Collections.ObjectModel; using View_by_Distance.Metadata.Models; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Properties; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; using WindowsShortcutFactory; -namespace View_by_Distance.Distance.Models.Stateless.Methods; +namespace View_by_Distance.Distance.Models.Stateless; internal static class FilterLogicD { @@ -27,24 +27,24 @@ internal static class FilterLogicD { isByMapping = false; isBySorting = !sortingContainersAny; - byValue = $"{nameof(Shared.Models.Stateless.IMapLogic.Mapping)}Null"; + byValue = $"{nameof(IMapLogic.Mapping)}Null"; } else { - isByMapping = by == Shared.Models.Stateless.IMapLogic.Mapping; - isBySorting = by == Shared.Models.Stateless.IMapLogic.Sorting; + isByMapping = by == IMapLogic.Mapping; + isBySorting = by == IMapLogic.Sorting; bool isDefaultName = displayDirectoryName is not null && IPerson.IsDefaultName(displayDirectoryName); if (isBySorting && displayDirectoryName is null) - byValue = saveIndividually ? nameof(Shared.Models.Stateless.IMapLogic.Individually) : $"{nameof(Shared.Models.Stateless.IMapLogic.Sorting)} Without Person{(distancePermyriad < 2000 ? "-A" : "-Z")}"; + byValue = saveIndividually ? nameof(IMapLogic.Individually) : $"{nameof(IMapLogic.Sorting)} Without Person{(distancePermyriad < 2000 ? "-A" : "-Z")}"; else if (isBySorting && useFiltersCounter.HasValue) - byValue = $"{nameof(Shared.Models.Stateless.IMapLogic.Sorting)}{(!isDefaultName ? "-A" : "-Z")} Modified Filters - {useFiltersCounter.Value}"; + byValue = $"{nameof(IMapLogic.Sorting)}{(!isDefaultName ? "-A" : "-Z")} Modified Filters - {useFiltersCounter.Value}"; else { byValue = $"{by.Value switch { - Shared.Models.Stateless.IMapLogic.Mapping => nameof(Shared.Models.Stateless.IMapLogic.Mapping), - Shared.Models.Stateless.IMapLogic.Sorting => saveIndividually ? nameof(Shared.Models.Stateless.IMapLogic.Individually) : nameof(Shared.Models.Stateless.IMapLogic.Sorting), - Shared.Models.Stateless.IMapLogic.ForceSingleImage => forceSingleImageHumanized, + IMapLogic.Mapping => nameof(IMapLogic.Mapping), + IMapLogic.Sorting => saveIndividually ? nameof(IMapLogic.Individually) : nameof(IMapLogic.Sorting), + IMapLogic.ForceSingleImage => forceSingleImageHumanized, _ => throw new NotImplementedException() }}{(!isDefaultName ? "-A" : "-Z")}"; } @@ -54,7 +54,7 @@ internal static class FilterLogicD } private static RecordB Get(int? useFiltersCounter, bool saveIndividually, bool sortingContainersAny, string forceSingleImageHumanized, int? distancePermyriad, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName) => - Get(useFiltersCounter, saveIndividually, sortingContainersAny, forceSingleImageHumanized, distancePermyriad, personKeyFormattedAndKeyTicksAndDisplayDirectoryName is null ? null : Shared.Models.Stateless.IMapLogic.Mapping, personKeyFormattedAndKeyTicksAndDisplayDirectoryName?.DisplayDirectoryName); + Get(useFiltersCounter, saveIndividually, sortingContainersAny, forceSingleImageHumanized, distancePermyriad, personKeyFormattedAndKeyTicksAndDisplayDirectoryName is null ? null : IMapLogic.Mapping, personKeyFormattedAndKeyTicksAndDisplayDirectoryName?.DisplayDirectoryName); private static RecordC Get(string eDistanceContentTicksDirectory, RecordB recordB, PersonKeyFormattedAndKeyTicksAndDisplayDirectoryName? personKeyFormattedAndKeyTicksAndDisplayDirectoryName, string segmentB) { @@ -130,7 +130,7 @@ internal static class FilterLogicD string d2FacePartsContentDirectory = Path.Combine(d2ResultsFullGroupDirectory, resultSettings.ResultContent); if (!Directory.Exists(d2FacePartsContentDirectory)) _ = Directory.CreateDirectory(d2FacePartsContentDirectory); - string forceSingleImageHumanized = nameof(Shared.Models.Stateless.IMapLogic.ForceSingleImage).Humanize(LetterCasing.Title); + string forceSingleImageHumanized = nameof(IMapLogic.ForceSingleImage).Humanize(LetterCasing.Title); string message = $") Building Save Container Collection - {(int)Math.Floor(new TimeSpan(DateTime.Now.Ticks - ticks).TotalSeconds)} total second(s)"; compare.ConstructProgressBar(onlyOne.Count, message); foreach (KeyValuePair keyValuePair in onlyOne) diff --git a/Distance/Models/Stateless/Methods/IDistance.cs b/Distance/Models/Stateless/IDistance.cs similarity index 98% rename from Distance/Models/Stateless/Methods/IDistance.cs rename to Distance/Models/Stateless/IDistance.cs index 89a0d2a..eac1a4e 100644 --- a/Distance/Models/Stateless/Methods/IDistance.cs +++ b/Distance/Models/Stateless/IDistance.cs @@ -2,9 +2,9 @@ using System.Collections.ObjectModel; using View_by_Distance.Metadata.Models; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Properties; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; -namespace View_by_Distance.Distance.Models.Stateless.Methods; +namespace View_by_Distance.Distance.Models.Stateless; public interface IDistance { diff --git a/Distance/Models/Stateless/MappedLogicA.cs b/Distance/Models/Stateless/MappedLogicA.cs index b66acad..eb4a9a3 100644 --- a/Distance/Models/Stateless/MappedLogicA.cs +++ b/Distance/Models/Stateless/MappedLogicA.cs @@ -1,11 +1,11 @@ using System.Collections.ObjectModel; using View_by_Distance.Metadata.Models; -using View_by_Distance.Metadata.Models.Stateless.Methods; +using View_by_Distance.Metadata.Models.Stateless; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Properties; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; -namespace View_by_Distance.Distance.Models.Stateless.Methods; +namespace View_by_Distance.Distance.Models.Stateless; internal static class MappedLogicA { diff --git a/Distance/Models/Stateless/MappedLogicB.cs b/Distance/Models/Stateless/MappedLogicB.cs index c74204f..3180c70 100644 --- a/Distance/Models/Stateless/MappedLogicB.cs +++ b/Distance/Models/Stateless/MappedLogicB.cs @@ -4,9 +4,9 @@ using System.Diagnostics; using System.Globalization; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Properties; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; -namespace View_by_Distance.Distance.Models.Stateless.Methods; +namespace View_by_Distance.Distance.Models.Stateless; internal static class MappedLogicB { diff --git a/Face/Models/Stateless/Face.cs b/Face/Models/Stateless/Face.cs index 3e038bc..380ef9f 100644 --- a/Face/Models/Stateless/Face.cs +++ b/Face/Models/Stateless/Face.cs @@ -1,11 +1,11 @@ using System.Collections.ObjectModel; using View_by_Distance.Metadata.Models; -using View_by_Distance.Metadata.Models.Stateless.Methods; +using View_by_Distance.Metadata.Models.Stateless; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Properties; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; -namespace View_by_Distance.Face.Models.Stateless.Methods; +namespace View_by_Distance.Face.Models.Stateless; internal static class Face { diff --git a/Face/Models/Stateless/Methods/IFace.cs b/Face/Models/Stateless/IFace.cs similarity index 89% rename from Face/Models/Stateless/Methods/IFace.cs rename to Face/Models/Stateless/IFace.cs index 04c2962..f334292 100644 --- a/Face/Models/Stateless/Methods/IFace.cs +++ b/Face/Models/Stateless/IFace.cs @@ -1,9 +1,9 @@ using System.Collections.ObjectModel; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Properties; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; -namespace View_by_Distance.Face.Models.Stateless.Methods; +namespace View_by_Distance.Face.Models.Stateless; public interface IFace { diff --git a/FaceRecognitionDotNet/Dlib/Python/CnnFaceDetectionModelV1.cs b/FaceRecognitionDotNet/Dlib/Python/CnnFaceDetectionModelV1.cs index 0cf15e8..ca41c75 100644 --- a/FaceRecognitionDotNet/Dlib/Python/CnnFaceDetectionModelV1.cs +++ b/FaceRecognitionDotNet/Dlib/Python/CnnFaceDetectionModelV1.cs @@ -1,5 +1,6 @@ using DlibDotNet; using DlibDotNet.Dnn; +using View_by_Distance.FaceRecognitionDotNet.Models; using View_by_Distance.Shared.Models.Stateless; namespace View_by_Distance.FaceRecognitionDotNet.Dlib.Python; diff --git a/FaceRecognitionDotNet/Dlib/Python/FaceRecognitionModelV1.cs b/FaceRecognitionDotNet/Dlib/Python/FaceRecognitionModelV1.cs index 3f6d155..549a989 100644 --- a/FaceRecognitionDotNet/Dlib/Python/FaceRecognitionModelV1.cs +++ b/FaceRecognitionDotNet/Dlib/Python/FaceRecognitionModelV1.cs @@ -1,5 +1,6 @@ using DlibDotNet; using DlibDotNet.Dnn; +using View_by_Distance.FaceRecognitionDotNet.Models; namespace View_by_Distance.FaceRecognitionDotNet.Dlib.Python; diff --git a/FaceRecognitionDotNet/Dlib/Python/SimpleObjectDetector.cs b/FaceRecognitionDotNet/Dlib/Python/SimpleObjectDetector.cs index 4f6b544..5bdeddf 100644 --- a/FaceRecognitionDotNet/Dlib/Python/SimpleObjectDetector.cs +++ b/FaceRecognitionDotNet/Dlib/Python/SimpleObjectDetector.cs @@ -1,4 +1,5 @@ using DlibDotNet; +using View_by_Distance.FaceRecognitionDotNet.Models; using View_by_Distance.Shared.Models.Stateless; namespace View_by_Distance.FaceRecognitionDotNet.Dlib.Python; diff --git a/FaceRecognitionDotNet/Extensions/FaceDetector.cs b/FaceRecognitionDotNet/Extensions/FaceDetector.cs index d04b035..7347dbc 100644 --- a/FaceRecognitionDotNet/Extensions/FaceDetector.cs +++ b/FaceRecognitionDotNet/Extensions/FaceDetector.cs @@ -1,4 +1,5 @@ using DlibDotNet; +using View_by_Distance.FaceRecognitionDotNet.Models; using View_by_Distance.Shared.Models; namespace View_by_Distance.FaceRecognitionDotNet.Extensions; diff --git a/FaceRecognitionDotNet/Extensions/FaceLandmarkDetector.cs b/FaceRecognitionDotNet/Extensions/FaceLandmarkDetector.cs index a222887..58fcc00 100644 --- a/FaceRecognitionDotNet/Extensions/FaceLandmarkDetector.cs +++ b/FaceRecognitionDotNet/Extensions/FaceLandmarkDetector.cs @@ -1,4 +1,5 @@ using DlibDotNet; +using View_by_Distance.FaceRecognitionDotNet.Models; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Stateless; diff --git a/FaceRecognitionDotNet/DisposableObject.cs b/FaceRecognitionDotNet/Models/DisposableObject.cs similarity index 97% rename from FaceRecognitionDotNet/DisposableObject.cs rename to FaceRecognitionDotNet/Models/DisposableObject.cs index 9a37cbc..5680f47 100644 --- a/FaceRecognitionDotNet/DisposableObject.cs +++ b/FaceRecognitionDotNet/Models/DisposableObject.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.FaceRecognitionDotNet; +namespace View_by_Distance.FaceRecognitionDotNet.Models; /// /// Represents a class which has managed or unmanaged resources. diff --git a/FaceRecognitionDotNet/FaceEncoding.cs b/FaceRecognitionDotNet/Models/FaceEncoding.cs similarity index 98% rename from FaceRecognitionDotNet/FaceEncoding.cs rename to FaceRecognitionDotNet/Models/FaceEncoding.cs index fad24b3..23a6485 100644 --- a/FaceRecognitionDotNet/FaceEncoding.cs +++ b/FaceRecognitionDotNet/Models/FaceEncoding.cs @@ -1,7 +1,7 @@ using DlibDotNet; using System.Runtime.Serialization; -namespace View_by_Distance.FaceRecognitionDotNet; +namespace View_by_Distance.FaceRecognitionDotNet.Models; /// /// Represents a feature data of face. This class cannot be inherited. diff --git a/FaceRecognitionDotNet/FaceRecognition.cs b/FaceRecognitionDotNet/Models/FaceRecognition.cs similarity index 99% rename from FaceRecognitionDotNet/FaceRecognition.cs rename to FaceRecognitionDotNet/Models/FaceRecognition.cs index fd99e78..17da8bf 100644 --- a/FaceRecognitionDotNet/FaceRecognition.cs +++ b/FaceRecognitionDotNet/Models/FaceRecognition.cs @@ -8,9 +8,8 @@ using View_by_Distance.FaceRecognitionDotNet.Dlib.Python; using View_by_Distance.FaceRecognitionDotNet.Extensions; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Stateless; -using View_by_Distance.Shared.Models.Stateless.Methods; -namespace View_by_Distance.FaceRecognitionDotNet; +namespace View_by_Distance.FaceRecognitionDotNet.Models; public class FaceRecognition : DisposableObject { diff --git a/FaceRecognitionDotNet/FaceRecognitionGroup.cs b/FaceRecognitionDotNet/Models/FaceRecognitionGroup.cs similarity index 79% rename from FaceRecognitionDotNet/FaceRecognitionGroup.cs rename to FaceRecognitionDotNet/Models/FaceRecognitionGroup.cs index 390ec6b..5df5802 100644 --- a/FaceRecognitionDotNet/FaceRecognitionGroup.cs +++ b/FaceRecognitionDotNet/Models/FaceRecognitionGroup.cs @@ -1,6 +1,6 @@ using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Stateless; -namespace View_by_Distance.FaceRecognitionDotNet; +namespace View_by_Distance.FaceRecognitionDotNet.Models; public record FaceRecognitionGroup(Location Location, FaceEncoding? FaceEncoding, Dictionary? KeyValuePairs); \ No newline at end of file diff --git a/FaceRecognitionDotNet/FaceRecognitionModels.cs b/FaceRecognitionDotNet/Models/FaceRecognitionModels.cs similarity index 93% rename from FaceRecognitionDotNet/FaceRecognitionModels.cs rename to FaceRecognitionDotNet/Models/FaceRecognitionModels.cs index 91d1bf8..a9e7728 100644 --- a/FaceRecognitionDotNet/FaceRecognitionModels.cs +++ b/FaceRecognitionDotNet/Models/FaceRecognitionModels.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.FaceRecognitionDotNet; +namespace View_by_Distance.FaceRecognitionDotNet.Models; internal sealed class FaceRecognitionModels { diff --git a/FaceRecognitionDotNet/Image.cs b/FaceRecognitionDotNet/Models/Image.cs similarity index 98% rename from FaceRecognitionDotNet/Image.cs rename to FaceRecognitionDotNet/Models/Image.cs index 7c61e40..4c96b71 100644 --- a/FaceRecognitionDotNet/Image.cs +++ b/FaceRecognitionDotNet/Models/Image.cs @@ -3,7 +3,7 @@ using DlibDotNet.Extensions; using System.Drawing; using View_by_Distance.Shared.Models.Stateless; -namespace View_by_Distance.FaceRecognitionDotNet; +namespace View_by_Distance.FaceRecognitionDotNet.Models; /// /// Represents a image data. This class cannot be inherited. diff --git a/FaceRecognitionDotNet/ModelParameter.cs b/FaceRecognitionDotNet/Models/ModelParameter.cs similarity index 94% rename from FaceRecognitionDotNet/ModelParameter.cs rename to FaceRecognitionDotNet/Models/ModelParameter.cs index 7443b8e..670d536 100644 --- a/FaceRecognitionDotNet/ModelParameter.cs +++ b/FaceRecognitionDotNet/Models/ModelParameter.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.FaceRecognitionDotNet; +namespace View_by_Distance.FaceRecognitionDotNet.Models; /// /// Describes the model binary datum. This class cannot be inherited. diff --git a/FaceRecognitionDotNet/Point.cs b/FaceRecognitionDotNet/Models/Point.cs similarity index 98% rename from FaceRecognitionDotNet/Point.cs rename to FaceRecognitionDotNet/Models/Point.cs index 2942b7b..521ed86 100644 --- a/FaceRecognitionDotNet/Point.cs +++ b/FaceRecognitionDotNet/Models/Point.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.FaceRecognitionDotNet; +namespace View_by_Distance.FaceRecognitionDotNet.Models; /// /// Represents an ordered pair of integer x- and y-coordinates that defines a point in a two-dimensional plane. diff --git a/Metadata/Models/A_Metadata.cs b/Metadata/Models/A_Metadata.cs index 744fee6..002c8f3 100644 --- a/Metadata/Models/A_Metadata.cs +++ b/Metadata/Models/A_Metadata.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using System.Text.Json; using View_by_Distance.Metadata.Models.Stateless; using View_by_Distance.Shared.Models; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; namespace View_by_Distance.Metadata.Models; diff --git a/Metadata/Models/Stateless/Base.cs b/Metadata/Models/Stateless/Base.cs index ed7dcbb..ac931da 100644 --- a/Metadata/Models/Stateless/Base.cs +++ b/Metadata/Models/Stateless/Base.cs @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using View_by_Distance.Shared.Models; -namespace View_by_Distance.Metadata.Models.Stateless.Methods; +namespace View_by_Distance.Metadata.Models.Stateless; internal static class Base { diff --git a/Metadata/Models/Stateless/Dimensions.cs b/Metadata/Models/Stateless/Dimensions.cs index fd53715..26522d2 100644 --- a/Metadata/Models/Stateless/Dimensions.cs +++ b/Metadata/Models/Stateless/Dimensions.cs @@ -1,6 +1,6 @@ using System.Drawing; -namespace View_by_Distance.Metadata.Models.Stateless.Methods; +namespace View_by_Distance.Metadata.Models.Stateless; internal static class Dimensions { diff --git a/Metadata/Models/Stateless/Exif.cs b/Metadata/Models/Stateless/Exif.cs index 1ede00f..feeb51a 100644 --- a/Metadata/Models/Stateless/Exif.cs +++ b/Metadata/Models/Stateless/Exif.cs @@ -2,7 +2,7 @@ using MetadataExtractor; using MetadataExtractor.Formats.Exif; using MetadataExtractor.Formats.Exif.Makernotes; using System.Globalization; -using View_by_Distance.Metadata.Models.Stateless.Methods; +using View_by_Distance.Metadata.Models.Stateless; namespace View_by_Distance.Metadata.Models.Stateless; diff --git a/Metadata/Models/Stateless/Face.cs b/Metadata/Models/Stateless/Face.cs index 8cb08b1..76667a9 100644 --- a/Metadata/Models/Stateless/Face.cs +++ b/Metadata/Models/Stateless/Face.cs @@ -1,6 +1,6 @@ using View_by_Distance.Shared.Models; -namespace View_by_Distance.Metadata.Models.Stateless.Methods; +namespace View_by_Distance.Metadata.Models.Stateless; internal static class Face { diff --git a/Metadata/Models/Stateless/GPS.cs b/Metadata/Models/Stateless/GPS.cs index 8bec4f5..1483ddd 100644 --- a/Metadata/Models/Stateless/GPS.cs +++ b/Metadata/Models/Stateless/GPS.cs @@ -1,5 +1,5 @@ using MetadataExtractor; -using View_by_Distance.Metadata.Models.Stateless.Methods; +using View_by_Distance.Metadata.Models.Stateless; using View_by_Distance.Shared.Models; namespace View_by_Distance.Metadata.Models.Stateless; diff --git a/Metadata/Models/Stateless/Get.cs b/Metadata/Models/Stateless/Get.cs index f83f32e..f0df236 100644 --- a/Metadata/Models/Stateless/Get.cs +++ b/Metadata/Models/Stateless/Get.cs @@ -1,9 +1,9 @@ using System.Collections.ObjectModel; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Properties; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; -namespace View_by_Distance.Metadata.Models.Stateless.Methods; +namespace View_by_Distance.Metadata.Models.Stateless; internal static class Get { diff --git a/Metadata/Models/Stateless/Methods/IMetadata.cs b/Metadata/Models/Stateless/IMetadata.cs similarity index 97% rename from Metadata/Models/Stateless/Methods/IMetadata.cs rename to Metadata/Models/Stateless/IMetadata.cs index d3add4c..9e81d42 100644 --- a/Metadata/Models/Stateless/Methods/IMetadata.cs +++ b/Metadata/Models/Stateless/IMetadata.cs @@ -2,9 +2,9 @@ using MetadataExtractor; using System.Collections.ObjectModel; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Properties; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; -namespace View_by_Distance.Metadata.Models.Stateless.Methods; +namespace View_by_Distance.Metadata.Models.Stateless; public interface IMetadata { diff --git a/People/Models/Stateless/Methods/IPeople.cs b/People/Models/Stateless/IPeople.cs similarity index 98% rename from People/Models/Stateless/Methods/IPeople.cs rename to People/Models/Stateless/IPeople.cs index b86a01e..d67b506 100644 --- a/People/Models/Stateless/Methods/IPeople.cs +++ b/People/Models/Stateless/IPeople.cs @@ -2,7 +2,7 @@ using System.Collections.ObjectModel; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Properties; -namespace View_by_Distance.People.Models.Stateless.Methods; +namespace View_by_Distance.People.Models.Stateless; public interface IPeople { diff --git a/People/Models/Stateless/People.cs b/People/Models/Stateless/People.cs index b8a0259..0b37a12 100644 --- a/People/Models/Stateless/People.cs +++ b/People/Models/Stateless/People.cs @@ -3,10 +3,10 @@ using System.Globalization; using View_by_Distance.Metadata.Models; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Properties; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; using WindowsShortcutFactory; -namespace View_by_Distance.People.Models.Stateless.Methods; +namespace View_by_Distance.People.Models.Stateless; internal static class People { diff --git a/People/Models/Stateless/ReadOnlyCollectionsLogic.cs b/People/Models/Stateless/ReadOnlyCollectionsLogic.cs index 563f85e..01bf8ab 100644 --- a/People/Models/Stateless/ReadOnlyCollectionsLogic.cs +++ b/People/Models/Stateless/ReadOnlyCollectionsLogic.cs @@ -2,9 +2,9 @@ using System.Collections.ObjectModel; using View_by_Distance.Metadata.Models; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Properties; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; -namespace View_by_Distance.People.Models.Stateless.Methods; +namespace View_by_Distance.People.Models.Stateless; internal static class ReadOnlyCollectionsLogic { diff --git a/Rename/Rename.cs b/Rename/Rename.cs index 0a74b54..3a4fd65 100644 --- a/Rename/Rename.cs +++ b/Rename/Rename.cs @@ -8,11 +8,11 @@ using System.Drawing.Imaging; using System.Runtime.InteropServices; using System.Text.Json; using View_by_Distance.Metadata.Models; -using View_by_Distance.Metadata.Models.Stateless.Methods; +using View_by_Distance.Metadata.Models.Stateless; using View_by_Distance.Rename.Models; using View_by_Distance.Shared.Models; using View_by_Distance.Shared.Models.Properties; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; namespace View_by_Distance.Rename; diff --git a/Shared/Models/FilePath.cs b/Shared/Models/FilePath.cs index 51d2c46..d65bb08 100644 --- a/Shared/Models/FilePath.cs +++ b/Shared/Models/FilePath.cs @@ -1,6 +1,6 @@ using System.Text.Json; using System.Text.Json.Serialization; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; namespace View_by_Distance.Shared.Models; diff --git a/Shared/Models/Location.cs b/Shared/Models/Location.cs index 16cc716..46ec648 100644 --- a/Shared/Models/Location.cs +++ b/Shared/Models/Location.cs @@ -42,7 +42,7 @@ public class Location(int bottom, double confidence, int left, int right, int to public static Location Get(int bottom, double confidence, int height, int left, int right, int top, int width, int zCount) { Location result = new(bottom, confidence, left, right, top); - _ = Stateless.Methods.Location.Check(bottom, height, left, right, top, width, zCount, throwException: true); + _ = Stateless.Location.Check(bottom, height, left, right, top, width, zCount, throwException: true); return result; } diff --git a/Shared/Models/PersonContainer.cs b/Shared/Models/PersonContainer.cs index 6dc4526..a8f1300 100644 --- a/Shared/Models/PersonContainer.cs +++ b/Shared/Models/PersonContainer.cs @@ -1,6 +1,7 @@ using System.Collections.ObjectModel; using System.Text.Json; using System.Text.Json.Serialization; +using View_by_Distance.Shared.Models.Stateless; namespace View_by_Distance.Shared.Models; @@ -22,7 +23,7 @@ public record PersonContainer(int? ApproximateYears, new(approximateYears, birthdays, displayDirectoryAllFilePaths, displayDirectoryName, key, personDirectory); public static PersonContainer Get(char[] personCharacters, PersonBirthday birthday, string displayDirectoryName, PersonDirectory personDirectory) => - new(Stateless.Methods.IAge.GetApproximateYears(personCharacters, displayDirectoryName), [birthday], new([]), displayDirectoryName, birthday.Value.Ticks, personDirectory); + new(IAge.GetApproximateYears(personCharacters, displayDirectoryName), [birthday], new([]), displayDirectoryName, birthday.Value.Ticks, personDirectory); public static PersonContainer Get(int? approximateYears, PersonBirthday birthdays, string displayDirectoryName, long key) => new(approximateYears, [birthdays], new([]), displayDirectoryName, key, null); diff --git a/Shared/Models/Stateless/Methods/Age.cs b/Shared/Models/Stateless/Age.cs similarity index 95% rename from Shared/Models/Stateless/Methods/Age.cs rename to Shared/Models/Stateless/Age.cs index 869ab18..e71380b 100644 --- a/Shared/Models/Stateless/Methods/Age.cs +++ b/Shared/Models/Stateless/Age.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; internal abstract class Age { diff --git a/Shared/Models/Stateless/Console.cs b/Shared/Models/Stateless/Console.cs index 892eb55..0f526ce 100644 --- a/Shared/Models/Stateless/Console.cs +++ b/Shared/Models/Stateless/Console.cs @@ -1,4 +1,4 @@ -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; namespace View_by_Distance.Shared.Models; diff --git a/Shared/Models/Stateless/Methods/IAge.cs b/Shared/Models/Stateless/IAge.cs similarity index 94% rename from Shared/Models/Stateless/Methods/IAge.cs rename to Shared/Models/Stateless/IAge.cs index c022bd9..9fd590c 100644 --- a/Shared/Models/Stateless/Methods/IAge.cs +++ b/Shared/Models/Stateless/IAge.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; public interface IAge { // ... diff --git a/Shared/Models/Stateless/Methods/ICompare.cs b/Shared/Models/Stateless/ICompare.cs similarity index 64% rename from Shared/Models/Stateless/Methods/ICompare.cs rename to Shared/Models/Stateless/ICompare.cs index 59fd4f3..a7e362c 100644 --- a/Shared/Models/Stateless/Methods/ICompare.cs +++ b/Shared/Models/Stateless/ICompare.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; public interface ICompare { diff --git a/Shared/Models/Stateless/Methods/IConsole.cs b/Shared/Models/Stateless/IConsole.cs similarity index 57% rename from Shared/Models/Stateless/Methods/IConsole.cs rename to Shared/Models/Stateless/IConsole.cs index 80f46e0..4f204f3 100644 --- a/Shared/Models/Stateless/Methods/IConsole.cs +++ b/Shared/Models/Stateless/IConsole.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; public interface IConsole { diff --git a/Shared/Models/Stateless/Methods/IDate.cs b/Shared/Models/Stateless/IDate.cs similarity index 94% rename from Shared/Models/Stateless/Methods/IDate.cs rename to Shared/Models/Stateless/IDate.cs index 1560644..c7acfd0 100644 --- a/Shared/Models/Stateless/Methods/IDate.cs +++ b/Shared/Models/Stateless/IDate.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; public interface IDate { diff --git a/Shared/Models/Stateless/Methods/IId.cs b/Shared/Models/Stateless/IId.cs similarity index 98% rename from Shared/Models/Stateless/Methods/IId.cs rename to Shared/Models/Stateless/IId.cs index 4780def..243b73e 100644 --- a/Shared/Models/Stateless/Methods/IId.cs +++ b/Shared/Models/Stateless/IId.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; public interface IId { diff --git a/Shared/Models/Stateless/Methods/ILocation.cs b/Shared/Models/Stateless/ILocation.cs similarity index 94% rename from Shared/Models/Stateless/Methods/ILocation.cs rename to Shared/Models/Stateless/ILocation.cs index 993d6de..6967d47 100644 --- a/Shared/Models/Stateless/Methods/ILocation.cs +++ b/Shared/Models/Stateless/ILocation.cs @@ -1,6 +1,6 @@ using System.Drawing; -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; public interface ILocation { diff --git a/Shared/Models/Stateless/Methods/IMapping.cs b/Shared/Models/Stateless/IMapping.cs similarity index 96% rename from Shared/Models/Stateless/Methods/IMapping.cs rename to Shared/Models/Stateless/IMapping.cs index 1e909bb..bc9cb8d 100644 --- a/Shared/Models/Stateless/Methods/IMapping.cs +++ b/Shared/Models/Stateless/IMapping.cs @@ -1,6 +1,6 @@ using View_by_Distance.Shared.Models.Properties; -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; public interface IMapping { // ... diff --git a/Shared/Models/Stateless/Methods/IPath.cs b/Shared/Models/Stateless/IPath.cs similarity index 98% rename from Shared/Models/Stateless/Methods/IPath.cs rename to Shared/Models/Stateless/IPath.cs index e8ebb1f..a48af84 100644 --- a/Shared/Models/Stateless/Methods/IPath.cs +++ b/Shared/Models/Stateless/IPath.cs @@ -1,6 +1,6 @@ using System.Collections.ObjectModel; -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; public interface IPath { // ... diff --git a/Shared/Models/Stateless/Methods/IPerson.cs b/Shared/Models/Stateless/IPerson.cs similarity index 97% rename from Shared/Models/Stateless/Methods/IPerson.cs rename to Shared/Models/Stateless/IPerson.cs index 7e26d31..28af0de 100644 --- a/Shared/Models/Stateless/Methods/IPerson.cs +++ b/Shared/Models/Stateless/IPerson.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; public interface IPerson { diff --git a/Shared/Models/Stateless/Methods/IPersonBirthday.cs b/Shared/Models/Stateless/IPersonBirthday.cs similarity index 99% rename from Shared/Models/Stateless/Methods/IPersonBirthday.cs rename to Shared/Models/Stateless/IPersonBirthday.cs index f9401ad..4b9be43 100644 --- a/Shared/Models/Stateless/Methods/IPersonBirthday.cs +++ b/Shared/Models/Stateless/IPersonBirthday.cs @@ -1,6 +1,6 @@ using System.Globalization; -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; public interface IPersonBirthday { diff --git a/Shared/Models/Stateless/Methods/IRename.cs b/Shared/Models/Stateless/IRename.cs similarity index 85% rename from Shared/Models/Stateless/Methods/IRename.cs rename to Shared/Models/Stateless/IRename.cs index a4f2715..2b666de 100644 --- a/Shared/Models/Stateless/Methods/IRename.cs +++ b/Shared/Models/Stateless/IRename.cs @@ -1,7 +1,7 @@ using System.Collections.ObjectModel; using View_by_Distance.Shared.Models.Properties; -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; public interface IRename { diff --git a/Shared/Models/Stateless/Methods/IResult.cs b/Shared/Models/Stateless/IResult.cs similarity index 98% rename from Shared/Models/Stateless/Methods/IResult.cs rename to Shared/Models/Stateless/IResult.cs index 5753c52..c0b9090 100644 --- a/Shared/Models/Stateless/Methods/IResult.cs +++ b/Shared/Models/Stateless/IResult.cs @@ -1,4 +1,4 @@ -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; public interface IResult { diff --git a/Shared/Models/Stateless/Id.cs b/Shared/Models/Stateless/Id.cs index 499d45a..f2e65fc 100644 --- a/Shared/Models/Stateless/Id.cs +++ b/Shared/Models/Stateless/Id.cs @@ -1,5 +1,5 @@ using System.Text; -using View_by_Distance.Shared.Models.Stateless.Methods; +using View_by_Distance.Shared.Models.Stateless; namespace View_by_Distance.Shared.Models.Stateless; diff --git a/Shared/Models/Stateless/Methods/Location.cs b/Shared/Models/Stateless/Location.cs similarity index 97% rename from Shared/Models/Stateless/Methods/Location.cs rename to Shared/Models/Stateless/Location.cs index e0f61f6..cef980e 100644 --- a/Shared/Models/Stateless/Methods/Location.cs +++ b/Shared/Models/Stateless/Location.cs @@ -1,6 +1,6 @@ using System.Drawing; -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; internal abstract class Location { diff --git a/Shared/Models/Stateless/Methods/Mapping.cs b/Shared/Models/Stateless/Mapping.cs similarity index 97% rename from Shared/Models/Stateless/Methods/Mapping.cs rename to Shared/Models/Stateless/Mapping.cs index 4e9c30f..bed6eb4 100644 --- a/Shared/Models/Stateless/Methods/Mapping.cs +++ b/Shared/Models/Stateless/Mapping.cs @@ -1,6 +1,6 @@ using View_by_Distance.Shared.Models.Properties; -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; internal abstract class Mapping { diff --git a/Shared/Models/Stateless/Methods/PersonBirthday.cs b/Shared/Models/Stateless/PersonBirthday.cs similarity index 99% rename from Shared/Models/Stateless/Methods/PersonBirthday.cs rename to Shared/Models/Stateless/PersonBirthday.cs index 8f59309..971861a 100644 --- a/Shared/Models/Stateless/Methods/PersonBirthday.cs +++ b/Shared/Models/Stateless/PersonBirthday.cs @@ -1,6 +1,6 @@ using System.Globalization; -namespace View_by_Distance.Shared.Models.Stateless.Methods; +namespace View_by_Distance.Shared.Models.Stateless; internal abstract class PersonBirthday { diff --git a/Shared/Models/Stateless/XResult.cs b/Shared/Models/Stateless/XResult.cs index 6f9a521..4a61f49 100644 --- a/Shared/Models/Stateless/XResult.cs +++ b/Shared/Models/Stateless/XResult.cs @@ -21,7 +21,7 @@ internal abstract class XResult internal static string GetRelativePath(ResultSettings resultSettings, string path) { - string result = Methods.IPath.GetRelativePath(path, resultSettings.RootDirectory.Length); + string result = IPath.GetRelativePath(path, resultSettings.RootDirectory.Length); return result; }