Move OcrClient to AddIn project

10 files changed, 34 insertions, 58 deletions

diff --git a/OcrClient/Models/OcrResponse.cs b/OcrClient/Models/OcrResponse.cs
deleted file mode 100644
index 2b26ab7..0000000
--- a/OcrClient/Models/OcrResponse.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace OcrClient.Models;
-
-public class OcrResponse
-{
-	public Result? Result { get; set; }
-}
-public class Result
-{
-	public TextAnnotation? TextAnnotation { get; set; }
-}
-public class TextAnnotation
-{
-	public List<Table>? Tables { get; set; }
-}
-
-public class Table
-{
-	public string? RowCount { get; set; }
-	public string? ColumnCount { get; set; }
-	public List<Cell>? Cells { get; set; }
-}
-
-public class Cell
-{
-	public string? RowIndex { get; set; }
-	public string? ColumnIndex { get; set; }
-	public string? Text { get; set; }
-}
diff --git a/OcrClient/OcrClient.csproj b/OcrClient/OcrClient.csproj
deleted file mode 100644
index cdd654f..0000000
--- a/OcrClient/OcrClient.csproj
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
-		<LangVersion>10</LangVersion>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-  </ItemGroup>
-
-</Project>
diff --git a/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs b/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
index 58ffdf2..0615da1 100644
--- a/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
+++ b/RhSolutions.AddIn/AddIn/RhSolutionsAddIn.cs
@@ -1,5 +1,4 @@
 using System.Net;
-using OcrClient.Services;
 
 namespace RhSolutions.AddIn;
 
diff --git a/RhSolutions.AddIn/Models/OcrResponse.cs b/RhSolutions.AddIn/Models/OcrResponse.cs
new file mode 100644
index 0000000..9b6f294
--- /dev/null
+++ b/RhSolutions.AddIn/Models/OcrResponse.cs
@@ -0,0 +1,28 @@
+namespace RhSolutions.Models;
+
+public class OcrResponse
+{
+	public Result Result { get; set; }
+}
+public class Result
+{
+	public TextAnnotation TextAnnotation { get; set; }
+}
+public class TextAnnotation
+{
+	public List<Table> Tables { get; set; }
+}
+
+public class Table
+{
+	public string RowCount { get; set; }
+	public string ColumnCount { get; set; }
+	public List<Cell> Cells { get; set; }
+}
+
+public class Cell
+{
+	public string RowIndex { get; set; }
+	public string ColumnIndex { get; set; }
+	public string Text { get; set; }
+}
diff --git a/RhSolutions.AddIn/RhSolutions.AddIn.csproj b/RhSolutions.AddIn/RhSolutions.AddIn.csproj
index 9ba0622..67ef543 100644
--- a/RhSolutions.AddIn/RhSolutions.AddIn.csproj
+++ b/RhSolutions.AddIn/RhSolutions.AddIn.csproj
@@ -22,7 +22,7 @@
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
-		<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.10" />
+		<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="9.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
 		<PackageReference Include="netDxf" Version="2022.11.2" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
@@ -32,7 +32,6 @@
 	<ItemGroup>
 		<ProjectReference Include="..\RhSolutions.ProductSku\RhSolutions.ProductSku.csproj" />
 		<ProjectReference Include="..\SnippingTool\SnippingTool.csproj" />
-		<ProjectReference Include="..\OcrClient\OcrClient.csproj" />
 	</ItemGroup>
 	<ItemGroup>
 	  <None Update="Images\Coupling.png">
diff --git a/RhSolutions.AddIn/Services/AddInConfiguration.cs b/RhSolutions.AddIn/Services/AddInConfiguration.cs
index 860b6c1..5fa4c1a 100644
--- a/RhSolutions.AddIn/Services/AddInConfiguration.cs
+++ b/RhSolutions.AddIn/Services/AddInConfiguration.cs
@@ -20,12 +20,8 @@ public class AddInConfiguration : IAddInConfiguration
 
 	public AddInConfiguration()
 	{
-		// EmbeddedFileProvider embeddedProvider = new (typeof(RhSolutionsAddIn).Assembly);
-		// using Stream stream = embeddedProvider.GetFileInfo("appsettings.json").CreateReadStream();
-
 		_configuration = new ConfigurationBuilder()
 			.AddUserSecrets<RhSolutionsAddIn>()
-			// .AddJsonStream(stream)
 			.Build();
 
 		_rootKey = Registry.CurrentUser.CreateSubKey(@"SOFTWARE\RhSolutions\RhSolutions-AddIn");
diff --git a/OcrClient/Services/IOcrClient.cs b/RhSolutions.AddIn/Services/IOcrClient.cs
index 9b281c9..0233d14 100644
--- a/OcrClient/Services/IOcrClient.cs
+++ b/RhSolutions.AddIn/Services/IOcrClient.cs
@@ -1,6 +1,6 @@
-using OcrClient.Models;
+using System.Threading.Tasks;
 
-namespace OcrClient.Services;
+namespace RhSolutions.Services;
 
 public interface IOcrClient
 {
diff --git a/OcrClient/Services/YandexOcrClient.cs b/RhSolutions.AddIn/Services/YandexOcrClient.cs
index 3146e84..c79dda4 100644
--- a/OcrClient/Services/YandexOcrClient.cs
+++ b/RhSolutions.AddIn/Services/YandexOcrClient.cs
@@ -1,10 +1,10 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
+using System.Threading.Tasks;
 using Newtonsoft.Json;
-using OcrClient.Models;
 
-namespace OcrClient.Services;
+namespace RhSolutions.Services;
 
 public class YandexOcrClient : IOcrClient
 {
@@ -35,7 +35,7 @@ public class YandexOcrClient : IOcrClient
 		response.EnsureSuccessStatusCode();
 
 		string jsonResponse = await response.Content.ReadAsStringAsync();
-		OcrResponse? deserialized = JsonConvert.DeserializeObject<OcrResponse>(jsonResponse);
+		OcrResponse deserialized = JsonConvert.DeserializeObject<OcrResponse>(jsonResponse);
 
 		if (deserialized != null)
 		{
diff --git a/RhSolutions.AddIn/Tools/OcrTool.cs b/RhSolutions.AddIn/Tools/OcrTool.cs
index 89a6fee..2869537 100644
--- a/RhSolutions.AddIn/Tools/OcrTool.cs
+++ b/RhSolutions.AddIn/Tools/OcrTool.cs
@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using SnippingTool;
-using OcrClient.Services;
 using System.Windows.Forms;
 using Application = Microsoft.Office.Interop.Excel.Application;
 
diff --git a/RhSolutions.sln b/RhSolutions.sln
index 54c4ab1..aa534ab 100644
--- a/RhSolutions.sln
+++ b/RhSolutions.sln
@@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RhSolutions.ProductSku", "R
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SnippingTool", "SnippingTool\SnippingTool.csproj", "{DDB517C7-DF61-4C26-B691-956D0E5906C3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OcrClient", "OcrClient\OcrClient.csproj", "{53F322B3-F477-4831-8E16-EA76934A0D59}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU