Included imageFormat into PhotoMetadata.kt (#92)

Ashampoo · Apr 18, 2024 · 4a7e6a6 · 4a7e6a6
1 parent fcbfac4
commit 4a7e6a6
Show file tree

Hide file tree

Showing 5 changed files with 88 additions and 85 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,7 @@ of Ashampoo Photo Organizer, which, in turn, is driven by user community feedbac
 ## Installation
 
 ```
-implementation("com.ashampoo:kim:0.17.4")
+implementation("com.ashampoo:kim:0.17.5")
 ```
 
 For the targets `wasmJs` & `js` you also need to specify this:

diff --git a/src/commonMain/kotlin/com/ashampoo/kim/common/PhotoMetadataConverter.kt b/src/commonMain/kotlin/com/ashampoo/kim/common/PhotoMetadataConverter.kt
@@ -116,6 +116,7 @@ object PhotoMetadataConverter {
          * iso, exposure time, etc.) are always taken from EXIF.
          */
         return PhotoMetadata(
+            imageFormat = imageMetadata.imageFormat,
             widthPx = imageMetadata.imageSize?.width,
             heightPx = imageMetadata.imageSize?.height,
             orientation = orientation,

diff --git a/src/commonMain/kotlin/com/ashampoo/kim/model/PhotoMetadata.kt b/src/commonMain/kotlin/com/ashampoo/kim/model/PhotoMetadata.kt
@@ -28,6 +28,8 @@ import kotlinx.datetime.toLocalDateTime
  */
 data class PhotoMetadata(
 
+    val imageFormat: ImageFormat? = null,
+
     /* Image resolution */
     val widthPx: Int? = null,
     val heightPx: Int? = null,

diff --git a/src/commonTest/kotlin/com/ashampoo/kim/common/PhotoMetadataConverterTest.kt b/src/commonTest/kotlin/com/ashampoo/kim/common/PhotoMetadataConverterTest.kt
@@ -74,7 +74,7 @@ class PhotoMetadataConverterTest {
         val stringBuilder = StringBuilder()
 
         stringBuilder.appendLine(
-            "name;widthPx;heightPx;orientation;takenDate;latitude;longitude;" +
+            "name;imageFormat;widthPx;heightPx;orientation;takenDate;latitude;longitude;" +
                 "cameraMake;cameraModel;lensMake;lensModel;iso;exposureTime;fNumber;" +
                 "focalLength;flagged;rating;keywords;personsInAlbums;albums;" +
                 "thumbnailImageSize;thumbnailBytes.size"
@@ -86,7 +86,7 @@ class PhotoMetadataConverterTest {
             val metadata = entry.value
 
             stringBuilder.appendLine(
-                "$name;${metadata.widthPx};${metadata.heightPx};" +
+                "$name;${metadata.imageFormat};${metadata.widthPx};${metadata.heightPx};" +
                     "${metadata.orientation};${metadata.takenDate};" +
                     "${metadata.gpsCoordinates?.latitude};${metadata.gpsCoordinates?.longitude};" +
                     "${metadata.cameraMake};${metadata.cameraModel};${metadata.lensMake};" +