Separate the Core functions

.github/workflows/dotnet-desktop.yml

@@ -50,4 +50,5 @@ jobs:
         path: |
           bin/net${{ matrix.dotnet-version }}/${{ matrix.configuration }}
           !bin/**/DICOM Dictionary.xml
-          !bin/**/Private Dictionary.xml
+          !bin/**/Private Dictionary.xml
+          !bin/**/*.pdb

DicomGrep.sln

@@ -5,7 +5,9 @@ VisualStudioVersion = 17.8.34330.188
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DicomGrep", "DicomGrep\DicomGrep.csproj", "{70E8E894-278C-4A40-9CC8-56573A5F96DF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DicomGrepTests", "DicomGrepTests\DicomGrepTests.csproj", "{C26AA249-3A83-4B9A-9672-633AFE3081E4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DicomGrepTests", "DicomGrepTests\DicomGrepTests.csproj", "{C26AA249-3A83-4B9A-9672-633AFE3081E4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DicomGrepCore", "DicomGrepCore\DicomGrepCore.csproj", "{572F835B-6298-4075-A1E3-50675927CCF1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,6 +23,10 @@ Global
 		{C26AA249-3A83-4B9A-9672-633AFE3081E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C26AA249-3A83-4B9A-9672-633AFE3081E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C26AA249-3A83-4B9A-9672-633AFE3081E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{572F835B-6298-4075-A1E3-50675927CCF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{572F835B-6298-4075-A1E3-50675927CCF1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{572F835B-6298-4075-A1E3-50675927CCF1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{572F835B-6298-4075-A1E3-50675927CCF1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

DicomGrep/DicomGrep.csproj

@@ -73,6 +73,10 @@
     <PackageReference Include="WinCopies.WindowsAPICodePack.Shell" Version="2.12.0.2" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\DicomGrepCore\DicomGrepCore.csproj" />
+  </ItemGroup>
+
   <ItemGroup>
     <Resource Include="Views\Images\logo_128.png" />
     <Resource Include="Views\Images\logo_16.png" />

DicomGrep/Models/Configuration.cs

@@ -1,4 +1,5 @@
-using System;
+using DicomGrepCore.Entities;
+using System;
 using System.Collections.Generic;
 using System.Text;
 

DicomGrep/Services/ConfigurationService.cs

@@ -5,6 +5,7 @@
 using System.IO;
 using System.Text;
 using System.Text.Json;
+using DicomGrepCore.Entities;
 
 namespace DicomGrep.Services
 {

DicomGrep/Services/ExportService.cs

@@ -1,4 +1,5 @@
 using DicomGrep.Models;
+using DicomGrepCore.Entities;
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;

DicomGrep/Services/TagValueDetailService.cs

@@ -1,6 +1,7 @@
 using DicomGrep.Models;
 using DicomGrep.ViewModels;
 using DicomGrep.Views;
+using DicomGrepCore.Entities;
 using FellowOakDicom;
 using System;
 using System.Collections.Generic;

DicomGrep/ViewModels/MainViewModel.cs

@@ -3,6 +3,8 @@
 using DicomGrep.Services;
 using DicomGrep.Utils;
 using DicomGrep.Views;
+using DicomGrepCore.Entities;
+using DicomGrepCore.Services;
 using FellowOakDicom;
 using System;
 using System.Collections.Generic;
@@ -339,20 +341,20 @@ private IEnumerable<int> GetCPULogicCoresList()
             }
         }
 
-        private void SearchService_FileListCompleted(object sender, Services.EventArgs.ListFileCompletedEventArgs e)
+        private void SearchService_FileListCompleted(object sender, DicomGrepCore.Services.EventArgs.ListFileCompletedEventArgs e)
         {
             this.TotalFileCount = e.Count;
         }
 
-        private void SearchService_OnLoadDicomFile(object sender, Services.EventArgs.OnLoadDicomFileEventArgs e)
+        private void SearchService_OnLoadDicomFile(object sender, DicomGrepCore.Services.EventArgs.OnLoadDicomFileEventArgs e)
         {
             lock (obj)
             {
                 CurrentFile = e.Filename;
             }
         }
 
-        private void SearchService_OnCompletDicomFile(object sender, Services.EventArgs.OnCompleteDicomFileEventArgs e)
+        private void SearchService_OnCompletDicomFile(object sender, DicomGrepCore.Services.EventArgs.OnCompleteDicomFileEventArgs e)
         {
             lock (obj2)
             {
@@ -365,7 +367,7 @@ private void SearchService_OnCompletDicomFile(object sender, Services.EventArgs.
             }
         }
 
-        private void SearchService_OnSearchComplete(object sender, Services.EventArgs.OnSearchCompleteEventArgs e)
+        private void SearchService_OnSearchComplete(object sender, DicomGrepCore.Services.EventArgs.OnSearchCompleteEventArgs e)
         {
             this.CanSearch = true;
             this.CanCancel = false;

DicomGrep/ViewModels/TagValueDetailViewModel.cs

@@ -1,4 +1,5 @@
 using DicomGrep.Models;
+using DicomGrepCore.Entities;
 using FellowOakDicom;
 using System;
 using System.Collections.Generic;

DicomGrepCore/DicomGrepCore.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="fo-dicom" Version="5.1.2" />
+    <PackageReference Include="NLog" Version="5.2.8" />
+  </ItemGroup>
+
+</Project>

DicomGrep/Models/ResultDicomFile.cs → DicomGrepCore/Entities/ResultDicomFile.cs

@@ -3,13 +3,13 @@
 using System.IO;
 using System.Text;
 
-namespace DicomGrep.Models
+namespace DicomGrepCore.Entities
 {
     public class ResultDicomFile
     {
         public string FullFilename { get; private set; }
         public string Filename => Path.GetFileName(FullFilename);
         public string DirectoryName => Path.GetDirectoryName(FullFilename);
 
         public string SOPClassName { get; private set; }
         public string SOPClassUID { get; private set; }

DicomGrep/Models/ResultDicomItem.cs → DicomGrepCore/Entities/ResultDicomItem.cs

@@ -1,10 +1,10 @@
-using DicomGrep.Enums;
+using DicomGrepCore.Enums;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using FellowOakDicom;
 
-namespace DicomGrep.Models
+namespace DicomGrepCore.Entities
 {
     public class ResultDicomItem
     {

DicomGrep/Models/SearchCriteria.cs → DicomGrepCore/Entities/SearchCriteria.cs

@@ -4,14 +4,14 @@
 using System.Text;
 using System.Text.Json.Serialization;
 
-namespace DicomGrep.Models
+namespace DicomGrepCore.Entities
 {
     public class SearchCriteria
     {
         public string SearchPath { get; set; }
         public string SearchSopClassUid { get; set; }
 
         private string _searchTag;
 
         public string SearchTag
         {
@@ -30,13 +30,13 @@
             }
         }
 
         private DicomTag _dicomSearchTag;
         [JsonIgnore]
         public DicomTag DicomSearchTag => _dicomSearchTag;
 
         public string FileTypes { get; set; }
 
         public string SearchText { get; set; }
 
         public bool CaseSensitive { get; set; }
         public bool WholeWord { get; set; }

DicomGrep/Enums/CompleteReasonEnum.cs → DicomGrepCore/Enums/CompleteReasonEnum.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace DicomGrep.Enums
+namespace DicomGrepCore.Enums
 {
     public enum CompleteReasonEnum
     {

DicomGrep/Extensions/StringExtensions.cs → DicomGrepCore/Extensions/StringExtensions.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace DicomGrep.Extensions
+namespace DicomGrepCore.Extensions
 {
     public static class StringExtensions
     {

DicomGrep/Services/EventArgs/ListFileCompletedEventArgs.cs → DicomGrepCore/Services/EventArgs/ListFileCompletedEventArgs.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace DicomGrep.Services.EventArgs
+namespace DicomGrepCore.Services.EventArgs
 {
     public class ListFileCompletedEventArgs : System.EventArgs
     {

DicomGrep/Services/EventArgs/OnCompleteDicomFileEventArgs.cs → DicomGrepCore/Services/EventArgs/OnCompleteDicomFileEventArgs.cs

@@ -1,9 +1,9 @@
-using DicomGrep.Models;
+using DicomGrepCore.Entities;
 using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace DicomGrep.Services.EventArgs
+namespace DicomGrepCore.Services.EventArgs
 {
     public class OnCompleteDicomFileEventArgs : System.EventArgs
     {

DicomGrep/Services/EventArgs/OnLoadDicomFileEventArgs.cs → DicomGrepCore/Services/EventArgs/OnLoadDicomFileEventArgs.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace DicomGrep.Services.EventArgs
+namespace DicomGrepCore.Services.EventArgs
 {
     public class OnLoadDicomFileEventArgs : System.EventArgs
     {

DicomGrep/Services/EventArgs/OnSearchCompleteEventArgs.cs → DicomGrepCore/Services/EventArgs/OnSearchCompleteEventArgs.cs

@@ -1,9 +1,9 @@
-using DicomGrep.Enums;
+using DicomGrepCore.Enums;
 using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace DicomGrep.Services.EventArgs
+namespace DicomGrepCore.Services.EventArgs
 {
     public class OnSearchCompleteEventArgs : System.EventArgs
     {

DicomGrep/Services/SearchService.cs → DicomGrepCore/Services/SearchService.cs

@@ -1,6 +1,6 @@
-using DicomGrep.Extensions;
-using DicomGrep.Models;
-using DicomGrep.Services.EventArgs;
+using DicomGrepCore.Extensions;
+using DicomGrepCore.Entities;
+using DicomGrepCore.Services.EventArgs;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -10,7 +10,7 @@
 using System.Threading.Tasks;
 using FellowOakDicom;
 
-namespace DicomGrep.Services
+namespace DicomGrepCore.Services
 {
     /// <summary>
     /// The core logic of the search function
@@ -140,7 +140,7 @@
 
         private void SearchInDicomFile(string filePath)
         {
             ResultDicomFile resultDicomFile = null;
             bool anyMatch = false;
             try
             {
@@ -148,12 +148,12 @@
 
                 DicomFile dicomFile = DicomFile.Open(filePath, FileReadOption.ReadLargeOnDemand, 16 * 1024);
 
                 IList<ResultDicomItem> resultDicomItems = null;
                 //new DicomDatasetWalker(dicomFile.Dataset).Walk(new DatasetWalker());
 
                 string patientName = string.Empty;
                 string sopClassName = string.Empty;
                 DicomUID sopClassUID = null;
 
 
                 if (dicomFile.Dataset.TryGetSingleValue<DicomUID>(DicomTag.SOPClassUID, out sopClassUID))