[gimp/gimp-2-10] libgimpbase: more metadata fixes for tags that can appear multiple times

[Michael Natterer <mitch src gnome org>]

commit 752589f42dc950a251304a8eaa52b37b48f97a72
Author: Michael Natterer <mitch gimp org>
Date:   Mon Jan 7 21:35:54 2019 +0100

    libgimpbase: more metadata fixes for tags that can appear multiple times
    
    gimp_metadata_add() which is used to set blobs or EXIF, XMP and IPTC
    on a GimpMetadata also needs the logic to set "multiple" tags in one
    go, or it will lose all but the first one.
    
    (cherry picked from commit 479fd5b24bd1c354c7e7a3bd9f4fc6b87cb775bf)

 libgimpbase/gimpmetadata.c | 100 +++++++++++++++++++++++++++++----------------
 1 file changed, 65 insertions(+), 35 deletions(-)
---
diff --git a/libgimpbase/gimpmetadata.c b/libgimpbase/gimpmetadata.c
index 607112b4b6..03c7e1f2b5 100644
--- a/libgimpbase/gimpmetadata.c
+++ b/libgimpbase/gimpmetadata.c
@@ -83,8 +83,14 @@ struct _GimpMetadataClass
 #define GIMP_METADATA_ERROR gimp_metadata_error_quark ()
 
 static GQuark   gimp_metadata_error_quark (void);
-static void     gimp_metadata_add         (GimpMetadata *src,
-                                           GimpMetadata *dest);
+static void     gimp_metadata_copy_tag    (GExiv2Metadata  *src,
+                                           GExiv2Metadata  *dest,
+                                           const gchar     *tag);
+static void     gimp_metadata_copy_tags   (GExiv2Metadata  *src,
+                                           GExiv2Metadata  *dest,
+                                           const gchar    **tags);
+static void     gimp_metadata_add         (GimpMetadata    *src,
+                                           GimpMetadata    *dest);
 
 
 static const gchar *tiff_tags[] =
@@ -650,7 +656,7 @@ gimp_metadata_deserialize_text (GMarkupParseContext  *context,
             }
           else
             {
-              gexiv2_metadata_set_tag_string (GEXIV2_METADATA (parse_data->metadata),
+              gexiv2_metadata_set_tag_string (GEXIV2_METADATA (g2_metadata),
                                               parse_data->name,
                                               value);
               g_free (value);
@@ -1578,66 +1584,90 @@ gimp_metadata_error_quark (void)
   return quark;
 }
 
+static void
+gimp_metadata_copy_tag (GExiv2Metadata *src,
+                        GExiv2Metadata *dest,
+                        const gchar    *tag)
+{
+  gchar **values = gexiv2_metadata_get_tag_multiple (src, tag);
+
+  if (values)
+    {
+      gexiv2_metadata_set_tag_multiple (dest, tag, (const gchar **) values);
+      g_strfreev (values);
+    }
+  else
+    {
+      gchar *value = gexiv2_metadata_get_tag_string (src, tag);
+
+      if (value)
+        {
+          gexiv2_metadata_set_tag_string (dest, tag, value);
+          g_free (value);
+        }
+    }
+}
+
+static void
+gimp_metadata_copy_tags (GExiv2Metadata  *src,
+                         GExiv2Metadata  *dest,
+                         const gchar    **tags)
+{
+  gint i;
+
+  for (i = 0; tags[i] != NULL; i++)
+    {
+      /* don't copy the same tag multile times */
+      if (i > 0 && ! strcmp (tags[i], tags[i - 1]))
+        continue;
+
+      gimp_metadata_copy_tag (src, dest, tags[i]);
+    }
+ }
+
 static void
 gimp_metadata_add (GimpMetadata *src,
                    GimpMetadata *dest)
 {
   GExiv2Metadata *g2src  = GEXIV2_METADATA (src);
   GExiv2Metadata *g2dest = GEXIV2_METADATA (dest);
-  gchar *value;
-  gint   i;
 
   if (gexiv2_metadata_get_supports_exif (g2src) &&
       gexiv2_metadata_get_supports_exif (g2dest))
     {
-      gchar **exif_data = gexiv2_metadata_get_exif_tags (g2src);
+      gchar **exif_tags = gexiv2_metadata_get_exif_tags (g2src);
 
-      if (exif_data)
+      if (exif_tags)
         {
-          for (i = 0; exif_data[i] != NULL; i++)
-            {
-              value = gexiv2_metadata_get_tag_string (g2src, exif_data[i]);
-              gexiv2_metadata_set_tag_string (g2dest, exif_data[i], value);
-              g_free (value);
-            }
-
-          g_strfreev (exif_data);
+          gimp_metadata_copy_tags (g2src, g2dest,
+                                   (const gchar **) exif_tags);
+          g_strfreev (exif_tags);
         }
     }
 
   if (gexiv2_metadata_get_supports_xmp (g2src) &&
       gexiv2_metadata_get_supports_xmp (g2dest))
     {
-      gchar **xmp_data = gexiv2_metadata_get_xmp_tags (g2src);
+      gchar **xmp_tags = gexiv2_metadata_get_xmp_tags (g2src);
 
-      if (xmp_data)
+      if (xmp_tags)
         {
-          for (i = 0; xmp_data[i] != NULL; i++)
-            {
-              value = gexiv2_metadata_get_tag_string (g2src, xmp_data[i]);
-              gexiv2_metadata_set_tag_string (g2dest, xmp_data[i], value);
-              g_free (value);
-            }
-
-          g_strfreev (xmp_data);
+          gimp_metadata_copy_tags (g2src, g2dest,
+                                   (const gchar **) xmp_tags);
+          g_strfreev (xmp_tags);
         }
     }
 
   if (gexiv2_metadata_get_supports_iptc (g2src) &&
       gexiv2_metadata_get_supports_iptc (g2dest))
     {
-      gchar **iptc_data = gexiv2_metadata_get_iptc_tags (g2src);
+      gchar **iptc_tags = gexiv2_metadata_get_iptc_tags (g2src);
 
-      if (iptc_data)
+      if (iptc_tags)
         {
-          for (i = 0; iptc_data[i] != NULL; i++)
-            {
-              value = gexiv2_metadata_get_tag_string (g2src, iptc_data[i]);
-              gexiv2_metadata_set_tag_string (g2dest, iptc_data[i], value);
-              g_free (value);
-            }
-
-          g_strfreev (iptc_data);
+          gimp_metadata_copy_tags (g2src, g2dest,
+                                   (const gchar **) iptc_tags);
+          g_strfreev (iptc_tags);
         }
     }
 }