Merge lp:~michihenning/thumbnailer/snap into lp:thumbnailer/devel

[Michi Henning]

First stab at snapcraft.yaml.

First stab at snapcraft.yaml.

It's not clear yet whether we really want to use the generic DBus interface or add our own interface to snapd. For now, we use the generic one; this works, in that thumbnailer-admin can talk to the (hand-started) thumbnailer-service. Presumably, that's because both are in the same snap. Next step will be to try with thumbnailer-admin in a separate snap.

To try this (from the top-level dir):

$ snapcraft
$ thumbnailer.thumbnailer-service &
$ thumbnailer.thumbnailer-admin stats

[James Henstridge (jamesh)]

One small problem, and a few questions.

review: Needs Fixing

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:366
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/16/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1519/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1526
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1304/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1304/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1304/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1304/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1304/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1304/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[Michi Henning (michihenning)]

Replied inline, thanks!

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:367
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/17/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1520/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1527
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1305/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1305/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1305/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1305/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1305/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1305/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/17/rebuild

review: Needs Fixing (continuous-integration)

[James Henstridge (jamesh)]

Looks good. I am a bit concerned about the "control" slot you're exposing though: the dbus interface auto connects, and I don't think we want this one auto-connecting.

Also, we don't ever acquire the name "com.canonical.ThumbnailerAdmin", so that doesn't sound quite right either.

I wonder if there is anything to allow snaps to communicate with other binaries from the same snap via dbus? If so, then we wouldn't even need this second slot.

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:368
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/18/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1521/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1528
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1306/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1306/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1306/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1306/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1306/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1306/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/18/rebuild

review: Needs Fixing (continuous-integration)

[James Henstridge (jamesh)]

I've added a few inline comments.

These are the changes I made while testing out the snap: http://paste.ubuntu.com/23873664/. With those changes, I tried using my second snap to access the thumbnailer:

  $ sudo snap install --dangerous thumbnailer-admin-test_0.1_amd64.snap
  $ sudo connect thumbnailer-admin-test:thumbnailer thumbnailer:thumbnailer
  $ thumbnailer-admin-test.admin get-album Radiohead 'Ok Computer'
  thumbnailer-admin: Handler::createFinished(): could not get thumbnail for album: Radiohead/Ok Computer (0,0): ERROR

On the service side, I got the following:

  $ thumbnailer.thumbnailer-service
  thumbnailer-service: [15:57:10.144] Initializing
  thumbnailer-service: [15:57:10.440] image cache: 0 entries, 0 bytes, hit rate 0.00 (0/0), avg hit run 0.00, avg miss run 0.00
  thumbnailer-service: [15:57:10.440] thumbnail cache: 0 entries, 0 bytes, hit rate 0.00 (0/0), avg hit run 0.00, avg miss run 0.00
  thumbnailer-service: [15:57:10.440] failure cache: 0 entries, 0 bytes, hit rate 0.00 (0/0), avg hit run 0.00, avg miss run 0.00

  (process:13511): GdkPixbuf-WARNING **: Cannot open pixbuf loader module file '/home/james/snap/thumbnailer/x1/.cache/gdk-pixbuf-loaders.cache': No such file or directory

  This likely means that your installation is broken.
  Try running the command
    gdk-pixbuf-query-loaders > /home/james/snap/thumbnailer/x1/.cache/gdk-pixbuf-loaders.cache
to make things work again for the time being.

  (process:13511): GdkPixbuf-WARNING **: Cannot open pixbuf loader module file '/home/james/snap/thumbnailer/x1/.cache/gdk-pixbuf-loaders.cache': No such file or directory

  This likely means that your installation is broken.
  Try running the command
    gdk-pixbuf-query-loaders > /home/james/snap/thumbnailer/x1/.cache/gdk-pixbuf-loaders.cache
to make things work again for the time being.
  thumbnailer-service: [15:57:30.227] Warning: "Handler::createFinished(): could not get thumbnail for album: Radiohead/Ok Computer (0,0): ERROR"

So it is still not quite right. It looks like there is some support for gdk-pixbuf in the desktop-launch script, but it only comes into play if we ship gdk-pixbuf plus loaders as part of our snap.

review: Needs Fixing

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:371
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/19/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1535
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1542
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1320
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1320/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1320
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1320/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1320
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1320/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1320
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1320/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1320
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1320/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1320
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1320/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/19/rebuild

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Okay, I'm now able to build a thumbnailer snap that can talk to the thumbnailer-admin-test snap without any post install fixups.

To make sure the new version of the part is used, I rebuilt with:

    snapcraft clean
    snapcraft update
    snapcraft

(The "update" operation downloads a new copy of parts.yaml).

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2013-09-20 14:31:57 +0000
+++ .bzrignore	2017-01-30 03:06:38 +0000
@@ -1,4 +1,8 @@
-build
+./build
 .project
 .cproject
 .settings
+./parts
+./prime
+./stage
+./thumbnailer*.snap

=== added file 'snapcraft.yaml'
--- snapcraft.yaml	1970-01-01 00:00:00 +0000
+++ snapcraft.yaml	2017-01-30 03:06:38 +0000
@@ -0,0 +1,80 @@
+name: thumbnailer
+version: '2.4'
+summary: Daemon and admin tool to create and cache image thumbnails for media files
+description: >
+  This snap provides thumbnailer-service, a DBus daemon that extracts thumbnails from
+  local media files and retrieves music album artwork from dash.ubuntu.com. It also
+  includes thumbnailer-admin, a command-line utility that allows for basic cache
+  maintenance and testing. See lp:thumbnailer for more detail.
+grade: devel
+confinement: strict
+
+slots:
+  thumbnailer:
+    interface: dbus
+    name: com.canonical.Thumbnailer
+    bus: session
+
+plugs:
+  platform:
+    interface: content
+    content: ubuntu-app-platform1
+    target: ubuntu-app-platform
+    default-provider: ubuntu-app-platform
+  network-manager:
+    interface: network-manager
+  thumbnails:
+    interface: dbus
+    name: com.canonical.Thumbnailer
+    bus: session
+
+apps:
+  thumbnailer-service:
+    command: desktop-launch $SNAP/lib/thumbnailer/thumbnailer-service
+    # TODO: Currently cannot use a simple daemon with the session bus. For now,
+    # the service must be started by hand. See https://github.com/snapcore/snapd/pull/2592
+    # daemon: simple
+    plugs:
+      - platform
+      - network
+      # TODO: This grants more privileges than we really need but, without this, apparmor
+      # denies access.
+      - network-manager
+      # TODO: The gsettings interface currently does not permit reading.
+      # See https://bugs.launchpad.net/snappy/+bug/1600154
+      # For now, the service uses default settings because it's gsettings lookups fail.
+      - gsettings
+    slots:
+      - thumbnailer
+  thumbnailer-admin:
+    command: desktop-launch $SNAP/bin/thumbnailer-admin
+    plugs:
+      - platform
+      - thumbnails
+
+parts:
+  thumbnailer:
+    plugin: cmake
+    source: .
+    after:
+      - desktop-ubuntu-app-platform
+    filesets:
+      binaries:
+        - bin/*
+        - lib/thumbnailer/*
+      man:
+        - share/man/*
+      etc:
+        - etc/*
+      share:
+        # TODO: This does not seem to have any effect. It is unclear right now how gsettings
+        # schemas need to be installed.
+        - share/glib-2.0/*
+    prime:
+      - $binaries
+      - $man
+      - $etc
+      - $share
+      - ubuntu-app-platform
+    install: |
+      mkdir $SNAPCRAFT_PART_INSTALL/ubuntu-app-platform

=== modified file 'tests/copyright/check_copyright.sh'
--- tests/copyright/check_copyright.sh	2016-05-30 09:44:33 +0000
+++ tests/copyright/check_copyright.sh	2017-01-30 03:06:38 +0000
@@ -31,7 +31,7 @@
 [ $# -lt 1 ] && usage
 [ $# -gt 2 ] && usage
 
-ignore_pat="\\.sci$|\\.swp$|\\.bzr|debian|qmldir|HACKING|tsan-suppress|valgrind-suppress|testsong_ogg|\\.txt$|\\.xml$|\\.in$|\\.dox$|\\.html$|\\.map$|\\.aiff$|\\.gif$|\\.jpg$|\\.JPG$|\\.mp2$|\\.mp3$|\\.m4a$|\\.m4v$|\\.flac$|\\.oga$|\\.ogg$|\\.opus$|\\.png$|\\.svg$|\\.wav$|UseGSettings.cmake$"
+ignore_pat="\\.sci$|\\.swp$|\\.bzr|debian|qmldir|HACKING|tsan-suppress|valgrind-suppress|testsong_ogg|\\.txt$|\\.xml$|\\.in$|\\.dox$|\\.html$|\\.map$|\\.aiff$|\\.gif$|\\.jpg$|\\.JPG$|\\.mp2$|\\.mp3$|\\.m4a$|\\.m4v$|\\.flac$|\\.oga$|\\.ogg$|\\.opus$|\\.png$|\\.svg$|\\.wav$|UseGSettings.cmake$|\\.yaml$|parts|prime|stage|~[0-9]+~$"
 
 #
 # We don't use the -i option of licensecheck to add ignore_dir to the pattern because Jenkins creates directories

=== modified file 'tests/whitespace/CMakeLists.txt'
--- tests/whitespace/CMakeLists.txt	2015-05-22 03:13:47 +0000
+++ tests/whitespace/CMakeLists.txt	2017-01-30 03:06:38 +0000
@@ -3,7 +3,8 @@
 #
 
 add_test(whitespace
-  ${CMAKE_CURRENT_SOURCE_DIR}/check_whitespace.py
-  ${CMAKE_SOURCE_DIR}
-  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/check_whitespace.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}
+    ${CMAKE_SOURCE_DIR}/parts
+    ${CMAKE_SOURCE_DIR}/stage
+    ${CMAKE_BINARY_DIR}/prime
 )