From 13848a4cb7a3b606f77ac9485b31e453e92c8f34 Mon Sep 17 00:00:00 2001
From: Mike Phares <mikepharesjr@msn.com>
Date: Tue, 26 Dec 2023 19:04:28 -0700
Subject: [PATCH] Metadata

---
 Metadata-Query/MetadataQuery.cs | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/Metadata-Query/MetadataQuery.cs b/Metadata-Query/MetadataQuery.cs
index c1dfd75..057e3a8 100644
--- a/Metadata-Query/MetadataQuery.cs
+++ b/Metadata-Query/MetadataQuery.cs
@@ -4,6 +4,7 @@ using Phares.Shared;
 using ShellProgressBar;
 using System.Collections.ObjectModel;
 using System.Text;
+using System.Text.Json;
 using View_by_Distance.Metadata.Query.Models;
 using View_by_Distance.Shared.Models;
 using View_by_Distance.Shared.Models.Methods;
@@ -58,12 +59,13 @@ public class MetadataQuery
 
     private List<(string FileName, string TagGroup, string TagIdName, string Value)> GetCollection(long ticks)
     {
+        string json;
+        string model;
+        string maker;
         string message;
         FileInfo fileInfo;
-        FilePath filePath;
-        FileHolder fileHolder;
         ProgressBar progressBar;
-        ExifDirectory exifDirectory;
+        ExifDirectory? exifDirectory;
         const string fileSearchFilter = "*";
         const bool useCeilingAverage = true;
         const string directorySearchFilter = "*";
@@ -80,17 +82,12 @@ public class MetadataQuery
             {
                 progressBar.Tick();
                 fileInfo = new(file);
-                fileHolder = FileHolder.Get(fileInfo);
-                filePath = FilePath.Get(_PropertyConfiguration, fileHolder, index: null);
-                exifDirectory = Metadata.Models.Stateless.Methods.IMetadata.GetExifDirectory(filePath);
-                // exifDirectory.ExifDirectoryBase.Artist;
-                // exifDirectory.ExifDirectoryBase.WinComment;
-                // exifDirectory.ExifDirectoryBase.Model;
-                // exifDirectory.ExifDirectoryBase.CameraOwnerName;
-                // exifDirectory.ExifDirectoryBase.Make;
-                // exifDirectory.ExifDirectoryBase.BodySerialNumber;
-                // exifDirectory.ExifDirectoryBase.LensSerialNumber;
-                // exifDirectory.ExifDirectoryBase.Software;
+                json = File.ReadAllText(fileInfo.FullName);
+                exifDirectory = JsonSerializer.Deserialize(json, ExifDirectorySourceGenerationContext.Default.ExifDirectory);
+                if (exifDirectory is null)
+                    continue;
+                maker = Metadata.Models.Stateless.Methods.IMetadata.GetMaker(exifDirectory);
+                model = Metadata.Models.Stateless.Methods.IMetadata.GetModel(exifDirectory);
                 // collection.Add(new(fileInfo.Name, keyValuePair.Key, keyValue.Key, keyValue.Value));
             }
             progressBar.Dispose();
@@ -130,4 +127,4 @@ public class MetadataQuery
         }
     }
 
-}
\ No newline at end of file
+}