Merge branch 'master' into 'master'

*Support for newer xdg-utils: Changed defaults.list into mimeapps.list NOTE : needs further testing, has been tested on my own device so far with ok results See merge request !1
sailfishos · Apr 22, 2016 · 2180fe9 · 2180fe9
2 parents 281dc1f + c4a1161
commit 2180fe9
Show file tree

Hide file tree

Showing 10 changed files with 51 additions and 33 deletions.
diff --git a/data/data.pro b/data/data.pro
@@ -16,7 +16,7 @@ testdata.files = \
 INSTALLS += testdata
 
 applications.path = /usr/share/applications
-applications.files = defaults.list
+applications.files = mimeapps.list
 INSTALLS += applications
 
 XML_FILES = highlight1.xml.in

diff --git a/data/defaults.list → data/mimeapps.list b/data/defaults.list → data/mimeapps.list
diff --git a/rpm/libcontentaction-qt5.spec b/rpm/libcontentaction-qt5.spec
@@ -1,6 +1,6 @@
 Name:       libcontentaction-qt5
 Summary:    Library for associating content with actions
-Version:    0.2.3
+Version:    0.2.9
 Release:    1
 Group:      System/Desktop
 License:    LGPLv2.1
@@ -79,7 +79,7 @@ rm -rf %{buildroot}
 %{_datadir}/contentaction/highlight1.xml
 %{_datadir}/contentaction/tracker1.xml
 %{_libdir}/libcontentaction5.so.*
-%exclude %{_datadir}/applications/defaults.list
+%exclude %{_datadir}/applications/mimeapps.list
 
 %files devel
 %defattr(-,root,root,-)

diff --git a/src/mime.cpp b/src/mime.cpp
@@ -80,7 +80,7 @@ void readKeyValues(QFile& file, QHash<QString, QString>& dict)
 
 
 QHash<QString, QString> readChangedKeyValueFiles(const QStringList& dirs,
-                                                 const QString& suffix)
+                                                 const QStringList& suffixes)
 {
     // Read each file if it has changed since the last time we read it.
 
@@ -106,19 +106,24 @@ QHash<QString, QString> readChangedKeyValueFiles(const QStringList& dirs,
     // Read the files in such a order that the first ones override the later
     // ones.
     for (int i = dirs.size()-1; i >= 0; --i) {
-        long lm = 0;
-        QString filename = dirs[i] + suffix;
-        if (!readLastModifiedTime(filename, lm)) {
-            // Most probably the file doesn't exist.
-            continue;
-        }
-        if (!rereadAllThatFollows && lm == lastModified.value(filename)) {
-            continue;
+        for (int suffix = 0; suffix < suffixes.size(); suffix++) {
+            QString filename = dirs[i] + suffixes[suffix];
+            if (QFileInfo::exists(filename)) {
+                long lm = 0;
+                if (!readLastModifiedTime(filename, lm)) {
+                    // Most probably the file doesn't exist.
+                    continue;
+                }
+                if (!rereadAllThatFollows && lm == lastModified.value(filename)) {
+                    continue;
+                }
+                QFile f(filename);
+                readKeyValues(f, temp);
+                lastModified[filename] = lm;
+                rereadAllThatFollows = true;
+                break;
+            }
         }
-        QFile f(filename);
-        readKeyValues(f, temp);
-        lastModified[filename] = lm;
-        rereadAllThatFollows = true;
     }
     return temp;
 }
@@ -172,12 +177,11 @@ QString Internal::mimeForFile(const QUrl& uri)
         char *type = g_content_type_guess (fileUri.toLocalFile().toLocal8Bit().constData(),
                                            NULL, 0, NULL);
         QString res;
-        if (type)
-          {
+        if (type) {
             gchar *temp = g_content_type_get_mime_type (type);
             res = temp;
             g_free (temp);
-          }
+        }
         g_free (type);
         return res;
     }
@@ -215,9 +219,17 @@ static const QStringList& xdgDataDirs()
     return dirs;
 }
 
