Merge lp:~mzanetti/unity8/support-short-appid-in-gsettings into lp:unity8

[Michael Zanetti]

support appid:// entries in gsettings schema and make findDesktopFile work with short-appid

This is now able to load appid:// entries from gsettings and can find .desktop files for short-appids, however, unity still fails to launch applications by short-appid. So this doesn't fully work until the ApplicationManager is patched to support that.

 * Are there any related MPs required for this MP to build/function as expected? Please list.

https://code.launchpad.net/~gerboland/unity-mir/shortAppIds-0.1.9/+merge/219377

 * Did you perform an exploratory manual test run of your code change and any related functionality?

Yes.

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

N/A

 * If you changed the UI, has there been a design review?

N/A

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:747
http://jenkins.qa.ubuntu.com/job/unity8-ci/2506/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3960
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3545
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1027
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1031
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1031/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1027
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3457
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3995
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3995/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3547
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3547/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5880
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4834

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2506/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:748
http://jenkins.qa.ubuntu.com/job/unity8-ci/2510/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3967
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3552
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1380
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/1031
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1035
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/1035/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/1031
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3462
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4002
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4002/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3554
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3554/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5888
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4844

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2510/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Checklist, please, and is there work ongoing on the ApplicationManager for the corresponding fix?

review: Needs Information

[Michael Zanetti (mzanetti)]

> Checklist, please, and is there work ongoing on the ApplicationManager for the
> corresponding fix?

Checklist added. I'm not aware of any activities related this in the AppManager yet.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:753
http://jenkins.qa.ubuntu.com/job/unity8-ci/2953/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/181
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1813/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/47
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/47/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/47
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/677
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/398
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/398/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/7107

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2953/rebuild

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

LGTM

review: Approve

=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.cpp'
--- plugins/Unity/Launcher/backend/launcherbackend.cpp	2014-04-29 15:38:32 +0000
+++ plugins/Unity/Launcher/backend/launcherbackend.cpp	2014-05-13 11:25:10 +0000
@@ -31,7 +31,6 @@
 class LauncherBackendItem
 {
 public:
-    QString desktopFile;
     QString displayName;
     QString icon;
     int     count;
@@ -107,11 +106,6 @@
 
 QString LauncherBackend::desktopFile(const QString &appId) const
 {
-    LauncherBackendItem *item = m_itemCache.value(appId, nullptr);
-    if (item) {
-        return item->desktopFile;
-    }
-
     return findDesktopFile(appId);
 }
 
@@ -264,7 +258,7 @@
         Q_FOREACH(const QString &entry, gSettings.get("favorites").toStringList()) {
             if (entry.startsWith("application://")) {
                 QString appId = entry;
-                // Transform "application://foobar.desktop" to "foobar"
+                // Transform "application://foobar.desktop" to "application://foobar"
                 appId.remove("application://");
                 if (appId.endsWith(".desktop")) {
                     appId.chop(8);
@@ -279,6 +273,26 @@
                     }
                 }
             }
+            if (entry.startsWith("appid://")) {
+                QString appId = entry;
+                appId.remove("appid://");
+                // Strip hook name and current-user-version in case its there
+
+                if (appId.split('/').count() != 3) {
+                    qWarning() << "ignoring entry " + appId + ". Not a valid appId.";
+                    continue;
+                }
+                appId = appId.split('/').first() +  "_" + appId.split('/').at(1);
+                QString df = findDesktopFile(appId);
+
+                if (!df.isEmpty()) {
+                    m_storedApps << appId;
+
+                    if (!m_itemCache.contains(appId)) {
+                        m_itemCache.insert(appId, parseDesktopFile(df));
+                    }
+                }
+            }
         }
     } else {
         for (const QVariant &app: apps) {
@@ -315,10 +329,13 @@
             helper = helper.replace(dashPos, 1, '/');
         }
 
-        Q_FOREACH(const QString &searchDir, searchDirs) {
-            QFileInfo fileInfo(QDir(searchDir), helper + ".desktop");
-            if (fileInfo.exists()) {
-                return fileInfo.absoluteFilePath();
+        Q_FOREACH(const QString &searchDirName, searchDirs) {
+            QDir searchDir(searchDirName);
+            Q_FOREACH(const QString &desktopFile, searchDir.entryList(QStringList() << "*.desktop")) {
+                if (desktopFile.startsWith(helper)) {
+                    QFileInfo fileInfo(searchDir, desktopFile);
+                    return fileInfo.absoluteFilePath();
+                }
             }
         }
 
@@ -333,7 +350,6 @@
     QSettings settings(desktopFile, QSettings::IniFormat);
 
     LauncherBackendItem* item = new LauncherBackendItem();
-    item->desktopFile = desktopFile;
     item->displayName = settings.value("Desktop Entry/Name").toString();
 
     QString iconString = settings.value("Desktop Entry/Icon").toString();
@@ -367,7 +383,7 @@
                 qWarning() << "Unable to parse desktop file for" << appId << "path" << df;
             }
         } else {
-            qDebug() << "Unable to find desktop file for:" << appId;
+            qWarning() << "Unable to find desktop file for:" << appId;
         }
     }
 
@@ -391,7 +407,6 @@
 
     item = new LauncherBackendItem();
 
-    item->desktopFile = details.value("desktopFile").toString();
     item->displayName = details.value("name").toString();
     item->icon = details.value("icon").toString();
     item->count = details.value("count").toInt();
@@ -408,7 +423,6 @@
     details.insert("id", appId);
     details.insert("name", item->displayName);
     details.insert("icon", item->icon);
-    details.insert("desktopFile", item->desktopFile);
     details.insert("count", item->count);
     details.insert("countVisible", item->countVisible);
     return details;