diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp index 16e3935ca..d6c15afcd 100644 --- a/src/kitemviews/private/kbaloorolesprovider.cpp +++ b/src/kitemviews/private/kbaloorolesprovider.cpp @@ -1,189 +1,194 @@ /*************************************************************************** * Copyright (C) 2012 by Peter Penz * * Copyright (C) 2013 by Vishesh Handa * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "kbaloorolesprovider.h" #include #include #include #include #include #include #include +#include struct KBalooRolesProviderSingleton { KBalooRolesProvider instance; }; Q_GLOBAL_STATIC(KBalooRolesProviderSingleton, s_balooRolesProvider) KBalooRolesProvider& KBalooRolesProvider::instance() { return s_balooRolesProvider->instance; } KBalooRolesProvider::~KBalooRolesProvider() { } QSet KBalooRolesProvider::roles() const { return m_roles; } QHash KBalooRolesProvider::roleValues(const Baloo::File& file, const QSet& roles) const { QHash values; int width = -1; int height = -1; QMapIterator it(file.properties()); while (it.hasNext()) { it.next(); const KFileMetaData::PropertyInfo pi(it.key()); const QString property = pi.name(); const QByteArray role = roleForProperty(property); if (role.isEmpty() || !roles.contains(role)) { continue; } const QVariant value = it.value(); if (role == "imageSize") { // Merge the two properties for width and height // as one string into the "imageSize" role if (property == QLatin1String("width")) { width = value.toInt(); } else if (property == QLatin1String("height")) { height = value.toInt(); } if (width >= 0 && height >= 0) { QString widthAndHeight = QString::number(width); widthAndHeight += QLatin1String(" x "); widthAndHeight += QString::number(height); values.insert(role, widthAndHeight); } } else if (role == "orientation") { const QString orientation = orientationFromValue(value.toInt()); values.insert(role, orientation); } else if (role == "duration") { const QString duration = durationFromValue(value.toInt()); values.insert(role, duration); } else { values.insert(role, value.toString()); } } KFileMetaData::UserMetaData md(file.path()); if (roles.contains("tags")) { values.insert("tags", tagsFromValues(md.tags())); } if (roles.contains("rating")) { values.insert("rating", QString::number(md.rating())); } if (roles.contains("comment")) { values.insert("comment", md.userComment()); } if (roles.contains("originUrl")) { values.insert("originUrl", md.originUrl()); } return values; } QByteArray KBalooRolesProvider::roleForProperty(const QString& property) const { return m_roleForProperty.value(property); } KBalooRolesProvider::KBalooRolesProvider() : m_roles(), m_roleForProperty() { struct PropertyInfo { const char* const property; const char* const role; }; // Mapping from the URIs to the KFileItemModel roles. Note that this must not be // a 1:1 mapping: One role may contain several URI-values (e.g. the URIs for height and // width of an image are mapped to the role "imageSize") static const PropertyInfo propertyInfoList[] = { { "rating", "rating" }, { "tag", "tags" }, { "comment", "comment" }, { "title", "title" }, { "wordCount", "wordCount" }, { "lineCount", "lineCount" }, { "width", "imageSize" }, { "height", "imageSize" }, { "nexif.orientation", "orientation", }, { "artist", "artist" }, { "album", "album" }, { "duration", "duration" }, { "trackNumber", "track" }, { "originUrl", "originUrl" } }; for (unsigned int i = 0; i < sizeof(propertyInfoList) / sizeof(PropertyInfo); ++i) { m_roleForProperty.insert(propertyInfoList[i].property, propertyInfoList[i].role); m_roles.insert(propertyInfoList[i].role); } } QString KBalooRolesProvider::tagsFromValues(const QStringList& values) const { - return values.join(QStringLiteral(", ")); + QStringList alphabeticalOrderTags = values; + QCollator coll; + coll.setNumericMode(true); + std::sort(alphabeticalOrderTags.begin(), alphabeticalOrderTags.end(), [&](const QString& s1, const QString& s2){ return coll.compare(s1, s2) < 0; }); + return alphabeticalOrderTags.join(QStringLiteral(", ")); } QString KBalooRolesProvider::orientationFromValue(int value) const { QString string; switch (value) { case 1: string = i18nc("@item:intable Image orientation", "Unchanged"); break; case 2: string = i18nc("@item:intable Image orientation", "Horizontally flipped"); break; case 3: string = i18nc("@item:intable image orientation", "180° rotated"); break; case 4: string = i18nc("@item:intable image orientation", "Vertically flipped"); break; case 5: string = i18nc("@item:intable image orientation", "Transposed"); break; case 6: string = i18nc("@item:intable image orientation", "90° rotated"); break; case 7: string = i18nc("@item:intable image orientation", "Transversed"); break; case 8: string = i18nc("@item:intable image orientation", "270° rotated"); break; default: break; } return string; } QString KBalooRolesProvider::durationFromValue(int value) const { QTime duration(0, 0, 0); duration = duration.addSecs(value); return duration.toString(QStringLiteral("hh:mm:ss")); } diff --git a/src/kitemviews/private/kbaloorolesprovider.h b/src/kitemviews/private/kbaloorolesprovider.h index a9bd2e8ef..65b59793c 100644 --- a/src/kitemviews/private/kbaloorolesprovider.h +++ b/src/kitemviews/private/kbaloorolesprovider.h @@ -1,89 +1,90 @@ /*************************************************************************** * Copyright (C) 2012 by Peter Penz * * Copyright (C) 2013 by Vishesh Handa * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #ifndef KBALOO_ROLESPROVIDER_H #define KBALOO_ROLESPROVIDER_H #include "dolphin_export.h" #include #include #include namespace Baloo { class File; } /** * @brief Allows accessing metadata of a file by providing KFileItemModel roles. * * Is a helper class for KFileItemModelRolesUpdater to retrieve roles that * are only accessible with Baloo. */ class DOLPHIN_EXPORT KBalooRolesProvider { public: static KBalooRolesProvider& instance(); virtual ~KBalooRolesProvider(); /** * @return Roles that can be provided by KBalooRolesProvider. */ QSet roles() const; /** * @return Values for the roles \a roles that can be determined from the file * with the URL \a url. */ QHash roleValues(const Baloo::File& file, const QSet& roles) const; QByteArray roleForProperty(const QString& property) const; protected: KBalooRolesProvider(); private: /** * @return User visible string for the given tag-values. + * The tag-values are sorted in alphabetical order. */ QString tagsFromValues(const QStringList& values) const; /** * @return User visible string for the EXIF-orientation property * which can have the values 0 to 8. * (see http://sylvana.net/jpegcrop/exif_orientation.html) */ QString orientationFromValue(int value) const; /** * @return Duration in the format HH::MM::SS for the value given * in seconds. */ QString durationFromValue(int value) const; private: QSet m_roles; QHash m_roleForProperty; friend struct KBalooRolesProviderSingleton; }; #endif