+static const QString getMimeFile(QString rootPath)
+{
+    QString mimeFileDB = rootPath + "/applications/mimeapps.list";
+    if (!QFileInfo::exists(mimeFileDB))
+        mimeFileDB = rootPath + "/applications/defaults.list";
+    return mimeFileDB;
+}
+
 static void writeDefaultsList(const QHash<QString, QString>& defaults)
 {
-    QString targetFileName = xdgDataHome() + "/applications/defaults.list";
+    QString targetFileName = xdgDataHome() + "/applications/mimeapps.list";
     QFile outFile(targetFileName + ".temp");
     if (!outFile.open(QIODevice::WriteOnly)) {
         LCA_WARNING << "cannot write" << outFile.fileName();
@@ -251,9 +263,9 @@ void setMimeDefault(const QString& mimeType, const Action& action)
 void setMimeDefault(const QString& mimeType, const QString& app)
 {
     QHash<QString, QString> defaults;
-    // Read the contents of $XDG_DATA_HOME/applications/defaults.list (if
+    // Read the contents of $XDG_DATA_HOME/applications/mimeapps.list (if
     // it exists)
-    QFile file(xdgDataHome() + "/applications/defaults.list");
+    QFile file(getMimeFile(xdgDataHome()));
     readKeyValues(file, defaults);
 
     defaults[mimeType] = app + ".desktop";
@@ -267,9 +279,9 @@ void setMimeDefault(const QString& mimeType, const QString& app)
 void resetMimeDefault(const QString& mimeType)
 {
     QHash<QString, QString> defaults;
-    // Read the contents of $XDG_DATA_HOME/applications/defaults.list (if
+    // Read the contents of $XDG_DATA_HOME/applications/mimeapps.list (if
     // it exists)
-    QFile file(xdgDataHome() + "/applications/defaults.list");
+    QFile file(getMimeFile(xdgDataHome()));
     readKeyValues(file, defaults);
 
     defaults.remove(mimeType);
@@ -294,18 +306,20 @@ QString Internal::findDesktopFile(const QString& id)
 }
 
 // Returns the default application for handling the given \a contentType. The
-// default application is read from the defaults.list. If there is no default
+// default application is read from the mimeapps.list. If there is no default
 // application, returns an empty string.
 QString Internal::defaultAppForContentType(const QString& contentType)
 {
     static QHash<QString, QString> defaultApps;
 
     QStringList dirs = xdgDataDirs();
 
-    // Read the defaults.lists which have changed since we read them the last
-    // time.
-    QHash<QString, QString> temp = readChangedKeyValueFiles(dirs,
-                                                            "/applications/defaults.list");
+    // Read the mimeapps.lists / defaults.lists which have changed since we
+    // read them the last time.
+    QStringList files;
+    files << "/applications/mimeapps.list";
+    files << "/applications/defaults.list";
+    QHash<QString, QString> temp = readChangedKeyValueFiles(dirs, files);
 
     // Merge the results into our cache
     QHashIterator<QString, QString> it(temp);
@@ -330,10 +344,11 @@ const QHash<QString, QStringList>& Internal::mimeApps()
 
     QStringList dirs = xdgDataDirs();
 
+
     // Read the mimeinfo.caches which have changed since we read them the last
     // time.
     QHash<QString, QString> temp = readChangedKeyValueFiles(dirs,
-                                                            "/applications/mimeinfo.cache");
+                                                            QStringList("/applications/mimeinfo.cache"));
 
     // Merge the changes into our cache
     QHashIterator<QString, QString> it(temp);

diff --git a/src/src.pro b/src/src.pro
@@ -8,6 +8,7 @@ include(../common.pri)
 # day?
 VERSION = 0.0.75
 
+
 QT = core xml dbus
 CONFIG += link_pkgconfig hide_symbols
 CONFIG -= link_prl

diff --git a/tests/applications/applications.pro b/tests/applications/applications.pro
@@ -5,7 +5,7 @@ include(../../common.pri)
 desktop_tests.path = $$CONTENTACTION_TESTDIR/applications
 desktop_tests.files = \
     mimeinfo.cache \
-    defaults.list \
+    mimeapps.list \
     uberexec.desktop \
     unterexec.desktop \
     ubermimeopen.desktop \

diff --git a/tests/test-invalid-defaults.py b/tests/test-invalid-defaults.py
@@ -38,7 +38,7 @@
 class InvalidDefaults(unittest.TestCase):
     def testInvalidDefaultForUri(self):
         # this uri is a ncal:Event, and x-maemo-nepomuk/calendar-event has a
-        # defaults.list entry pointing to a nonexistent application.
+        # mimeapps.list entry pointing to a nonexistent application.
         (status, output) = getstatusoutput("lca-tool --tracker --printdefault urn:test:calendarevent")
         self.assert_(status == 0)
         self.assert_(output.find("Invalid action") != -1)

diff --git a/tests/test-mimedefaults.cpp b/tests/test-mimedefaults.cpp
@@ -57,7 +57,7 @@ void TestMimeDefaults::initTestCase()
 void TestMimeDefaults::cleanupTestCase()
 {
     // Unfortunately, no rmtree in Qt/C++.
-    QFile file(tempApplications + "/defaults.list");
+    QFile file(tempApplications + "/mimeapps.list");
     file.remove();
     QDir(".").rmpath(QString(tempApplications));
 }

diff --git a/tests/testcase.pri b/tests/testcase.pri
@@ -1,5 +1,6 @@
 QT += testlib
 INCLUDEPATH += ../src
+
 LIBS += -L../src
 LIBS += -lcontentaction5
 

diff --git a/tests/tests.pro b/tests/tests.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
+
 SUBDIRS = \
     applications \
     test-l10n-data \