Merge lp:~ted/unity8/no-home-applications into lp:unity8

[Ted Gould]

Use a Click hook instead of a file watch to detect installed applications

Currently a file watch is being used, which has a hard coded home directory in it. We can avoid that hard coded directory and the file watch by using a Click hook to send the signal. Abstracted the signal into a shell script so that both can call the same script.

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2329
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1020/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1368/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1020/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2329
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1023/
Executed test runs:
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/580
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/580
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/580/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1371
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1341
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1341
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1341
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1341
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1341/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1341
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1341/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1341
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1341/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1341
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1341/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1341
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1341/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1341
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1341/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1341
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1341/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1341
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1341/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1341
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1341/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/1023/rebuild

review: Needs Fixing (continuous-integration)

[Michael Terry (mterry)]

I like this, but a couple comments:

- The old code looked in ~/.local/share/applications, but this now looks just in .cache/unity8/click-desktops. (A) I don't have that directory on my phone, who makes that? and (B) the old location covered more than just clicks. Though I guess that would be sufficient for the Touch use case.

- The script's dbus check could more nicely look like:

set -a

if [ -z "$DBUS_SESSION_BUS_ADDRESS" -a -n "$XDG_RUNTIME_DIR" ] ; then
 . "$XDG_RUNTIME_DIR/dbus-session"
fi

review: Needs Information

[Ted Gould (ted)]

On Tue, 2016-04-26 at 12:10 +0000, Michael Terry wrote:
> - The old code looked in ~/.local/share/applications, but this now
> looks just in .cache/unity8/click-desktops.
To be clear, it doesn't "look in", it gets called when that directory
is updated. The actual existence of the directory isn't important to
this. So the person calling it is click itself, there is no file watch.
> (A) I don't have that directory on my phone, who makes that? and
Click will make the directory when the hook runs. If you build a deb
and install it on your device you'll have to log in and out to make it
appear. But for anyone updating with images it should be when the
update.
> (B) the old location covered more than just clicks. Though I guess
> that would be sufficient for the Touch use case.
Yes, that's what I was targeting, but if there are use-cases for the
home directory we can talk about it.
> - The script's dbus check could more nicely look like:
>
> set -a
>
> if [ -z "$DBUS_SESSION_BUS_ADDRESS" -a -n "$XDG_RUNTIME_DIR" ] ; then
> . "$XDG_RUNTIME_DIR/dbus-session"
> fi
>

I'm not sure if the click user hooks always end up with XDG_RUNTIME_DIR
set. They're basically run through Python code that changes user in
cases of sideloading. It seems if XDG_RUNTIME_DIR is set, it is likely
that the dbus variables are set.

[Michael Terry (mterry)]

>> (A) I don't have that directory on my phone, who makes that? and
> Click will make the directory when the hook runs. If you build a deb
> and install it on your device you'll have to log in and out to make it
> appear. But for anyone updating with images it should be when the
> update.

Does the directory not stay around? I was testing on a phone with installed clicks and that directory didn't exist.

Or are you saying that the click makes the directory, puts a desktop file in it, runs this hook, then deletes the directory?

[Albert Astals Cid (aacid)]

Text conflict in data/unity8-filewatcher.conf
1 conflicts encountered.

[Albert Astals Cid (aacid)]

Conflict not merged for over a month, putting back to Work In Progress to clear the queue

Unmerged revisions

2329. By Ted Gould on 2016-04-19

Update to trunk and g_get_user_name()

2328. By Ted Gould on 2016-04-06

Handle not having the session bus environment variable set

2327. By Ted Gould on 2016-04-06

Grabbing syscall branch

2326. By Ted Gould on 2016-04-06

Remove dependence on a specific home directory by using a click hook for refresh

=== modified file 'data/unity8-filewatcher.conf'
--- data/unity8-filewatcher.conf	2014-08-22 11:19:51 +0000
+++ data/unity8-filewatcher.conf	2016-04-19 20:58:36 +0000
@@ -1,8 +1,7 @@
-description "File system watcher for unity8"
+description "System application watcher for unity8 for Deb-based systems"
 author "Michael Zanetti <[e-mail]>"
 
-# Workaround for bug 1360208. ~ and * in one expression doesn't work currently
-start on (file FILE=/home/phablet/.local/share/applications/*.desktop) or (file FILE=/usr/share/applications/*.desktop)
+start on (file FILE=/usr/share/applications/*.desktop)
 
-exec dbus-send --type=method_call --dest=com.canonical.Unity.Launcher /com/canonical/Unity/Launcher com.canonical.Unity.Launcher.Refresh
+exec unity8-launcher-refresh
 

=== modified file 'debian/control'
--- debian/control	2016-03-30 22:34:41 +0000
+++ debian/control	2016-04-19 20:58:36 +0000
@@ -2,7 +2,8 @@
 Section: x11
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: cmake,
+Build-Depends: click-dev,
+               cmake,
                dbus-test-runner,
                debhelper (>= 9),
                doxyqml,

=== modified file 'debian/rules'
--- debian/rules	2016-01-18 18:18:50 +0000
+++ debian/rules	2016-04-19 20:58:36 +0000
@@ -9,7 +9,7 @@
 export NO_PNG_PKG_MANGLE=1
 
 %:
-	dh $@ --parallel --fail-missing --with python3
+	dh $@ --parallel --fail-missing --with python3,click
 
 override_dh_auto_configure:
 	# Debian defines CMAKE_INSTALL_LOCALSTATEDIR as /usr/var, which is wrong.

=== added file 'debian/unity8.click-hook'
--- debian/unity8.click-hook	1970-01-01 00:00:00 +0000
+++ debian/unity8.click-hook	2016-04-19 20:58:36 +0000
@@ -0,0 +1,4 @@
+Pattern: ${home}/.cache/unity8/click-desktops/${short-id}.desktop
+Exec: unity8-launcher-refresh
+User-Level: yes
+Hook-Name: desktop

=== modified file 'debian/unity8.install'
--- debian/unity8.install	2015-11-20 13:04:46 +0000
+++ debian/unity8.install	2016-04-19 20:58:36 +0000
@@ -4,6 +4,7 @@
 data/unity8.conf usr/share/upstart/sessions/
 usr/bin/unity8
 usr/bin/unity8-dash
+usr/bin/unity8-launcher-refresh
 usr/share/applications/unity8-dash.desktop
 usr/share/applications/unity8.desktop
 usr/share/unity8/Greeter

=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2015-07-01 10:48:40 +0000
+++ tools/CMakeLists.txt	2016-04-19 20:58:36 +0000
@@ -12,3 +12,5 @@
     )
 
 install(FILES unlock-device DESTINATION ${SHELL_APP_DIR})
+
+install(PROGRAMS unity8-launcher-refresh DESTINATION ${CMAKE_INSTALL_BINDIR})

=== added file 'tools/unity8-launcher-refresh'
--- tools/unity8-launcher-refresh	1970-01-01 00:00:00 +0000
+++ tools/unity8-launcher-refresh	2016-04-19 20:58:36 +0000
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+if [ -z $DBUS_SESSION_BUS_ADDRESS ] ; then
+	UID=`id -u`
+	export `cat /run/user/${UID}/dbus-session`
+fi
+
+exec dbus-send --type=method_call --dest=com.canonical.Unity.Launcher /com/canonical/Unity/Launcher com.canonical.Unity.Launcher.Refresh