[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [digikam] core/libs/dmetadata: use sidecar in LR format if available
From:       Maik Qualmann <null () kde ! org>
Date:       2018-09-14 17:09:02
Message-ID: E1g0raY-0003O7-3t () code ! kde ! org
[Download RAW message or body]

Git commit 8f2d1d2df23df8540c47971d8f487122ce256ccd by Maik Qualmann.
Committed on 14/09/2018 at 17:08.
Pushed by mqualmann into branch 'master'.

use sidecar in LR format if available
CCBUGS: 278935

M  +10   -0    core/libs/dmetadata/metaengine.cpp

https://commits.kde.org/digikam/8f2d1d2df23df8540c47971d8f487122ce256ccd

diff --git a/core/libs/dmetadata/metaengine.cpp b/core/libs/dmetadata/metaengine.cpp
index f2127406a3..1d7b7a0c69 100644
--- a/core/libs/dmetadata/metaengine.cpp
+++ b/core/libs/dmetadata/metaengine.cpp
@@ -166,6 +166,16 @@ QString MetaEngine::sidecarFilePathForFile(const QString& path)
         return QString();
     }
 
+    QFileInfo info(path);
+    QString pathForLR = path;
+    pathForLR.chop(info.suffix().size());
+    pathForLR.append(QLatin1String("xmp"));
+
+    if (QFileInfo::exists(pathForLR))
+    {
+        return pathForLR;
+    }
+
     return path + QLatin1String(".xmp");
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]