Merge lp:~mzanetti/unity-mir/fix-appid-parsing into lp:unity-mir

[Michael Zanetti]

fix loading of appId when an app is launched with --desktop_file_hint

The applicationmanager uses the appId to identify applications. Right now there is a bug that causes the appId to be set to the full .desktop file path instead of only the appId. This causes focusing issues for manually launched (via cmdline) apps and also breaks app_lifecycle AP tests on Mir.

The issue is that the DesktopFileReader can be called with both, an appid and a file path and correctly finds the according desktop file, but in case it's called with a full file path, it assigns that one to the appId instead of exctracting the appId from it.

This merge splits the DesktopFileReader's ctor into 2 in order to avoid such confusion. When using a QString, it expects an appId. In order to load a .desktop file specified by a filename, the second ctor with QFileInfo is to be used.

This merge obviously also makes use of the QFileInfo ctor in the case when we launch an app with --desktop_file_hint, while keeping on using the appId version for all other cases.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:114
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/104/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/46
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/104
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/104/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/104

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-mir-ci/104/rebuild

review: Approve (continuous-integration)

[lp:~mzanetti/unity-mir/fix-appid-parsing]

115. By Michael Zanetti on 2013-10-11

add support for giving only the appId with --desktop_file_hint

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:115
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/107/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/107
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/107/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/107

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-mir-ci/107/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2013-10-10 19:48:57 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2013-10-11 09:37:27 +0000
@@ -386,7 +386,15 @@
     QString desktopFileName = regExpMatch.captured(1);
     DLOG("Process supplied desktop_file_hint, loading '%s'", desktopFileName.toLatin1().data());
 
-    DesktopFileReader* desktopData = new DesktopFileReader(desktopFileName);
+    // FIXME: right now we support --desktop_file_hint=appId for historical reasons. So let's try that in
+    // case we didn't get an existing .desktop file path
+    DesktopFileReader* desktopData;
+    if (QFileInfo(desktopFileName).exists()) {
+        desktopData = new DesktopFileReader(QFileInfo(desktopFileName));
+    } else {
+        desktopData = new DesktopFileReader(desktopFileName);
+    }
+
     if (!desktopData->loaded()) {
         delete desktopData;
         LOG("ApplicationManager REJECTED connection from app with pid %lld as desktop_file_hint file not found", pid);

=== modified file 'src/modules/Unity/Application/desktopfilereader.cpp'
--- src/modules/Unity/Application/desktopfilereader.cpp	2013-09-19 20:37:30 +0000
+++ src/modules/Unity/Application/desktopfilereader.cpp	2013-10-11 09:37:27 +0000
@@ -29,20 +29,25 @@
 #define ARRAY_SIZE(a) \
     ((sizeof(a) / sizeof(*(a))) / static_cast<size_t>(!(sizeof(a) % sizeof(*(a)))))
 
-DesktopFileReader::DesktopFileReader(QString appId)
+DesktopFileReader::DesktopFileReader(const QString &appId)
     : appId_(appId)
     , entries_(DesktopFileReader::kNumberOfEntries, "")
 {
     DLOG("DesktopFileReader::DesktopFileReader (this=%p, appId='%s')", this, appId.toLatin1().data());
     DASSERT(appId != NULL);
 
-    QFileInfo file(appId);
-    if(file.exists()) {
-        file_ = appId;
-    } else {
-        file_ = findDesktopFile(appId);
-    }
-
+    file_ = findDesktopFile(appId);
+    loaded_ = loadDesktopFile(file_);
+}
+
+DesktopFileReader::DesktopFileReader(const QFileInfo &desktopFile)
+    : entries_(DesktopFileReader::kNumberOfEntries, "")
+{
+    DLOG("DesktopFileReader::DesktopFileReader (this=%p, desktopFile='%s')", this, desktopFile.absoluteFilePath().toLatin1().data());
+    DASSERT(desktopFile.exists());
+
+    appId_ = desktopFile.completeBaseName();
+    file_ = desktopFile.absoluteFilePath();
     loaded_ = loadDesktopFile(file_);
 }
 

=== modified file 'src/modules/Unity/Application/desktopfilereader.h'
--- src/modules/Unity/Application/desktopfilereader.h	2013-09-12 17:27:47 +0000
+++ src/modules/Unity/Application/desktopfilereader.h	2013-10-11 09:37:27 +0000
@@ -19,10 +19,12 @@
 
 #include <QString>
 #include <QVector>
+#include <QFileInfo>
 
 class DesktopFileReader {
 public:
-    DesktopFileReader(QString desktopFile);
+    DesktopFileReader(const QString &appId);
+    DesktopFileReader(const QFileInfo &desktopFile);
     ~DesktopFileReader();
 
     QString file() const { return file_; }