[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [digikam/development/6.0.0] libs/dmetadata: dispatch categories from FFMPEG to Xmp and Iptc
From: Gilles Caulier <null () kde ! org>
Date: 2018-02-28 22:16:23
Message-ID: E1erA1P-0001dc-Eu () code ! kde ! org
[Download RAW message or body]
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& filePath)
}
if (!keywords.isEmpty())
+ {
setXmpKeywords(keywords);
+ setIptcKeywords(QStringList(), keywords);
+ }
}
// --------------
@@ -346,7 +349,26 @@ bool DMetadata::loadUsingFFmpeg(const QString& filePath)
if (entry)
{
- setXmpTagString("Xmp.video.Subject", QString::fromUtf8(entry->value));
+ QString data = QString::fromUtf8(entry->value);
+ setXmpTagString("Xmp.video.Subject", data);
+
+ QStringList categories = data.split(QLatin1String("/"));
+
+ if (categories.isEmpty())
+ {
+ categories = data.split(QLatin1String(","));
+
+ if (categories.isEmpty())
+ {
+ categories = data.split(QLatin1String(" "));
+ }
+ }
+
+ if (!categories.isEmpty())
+ {
+ setXmpSubCategories(categories);
+ setIptcSubCategories(QStringList(), categories);
+ }
}
// --------------
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic