From 7f6eb3d9f38ca079a50578bf9aa695ca39c3bce8 Mon Sep 17 00:00:00 2001
From: Dustin Oprea <dustin@randomingenuity.com>
Date: Sat, 16 May 2020 17:31:02 -0400
Subject: [PATCH] utility.go: Add formatted values to ExifTag

---
 v2/utility.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/v2/utility.go b/v2/utility.go
index b8ad540..e985740 100644
--- a/v2/utility.go
+++ b/v2/utility.go
@@ -83,12 +83,15 @@ type ExifTag struct {
     Value       interface{}                 `json:"value"`
     ValueBytes  []byte                      `json:"value_bytes"`
 
+    FormattedFirst string `json:"formatted_first"`
+    Formatted      string `json:"formatted"`
+
     ChildIfdPath string `json:"child_ifd_path"`
 }
 
 // String returns a string representation.
 func (et ExifTag) String() string {
-    return fmt.Sprintf("ExifTag<IFD-PATH=[%s] TAG-ID=(0x%02x) TAG-NAME=[%s] TAG-TYPE=[%s] VALUE=[%v] VALUE-BYTES=(%d) CHILD-IFD-PATH=[%s]", et.IfdPath, et.TagId, et.TagName, et.TagTypeName, et.Value, len(et.ValueBytes), et.ChildIfdPath)
+    return fmt.Sprintf("ExifTag<IFD-PATH=[%s] TAG-ID=(0x%02x) TAG-NAME=[%s] TAG-TYPE=[%s] VALUE=[%v] VALUE-BYTES=(%d) CHILD-IFD-PATH=[%s]", et.IfdPath, et.TagId, et.TagName, et.TagTypeName, et.FormattedFirst, len(et.ValueBytes), et.ChildIfdPath)
 }
 
 // GetFlatExifData returns a simple, flat representation of all tags.
@@ -158,6 +161,12 @@ func GetFlatExifData(exifData []byte) (exifTags []ExifTag, err error) {
                 ChildIfdPath: ite.ChildIfdPath(),
             }
 
+            et.Formatted, err = ite.Format()
+            log.PanicIf(err)
+
+            et.FormattedFirst, err = ite.FormatFirst()
+            log.PanicIf(err)
+
             exifTags = append(exifTags, et)
         }