From kde-commits  Wed Feb 28 22:16:23 2018
From: Gilles Caulier <null () kde ! org>
Date: Wed, 28 Feb 2018 22:16:23 +0000
To: kde-commits
Subject: [digikam/development/6.0.0] libs/dmetadata: dispatch categories from FFMPEG to Xmp and Iptc
Message-Id: <E1erA1P-0001dc-Eu () code ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=151985619820527

Git commit db5ca0cd3b43cf3da92a5163e200337bc947eea4 by Gilles Caulier.
Committed on 28/02/2018 at 22:15.
Pushed by cgilles into branch 'development/6.0.0'.

dispatch categories from FFMPEG to Xmp and Iptc

M  +23   -1    libs/dmetadata/dmetadata_ffmpeg.cpp

https://commits.kde.org/digikam/db5ca0cd3b43cf3da92a5163e200337bc947eea4

diff --git a/libs/dmetadata/dmetadata_ffmpeg.cpp b/libs/dmetadata/dmetadata=
_ffmpeg.cpp
index 2cf2508cbe..945cce5f4b 100644
--- a/libs/dmetadata/dmetadata_ffmpeg.cpp
+++ b/libs/dmetadata/dmetadata_ffmpeg.cpp
@@ -337,7 +337,10 @@ bool DMetadata::loadUsingFFmpeg(const QString& filePat=
h)
         }
         =

         if (!keywords.isEmpty())
+        {
             setXmpKeywords(keywords);
+            setIptcKeywords(QStringList(), keywords);
+        }
     }
 =

     // --------------
@@ -346,7 +349,26 @@ bool DMetadata::loadUsingFFmpeg(const QString& filePat=
h)
 =

     if (entry)
     {
-        setXmpTagString("Xmp.video.Subject", QString::fromUtf8(entry->valu=
e));
+        QString data =3D QString::fromUtf8(entry->value);
+        setXmpTagString("Xmp.video.Subject", data);
+
+        QStringList categories =3D data.split(QLatin1String("/"));
+        =

+        if (categories.isEmpty())
+        {
+            categories =3D data.split(QLatin1String(","));
+            =

+            if (categories.isEmpty())
+            {
+                categories =3D data.split(QLatin1String(" "));
+            }
+        }
+        =

+        if (!categories.isEmpty())
+        {
+            setXmpSubCategories(categories);
+            setIptcSubCategories(QStringList(), categories);
+        }
     }
 =

     // --------------