Merge lp:~marcustomlinson/storage-framework/fix-for-dev-ppa into lp:storage-framework

[Marcus Tomlinson]

Fix to get storage-framework building in the dev-build-4 PPA

[Marcus Tomlinson (marcustomlinson)]

Got this when building in the dev-build-4 PPA

test 2
      Start 2: remote-client

2: Test command: /«PKGBUILDDIR»/obj-x86_64-linux-gnu/tests/remote-client/remote-client_test
2: Test timeout computed to be: 1500
2: [==========] Running 6 tests from 4 test cases.
2: [----------] Global test environment set-up.
2: [----------] 3 tests from RuntimeTest
2: [ RUN ] RuntimeTest.lifecycle
2: GetAccounts call failed: QDBusError("org.freedesktop.DBus.Error.UnknownMethod", "No such interface 'com.ubuntu.OnlineAccounts.Manager' on object at path /com/ubuntu/OnlineAccounts/Manager")
2: Bus unique name: ":1.2"
2: g_dbus_connection_real_closed: Remote peer vanished with error: Underlying GIOStream returned 0 bytes on an async read (g-io-error-quark, 0). Exiting.
2: [ OK ] RuntimeTest.lifecycle (101 ms)
2: [ RUN ] RuntimeTest.basic
2: GetAccounts call failed: QDBusError("org.freedesktop.DBus.Error.UnknownMethod", "No such interface 'com.ubuntu.OnlineAccounts.Manager' on object at path /com/ubuntu/OnlineAccounts/Manager")
2: Bus unique name: ":1.2"
2: GetAccounts call failed: QDBusError("org.freedesktop.DBus.Error.UnknownMethod", "No such interface 'com.ubuntu.OnlineAccounts.Manager' on object at path /com/ubuntu/OnlineAccounts/Manager")
2: Cannot find any online account
2: Configure at least one online account for a provider in System Settings -> Online Accounts
 2/13 Test #2: remote-client ........................................................***Exception: SegFault 1.14 sec
[==========] Running 6 tests from 4 test cases.
[----------] Global test environment set-up.
[----------] 3 tests from RuntimeTest
[ RUN ] RuntimeTest.lifecycle
GetAccounts call failed: QDBusError("org.freedesktop.DBus.Error.UnknownMethod", "No such interface 'com.ubuntu.OnlineAccounts.Manager' on object at path /com/ubuntu/OnlineAccounts/Manager")
Bus unique name: ":1.2"
g_dbus_connection_real_closed: Remote peer vanished with error: Underlying GIOStream returned 0 bytes on an async read (g-io-error-quark, 0). Exiting.
[ OK ] RuntimeTest.lifecycle (101 ms)
[ RUN ] RuntimeTest.basic
GetAccounts call failed: QDBusError("org.freedesktop.DBus.Error.UnknownMethod", "No such interface 'com.ubuntu.OnlineAccounts.Manager' on object at path /com/ubuntu/OnlineAccounts/Manager")
Bus unique name: ":1.2"
GetAccounts call failed: QDBusError("org.freedesktop.DBus.Error.UnknownMethod", "No such interface 'com.ubuntu.OnlineAccounts.Manager' on object at path /com/ubuntu/OnlineAccounts/Manager")
Cannot find any online account
Configure at least one online account for a provider in System Settings -> Online Accounts

[lp:~marcustomlinson/storage-framework/fix-for-dev-ppa]

29. By Michi Henning on 2016-07-21

Merged lp:~michihenning/storage-framework/fix-version-typo:
Fixed wrong version comparison for boost.

30. By Marcus Tomlinson on 2016-07-21

Fix for building in dev PPA

Unmerged revisions

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2016-07-21 12:22:21 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-04-20 01:56:37 +0000
+++ CMakeLists.txt	2016-07-21 12:22:21 +0000
@@ -4,9 +4,23 @@
     set(LOCAL_INSTALL "ON")
 endif()
 
-project(storage-framework C CXX)
-
 cmake_minimum_required(VERSION 3.0.2)
+project(storage-framework VERSION "0.1" LANGUAGES C CXX)
+
+# These variables should be incremented when we wish to create a new
+# source incompatible version of the the library where users of the
+# old API could will not compile against the new one.  It is not
+# necessary to increment this for ABI breaks that are source compatible.
+set(SF_PROVIDER_API_VERSION "1")
+set(SF_CLIENT_API_VERSION "1")
+
+# These two should be incremented when the ABI changes.
+set(SF_PROVIDER_SOVERSION "0")
+set(SF_CLIENT_SOVERSION "0")
+
+set(SF_PROVIDER_LIBVERSION "${SF_PROVIDER_SOVERSION}.${PROJECT_VERSION}")
+set(SF_CLIENT_LIBVERSION "${SF_CLIENT_SOVERSION}.${PROJECT_VERSION}")
+
 
 string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lower case
 
@@ -16,6 +30,12 @@
     message(FATAL_ERROR "Invalid CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}\nValid types are: ${ACCEPTED_BUILD_TYPES}")
 endif()
 
+# Ensure that generated files can be linked with.
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+include_directories(include)
+include_directories(${CMAKE_BINARY_DIR}/include)  # For generated headers
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -Wall -pedantic -Wextra -fvisibility=hidden")
 
 # Some additional warnings not included by the general flags set above.
@@ -79,11 +99,32 @@
 
 include(EnableCoverageReport)
 
+include(GNUInstallDirs)
+
+find_package(Boost COMPONENTS filesystem system thread REQUIRED)
+find_package(Qt5Concurrent REQUIRED)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5DBus REQUIRED)
+find_package(Qt5Network REQUIRED)
+find_package(Qt5Test REQUIRED)
+
+include(FindPkgConfig)
+pkg_check_modules(APPARMOR_DEPS REQUIRED libapparmor)
+pkg_check_modules(GLIB_DEPS REQUIRED glib-2.0)
+pkg_check_modules(ONLINEACCOUNTS_DEPS REQUIRED OnlineAccountsQt)
+
+add_definitions(-DQT_NO_KEYWORDS)
+
+add_subdirectory(include)
 add_subdirectory(src)
 add_subdirectory(tests)
+add_subdirectory(demo)
 
 enable_coverage_report(
     TARGETS
+        qt-client-lib-common
+        storage-framework-qt-client
+        storage-framework-qt-local-client
     FILTER
         ${CMAKE_SOURCE_DIR}/tests/*
         ${CMAKE_BINARY_DIR}/*

=== added directory 'data'
=== added file 'data/build-docs.sh'
--- data/build-docs.sh	1970-01-01 00:00:00 +0000
+++ data/build-docs.sh	2016-07-21 12:22:21 +0000
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+#
+# Copyright (C) 2016 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authors: James Henstridge <[e-mail]>
+#
+
+set -e
+
+mkdir doc-temp || true
+cd doc-temp
+
+gdbus-codegen --generate-docbook=docbook ../registry.xml ../provider.xml
+
+find . -name "docbook*.xml" -exec docbook2x-texi {} \;
+
+find . -name "com.canonical.*.texi" -exec texi2pdf --quiet {} \;
+
+pdfunite com.canonical.*.pdf ../dbus-interface.pdf

=== added file 'data/metadata-types.yaml'
--- data/metadata-types.yaml	1970-01-01 00:00:00 +0000
+++ data/metadata-types.yaml	2016-07-21 12:22:21 +0000
@@ -0,0 +1,31 @@
+# Name that should be shown to the user
+display-name: string
+
+# Whether there is data associated with this node
+has-document: boolean
+
+# If there is data, how much? In bytes
+document-size: uint64
+
+# When was it last modified?
+modification-time: date
+
+# If there's a thumbnail, what is its document id
+thumbnail: document-id
+
+# What are the MIME types of the data
+mimetype: string-list
+
+# Is there a copy of the document local?
+document-local: boolean
+
+# Whether there is a copy on the service we're exporting
+# to. Mostly useful for content originating locally to
+# ensure it has been uploaded.
+copy-on-service: boolean
+
+######
+# NOTE: These are the default entries that are defined, various
+# backends can provide their own metadata keys in the x- namespace.
+# That can then be supported by their libraries or developer docs.
+######

=== added file 'data/provider.xml'
--- data/provider.xml	1970-01-01 00:00:00 +0000
+++ data/provider.xml	2016-07-21 12:22:21 +0000
@@ -0,0 +1,256 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <!--
+      com.canonical.StorageFramework.Provider:
+      @short_description: Interface providing access to a storage account
+
+      For methods dealing with metadata, the representation
+      "(ssssia{sv})" is used, where the struct members are:
+        - item_id
+        - parent_id
+        - title
+        - etag
+        - type (enum: file, folder, root)
+        - metadata
+  -->
+  <interface name="com.canonical.StorageFramework.Provider">
+    <!--
+        Roots:
+        @short_description: Get the list of roots for the storage account
+        @roots: Returned list of roots.
+
+        Returns the list of top level root items provided by the
+        storage account.  For providers that expose a single hierarchy
+        of files, this list will contain a single item.
+    -->
+    <method name="Roots">
+      <arg type="a(ssssia{sv})" name="roots" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;unity::storage::internal::ItemMetadata&gt;"/>
+    </method>
+
+    <!--
+        List:
+        @short_description: list the children of the given folder
+        @item_id: the ID identifying the folder
+        @page_token: if not empty, return the page of results identified by this token.
+        @children: returned list of children
+        @next_token: if not empty, a token that can be used to request more results.
+
+        Lists the contents of the folder identified by the given ID.
+        If the folder contains many children, a subset of results may
+        be returned together with a token that can be used in a
+        subsequent List call to request more results.
+    -->
+    <method name="List">
+      <arg type="s" name="item_id" direction="in"/>
+      <arg type="s" name="page_token" direction="in"/>
+      <arg type="a(ssssia{sv})" name="children" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;unity::storage::internal::ItemMetadata&gt;"/>
+      <arg type="s" name="next_token" direction="out"/>
+    </method>
+
+    <!--
+        Lookup:
+        @short_description: lookup a child in a folder by name
+        @parent_id: the ID of the parent folder
+        @name: the name of the child
+        @items: the matching items in the folder
+    -->
+    <method name="Lookup">
+      <arg type="s" name="parent_id" direction="in"/>
+      <arg type="s" name="name" direction="in"/>
+      <arg type="a(ssssia{sv})" name="items" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="QList&lt;unity::storage::internal::ItemMetadata&gt;"/>
+    </method>
+
+    <!--
+        Metadata:
+        @short_description: get metadata for an item
+        @item_id: the ID of the item
+        @metadata: the item metadata
+    -->
+    <method name="Metadata">
+      <arg type="s" name="item_id" direction="in"/>
+      <arg type="(ssssia{sv})" name="metadata" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="unity::storage::internal::ItemMetadata"/>
+    </method>
+
+    <!--
+        CreateFolder:
+        @short_description: create a new folder
+        @parent_id: the ID of the parent folder
+        @name: the name of the new folder
+        @metadata: the metadata for the new folder
+    -->
+    <method name="CreateFolder">
+      <arg type="s" name="parent_id" direction="in"/>
+      <arg type="s" name="name" direction="in"/>
+      <arg type="(ssssia{sv})" name="metadata" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="unity::storage::internal::ItemMetadata"/>
+    </method>
+
+    <!--
+        CreateFile:
+        @short_description: create a new file
+        @parent_id: the ID of the parent folder
+        @name: the name of the new file
+        @content_type: the content type of the new file
+        @allow_overwrite: if false, the file creation will fail if it
+        would overwrite an existing file.
+        @upload_id: the identifier for this upload job
+        @file_descriptor: a file descriptor to write the file contents to
+
+        Begin the process of uploading a file.  To complete the
+        process, the application should write the file data to the
+        provided file descriptor, close it, and then call
+        FinishUpload.
+    -->
+    <method name="CreateFile">
+      <arg type="s" name="parent_id" direction="in"/>
+      <arg type="s" name="name" direction="in"/>
+      <arg type="s" name="content_type" direction="in"/>
+      <arg type="b" name="allow_overwrite" direction="in"/>
+      <arg type="s" name="upload_id" direction="out"/>
+      <arg type="h" name="file_descriptor" direction="out"/>
+    </method>
+
+    <!--
+        Update:
+        @short_description: update the contents of an existing file
+        @item_id: the ID of the file
+        @old_etag: if not empty, the expected etag of the old version
+        of the file.
+        @upload_id: the identifier for this upload job
+        @file_descriptor: a file descriptor to write the file contents to
+
+        Begin the process of updating an existing file.  Like with
+        CreateFile, the application must write the file contents to
+        the provided file descriptor, close it, and call
+        FinishUpload.
+
+        If old_etag is not empty, then the update will only succeed if
+        the current version of the file matches the given etag.  This
+        allows for lockless read-modify-update operations that detect
+        other writers.
+    -->
+    <method name="Update">
+      <arg type="s" name="item_id" direction="in"/>
+      <arg type="s" name="old_etag" direction="in"/>
+      <arg type="s" name="upload_id" direction="out"/>
+      <arg type="h" name="file_descriptor" direction="out"/>
+    </method>
+
+    <!--
+        FinishUpload:
+        @short_description: finish a CreateFile or Update job
+        @upload_id: the identifier for this upload
+        @metadata: the metadata for the file after the upload
+        completes.
+
+        Finish off an upload job (whether it is creating a new file or
+        updating an existing one).  The application is expected to
+        have closed the file descriptor associated with its end of the
+        upload before calling this, and an error will be returned if
+        it remains open.
+    -->
+    <method name="FinishUpload">
+      <arg type="s" name="upload_id" direction="in"/>
+      <arg type="(ssssia{sv})" name="metadata" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="unity::storage::internal::ItemMetadata"/>
+    </method>
+
+    <!--
+        CancelUpload:
+        @short_description: cancel an in progress upload job.
+        @upload_id: the identifier for this upload
+
+        Cancel an in-progress upload job.  This will release any
+        resources allocated as part of the upload, and may also be
+        called while a FinishUpload call is in progress (although it
+        might not have an effect).
+
+        If an application drops off the bus during an upload, the
+        storage provider will act as if an implicit CancelUpload
+        method call occurred.
+    -->
+    <method name="CancelUpload">
+      <arg type="s" name="upload_id" direction="in"/>
+    </method>
+
+    <!--
+        Download:
+        @short_description: download the contents of a file.
+        @item_id: the ID for the file
+        @download_id: an identifier for the download
+        @file_descriptor: a file descriptor used to read the contents
+
+        Start downloading the contents of a file.  The provided file
+        descriptor will be closed when the end of file is reached.
+        The application can check for errors in the download (e.g. if
+        the file was truncated) with the FinishDownload method.
+
+        The application can cancel the download by closing the file
+        descriptor early.
+    -->
+    <method name="Download">
+      <arg type="s" name="item_id" direction="in"/>
+      <arg type="s" name="download_id" direction="out"/>
+      <arg type="h" name="file_descriptor" direction="out"/>
+    </method>
+
+    <!--
+        FinishDownload:
+        @short_description: Finish a download and check for errors
+        @download_id: the identifier for the download
+    -->
+    <method name="FinishDownload">
+      <arg type="s" name="download_id" direction="in"/>
+    </method>
+
+    <!--
+        Delete:
+        @short_description: delete an item from storage
+        @item_id: the ID for the item
+
+        Delete an item from storage.  If the item is a folder, then
+        all children will be deleted too.
+    -->
+    <method name="Delete">
+      <arg type="s" name="item_id" direction="in"/>
+    </method>
+
+    <!--
+        Move:
+        @short_description: move an item to a new location
+        @item_id: the ID for the item
+        @new_parent_id: the ID for the new parent folder
+        @new_name: the new name for the item
+        @metadata: the metadata for the file in the new location
+    -->
+    <method name="Move">
+      <arg type="s" name="item_id" direction="in"/>
+      <arg type="s" name="new_parent_id" direction="in"/>
+      <arg type="s" name="new_name" direction="in"/>
+      <arg type="(ssssia{sv})" name="metadata" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="unity::storage::internal::ItemMetadata"/>
+    </method>
+
+    <!--
+        Copy:
+        @short_description: copy an item to a new location
+        @item_id: the ID for the item
+        @new_parent_id: the ID for the new parent folder
+        @new_name: the new name for the item
+        @metadata: the metadata for the file in the new location
+    -->
+    <method name="Copy">
+      <arg type="s" name="item_id" direction="in"/>
+      <arg type="s" name="new_parent_id" direction="in"/>
+      <arg type="s" name="new_name" direction="in"/>
+      <arg type="(ssssia{sv})" name="metadata" direction="out"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="unity::storage::internal::ItemMetadata"/>
+    </method>
+
+  </interface>
+</node>

=== added file 'data/registry.xml'
--- data/registry.xml	1970-01-01 00:00:00 +0000
+++ data/registry.xml	2016-07-21 12:22:21 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd">
+  <!--
+      com.canonical.StorageFramework.Registry:
+      @short_description: Interface to query the backend registry
+
+      Inteface to query the repository of backends that are
+      available.
+  -->
+  <interface name="com.canonical.StorageFramework.Registry">
+
+    <!--
+        GetBackend:
+        @short_description: request access to a storage account
+        @service_id: if not empty, restrict results to accounts
+            matching this service ID.
+        @bus_name: the bus name of the storage provider
+        @path: the object path of the storage account at the provider
+
+        Interactively prompt the user to pick a storage account for
+        use by the application, and return the D-Bus endpoint that can
+        be used to communicate with the associated provider.
+
+        As this involves user interaction, the caller should use a
+        relatively long time out for this method call.
+        -->
+    <method name="GetProvider">
+      <arg type="s" name="service_id" direction="in" />
+
+      <arg type="s" name="bus_name" direction="out" />
+      <arg type="o" name="path" direction="out" />
+    </method>
+  </interface>
+</node>

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-20 01:24:53 +0000
+++ debian/changelog	2016-07-21 12:22:21 +0000
@@ -1,4 +1,4 @@
-storage-framework (0.0.1) UNRELEASED; urgency=medium
+storage-framework (0.1-0ubuntu1) UNRELEASED; urgency=medium
 
   * Initial release.
 

=== modified file 'debian/control'
--- debian/control	2016-04-20 01:06:54 +0000
+++ debian/control	2016-07-21 12:22:21 +0000
@@ -1,5 +1,5 @@
 Source: storage-framework
-Section: libdevel
+Section: libs
 Priority: optional
 Maintainer: Ubuntu Core Developers <[e-mail]>
 Standards-Version: 3.9.6
@@ -7,11 +7,75 @@
                cmake-extras (>= 0.4),
                debhelper (>= 9),
                devscripts,
+               doxygen,
                google-mock,
+               libapparmor-dev,
+               libboost-filesystem-dev,
+               libboost-system-dev,
+               libboost-thread-dev,
+               libglib2.0-dev,
                libgtest-dev,
-               doxygen,
+               libonline-accounts-qt-dev,
+               libqtdbustest1-dev,
+               libunity-api-dev,
+               python3-gi,
+               qtbase5-dev,
+               qtbase5-dev-tools,
 Homepage: https://launchpad.net/storage-framework
 # if you don't have have commit access to this branch but would like to upload
 # directly to Ubuntu, don't worry: your changes will be merged back into the
 # upstream branch
 Vcs-Bzr: lp:storage-framework
+
+Package: libstorage-framework-provider-1-0
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Library for Storage Framework providers
+ Server-side runtime support for provider implementations.
+
+Package: libstorage-framework-qt-client-1-0
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Client library for the Storage Framework
+ Runtime support for storage framework clients.
+
+Package: libstorage-framework-qt-local-client-1-0
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Client library for the Storage Framework backed by the local file system
+ A version of the client-side API that implements a local
+ file system provider. This is intended mainly for testing;
+ it allows application code to use the storage framework
+ API without requiring use of DBus and cloud service account.
+
+Package: storage-framework-client-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+Depends: libstorage-framework-qt-client-1-0 (= ${binary:Version}),
+         libstorage-framework-qt-local-client-1-0 (= ${binary:Version}),
+         qtbase5-dev,
+         ${misc:Depends},
+Description: Header files for the Storage Framework client libraries
+ Development C++ headers for the client side API.
+
+Package: storage-framework-provider-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+Depends: libstorage-framework-provider-1-0 (= ${binary:Version}),
+         libboost-thread-dev,
+         ${misc:Depends},
+Description: Header files for the Storage Framework provider library
+ Development C++ headers for the provider API.

=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2016-07-21 12:22:21 +0000
@@ -0,0 +1,19 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: storage-framework
+Source: https://launchpad.net/storage-framework
+
+Files: *
+Copyright: 2016 Canonical Ltd.
+License: LGPL-3
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of version 3 of the GNU Lesser General Public
+ License as published by the Free Software Foundation.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU Lesser General Public License for more details.
+ .
+ On Debian systems, the full text of the GNU Lesser General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/LGPL-3'

=== added file 'debian/libstorage-framework-provider-1-0.install'
--- debian/libstorage-framework-provider-1-0.install	1970-01-01 00:00:00 +0000
+++ debian/libstorage-framework-provider-1-0.install	2016-07-21 12:22:21 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libstorage-framework-provider-*.so.*

=== added file 'debian/libstorage-framework-qt-client-1-0.install'
--- debian/libstorage-framework-qt-client-1-0.install	1970-01-01 00:00:00 +0000
+++ debian/libstorage-framework-qt-client-1-0.install	2016-07-21 12:22:21 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libstorage-framework-qt-client-*.so.*

=== added file 'debian/libstorage-framework-qt-local-client-1-0.install'
--- debian/libstorage-framework-qt-local-client-1-0.install	1970-01-01 00:00:00 +0000
+++ debian/libstorage-framework-qt-local-client-1-0.install	2016-07-21 12:22:21 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libstorage-framework-qt-local-client-*.so.*

=== modified file 'debian/rules' (properties changed: -x to +x)
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2016-07-21 12:22:21 +0000
@@ -0,0 +1,1 @@
+1.0

=== added file 'debian/storage-framework-client-dev.install'
--- debian/storage-framework-client-dev.install	1970-01-01 00:00:00 +0000
+++ debian/storage-framework-client-dev.install	2016-07-21 12:22:21 +0000
@@ -0,0 +1,3 @@
+usr/include/storage-framework-client-*
+usr/lib/*/libstorage-framework*client*.so
+usr/lib/*/pkgconfig/storage-framework*client*.pc

=== added file 'debian/storage-framework-provider-dev.install'
--- debian/storage-framework-provider-dev.install	1970-01-01 00:00:00 +0000
+++ debian/storage-framework-provider-dev.install	2016-07-21 12:22:21 +0000
@@ -0,0 +1,3 @@
+usr/include/storage-framework-provider-*
+usr/lib/*/libstorage-framework-provider*.so
+usr/lib/*/pkgconfig/storage-framework-provider*.pc

=== added directory 'demo'
=== added file 'demo/CMakeLists.txt'
--- demo/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ demo/CMakeLists.txt	2016-07-21 12:22:21 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(provider_test)

=== added directory 'demo/provider_test'
=== added file 'demo/provider_test/CMakeLists.txt'
--- demo/provider_test/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ demo/provider_test/CMakeLists.txt	2016-07-21 12:22:21 +0000
@@ -0,0 +1,5 @@
+
+add_definitions(-DBOOST_THREAD_VERSION=4)
+
+add_executable(provider-test provider-test.cpp)
+target_link_libraries(provider-test storage-framework-provider)

=== added file 'demo/provider_test/provider-test.cpp'
--- demo/provider_test/provider-test.cpp	1970-01-01 00:00:00 +0000
+++ demo/provider_test/provider-test.cpp	2016-07-21 12:22:21 +0000
@@ -0,0 +1,311 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#include <unity/storage/provider/DownloadJob.h>
+#include <unity/storage/provider/ProviderBase.h>
+#include <unity/storage/provider/Server.h>
+#include <unity/storage/provider/TempfileUploadJob.h>
+#include <unity/storage/provider/UploadJob.h>
+
+#include <boost/version.hpp>
+#include <boost/thread/future.hpp>
+
+#include <unistd.h>
+
+using namespace unity::storage;
+using namespace unity::storage::provider;
+using namespace std;
+
+#if BOOST_VERSION >= 105600
+using boost::make_ready_future;
+using boost::make_exceptional_future;
+#else
+namespace
+{
+
+boost::future<void> make_ready_future()
+{
+    boost::promise<void> p;
+    p.set_value();
+    return p.get_future();
+}
+
+template <typename T>
+boost::future<T> make_ready_future(T& value)
+{
+    boost::promise<T> p;
+    p.set_value(value);
+    return p.get_future();
+}
+
+template <typename T>
+boost::future<T> make_ready_future(T&& value)
+{
+    boost::promise<T> p;
+    p.set_value(std::move(value));
+    return p.get_future();
+}
+
+template <typename T, typename E>
+boost::future<T> make_exceptional_future(E const& ex)
+{
+    boost::promise<T> p;
+    p.set_exception(boost::copy_exception(ex));
+    return p.get_future();
+}
+
+}
+#endif
+
+
+class MyProvider : public ProviderBase
+{
+public:
+    MyProvider();
+
+    boost::future<ItemList> roots(Context const& ctx) override;
+    boost::future<tuple<ItemList,string>> list(
+        string const& item_id, string const& page_token,
+        Context const& ctx) override;
+    boost::future<ItemList> lookup(
+        string const& parent_id, string const& name,
+        Context const& ctx) override;
+    boost::future<Item> metadata(
+        string const& item_id, Context const& ctx) override;
+    boost::future<Item> create_folder(
+        string const& parent_id, string const& name,
+        Context const& ctx) override;
+
+    boost::future<unique_ptr<UploadJob>> create_file(
+        string const& parent_id, string const& title,
+        string const& content_type, bool allow_overwrite,
+        Context const& ctx) override;
+    boost::future<unique_ptr<UploadJob>> update(
+        string const& item_id, string const& old_etag,
+        Context const& ctx) override;
+
+    boost::future<unique_ptr<DownloadJob>> download(
+        string const& item_id, Context const& ctx) override;
+
+    boost::future<void> delete_item(
+        string const& item_id, Context const& ctx) override;
+    boost::future<Item> move(
+        string const& item_id, string const& new_parent_id,
+        string const& new_name, Context const& ctx) override;
+    boost::future<Item> copy(
+        string const& item_id, string const& new_parent_id,
+        string const& new_name, Context const& ctx) override;
+};
+
+class MyUploadJob : public TempfileUploadJob
+{
+public:
+    using TempfileUploadJob::TempfileUploadJob;
+
+    boost::future<void> cancel() override;
+    boost::future<Item> finish() override;
+};
+
+class MyDownloadJob : public DownloadJob
+{
+public:
+    using DownloadJob::DownloadJob;
+
+    boost::future<void> cancel() override;
+    boost::future<void> finish() override;
+};
+
+MyProvider::MyProvider()
+{
+}
+
+boost::future<ItemList> MyProvider::roots(Context const& ctx)
+{
+    printf("roots() called by %s (%d)\n", ctx.security_label.c_str(), ctx.pid);
+    ItemList roots = {
+        {"root_id", "", "Root", "etag", ItemType::root, {}},
+    };
+    return make_ready_future<ItemList>(roots);
+}
+
+boost::future<tuple<ItemList,string>> MyProvider::list(
+    string const& item_id, string const& page_token,
+    Context const& ctx)
+{
+    printf("list('%s', '%s') called by %s (%d)\n", item_id.c_str(), page_token.c_str(), ctx.security_label.c_str(), ctx.pid);
+    if (item_id != "root_id")
+    {
+        return make_exceptional_future<tuple<ItemList,string>>(runtime_error("unknown folder"));
+    }
+    if (page_token != "")
+    {
+        return make_exceptional_future<tuple<ItemList,string>>(runtime_error("unknown page token"));
+    }
+    ItemList children = {
+        {"child_id", "root_id", "Child", "etag", ItemType::file, {}}
+    };
+    boost::promise<tuple<ItemList,string>> p;
+    p.set_value(make_tuple(children, string()));
+    return p.get_future();
+}
+
+boost::future<ItemList> MyProvider::lookup(
+    string const& parent_id, string const& name, Context const& ctx)
+{
+    printf("lookup('%s', '%s') called by %s (%d)\n", parent_id.c_str(), name.c_str(), ctx.security_label.c_str(), ctx.pid);
+    if (parent_id != "root_id" || name != "Child")
+    {
+        return make_exceptional_future<ItemList>(runtime_error("file not found"));
+    }
+    ItemList children = {
+        {"child_id", "root_id", "Child", "etag", ItemType::file, {}}
+    };
+    return make_ready_future<ItemList>(children);
+}
+
+boost::future<Item> MyProvider::metadata(string const& item_id,
+                                         Context const& ctx)
+{
+    printf("metadata('%s') called by %s (%d)\n", item_id.c_str(), ctx.security_label.c_str(), ctx.pid);
+    if (item_id == "root_id")
+    {
+        Item metadata{"root_id", "", "Root", "etag", ItemType::root, {}};
+        return make_ready_future<Item>(metadata);
+    }
+    else if (item_id == "child_id")
+    {
+        Item metadata{"child_id", "root_id", "Child", "etag", ItemType::file, {}};
+        return make_ready_future<Item>(metadata);
+    }
+    return make_exceptional_future<Item>(runtime_error("no such file"));
+}
+
+boost::future<Item> MyProvider::create_folder(
+    string const& parent_id, string const& name,
+    Context const& ctx)
+{
+    printf("create_folder('%s', '%s') called by %s (%d)\n", parent_id.c_str(), name.c_str(), ctx.security_label.c_str(), ctx.pid);
+    Item metadata{"new_folder_id", parent_id, name, "etag", ItemType::folder, {}};
+    return make_ready_future<Item>(metadata);
+}
+
+string make_job_id()
+{
+    static int last_job_id = 0;
+    return to_string(++last_job_id);
+}
+
+boost::future<unique_ptr<UploadJob>> MyProvider::create_file(
+    string const& parent_id, string const& title,
+    string const& content_type, bool allow_overwrite,
+    Context const& ctx)
+{
+    printf("create_file('%s', '%s', '%s', %d) called by %s (%d)\n", parent_id.c_str(), title.c_str(), content_type.c_str(), allow_overwrite, ctx.security_label.c_str(), ctx.pid);
+    return make_ready_future(unique_ptr<UploadJob>(new MyUploadJob(make_job_id())));
+}
+
+boost::future<unique_ptr<UploadJob>> MyProvider::update(
+    string const& item_id, string const& old_etag, Context const& ctx)
+{
+    printf("update('%s', '%s') called by %s (%d)\n", item_id.c_str(), old_etag.c_str(), ctx.security_label.c_str(), ctx.pid);
+    return make_ready_future(unique_ptr<UploadJob>(new MyUploadJob(make_job_id())));
+}
+
+boost::future<unique_ptr<DownloadJob>> MyProvider::download(
+    string const& item_id, Context const& ctx)
+{
+    printf("download('%s') called by %s (%d)\n", item_id.c_str(), ctx.security_label.c_str(), ctx.pid);
+
+    unique_ptr<DownloadJob> job(new MyDownloadJob(make_job_id()));
+    const char contents[] = "Hello world";
+    write(job->write_socket(), contents, sizeof(contents));
+    job->report_complete();
+    return make_ready_future(std::move(job));
+}
+
+boost::future<void> MyProvider::delete_item(
+    string const& item_id, Context const& ctx)
+{
+    printf("delete('%s') called by %s (%d)\n", item_id.c_str(), ctx.security_label.c_str(), ctx.pid);
+    return make_ready_future();
+}
+
+boost::future<Item> MyProvider::move(
+    string const& item_id, string const& new_parent_id,
+    string const& new_name, Context const& ctx)
+{
+    printf("move('%s', '%s', '%s') called by %s (%d)\n", item_id.c_str(), new_parent_id.c_str(), new_name.c_str(), ctx.security_label.c_str(), ctx.pid);
+    Item metadata{item_id, new_parent_id, new_name, "etag", ItemType::file, {}};
+    return make_ready_future(metadata);
+}
+
+boost::future<Item> MyProvider::copy(
+    string const& item_id, string const& new_parent_id,
+    string const& new_name, Context const& ctx)
+{
+    printf("copy('%s', '%s', '%s') called by %s (%d)\n", item_id.c_str(), new_parent_id.c_str(), new_name.c_str(), ctx.security_label.c_str(), ctx.pid);
+    Item metadata{"new_item_id", new_parent_id, new_name, "etag", ItemType::file, {}};
+    return make_ready_future(metadata);
+}
+
+boost::future<void> MyUploadJob::cancel()
+{
+    printf("cancel_upload('%s')\n", upload_id().c_str());
+    return make_ready_future();
+}
+
+boost::future<Item> MyUploadJob::finish()
+{
+    printf("finish_upload('%s')\n", upload_id().c_str());
+
+    string old_filename = file_name();
+    string new_filename = upload_id() + ".txt";
+    printf("Linking %s to %s\n", old_filename.c_str(), new_filename.c_str());
+    unlink(new_filename.c_str());
+    link(old_filename.c_str(), new_filename.c_str());
+
+    Item metadata{"some_id", "", "some_upload", "etag", ItemType::file, {}};
+    return make_ready_future(metadata);
+}
+
+boost::future<void> MyDownloadJob::cancel()
+{
+    printf("cancel_download('%s')\n", download_id().c_str());
+    return make_ready_future();
+}
+
+boost::future<void> MyDownloadJob::finish()
+{
+    printf("finish_download('%s')\n", download_id().c_str());
+
+    return make_ready_future();
+}
+
+
+int main(int argc, char **argv)
+{
+    const std::string bus_name = "com.canonical.StorageFramework.Provider.ProviderTest";
+    std::string account_service_id = "google-drive-scope";
+    if (argc > 1)
+    {
+        account_service_id = argv[1];
+    }
+    Server<MyProvider> server(bus_name, account_service_id);
+    server.init(argc, argv);
+    server.run();
+}

=== added file 'demo/provider_test/test-client.py'
--- demo/provider_test/test-client.py	1970-01-01 00:00:00 +0000
+++ demo/provider_test/test-client.py	2016-07-21 12:22:21 +0000
@@ -0,0 +1,160 @@
+#!/usr/bin/python3
+
+#
+# Copyright (C) 2016 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: James Henstridge <[e-mail]>
+#
+
+import os
+import sys
+
+from gi.repository import Gio, GLib
+
+PROVIDER_BUS_NAME = 'com.canonical.StorageFramework.Provider.ProviderTest'
+PROVIDER_IFACE = 'com.canonical.StorageFramework.Provider'
+
+class Provider:
+    def __init__(self, bus, bus_name, object_path):
+        self._proxy = Gio.DBusProxy.new_sync(
+            bus, Gio.DBusProxyFlags.NONE, None,
+            bus_name, object_path, PROVIDER_IFACE, None)
+
+    def roots(self):
+        return self._proxy.Roots('()')
+
+    def list(self, item_id, page_token):
+        return self._proxy.List('(ss)', item_id, page_token)
+
+    def lookup(self, parent_id, name):
+        return self._proxy.Lookup('(ss)', parent_id, name)
+
+    def metadata(self, item_id):
+        return self._proxy.Metadata('(s)', item_id)
+
+    def create_folder(self, parent_id, name):
+        return self._proxy.CreateFolder('(ss)', parent_id, name)
+
+    def create_file(self, parent_id, name, content_type, allow_overwrite):
+        args = GLib.Variant('(sssb)', (parent_id, name, content_type, allow_overwrite))
+        result, fd_list = self._proxy.call_with_unix_fd_list_sync(
+            'CreateFile', args, 0, -1)
+        upload_id, fd_idx = result.unpack()
+        assert fd_list.get_length() == 1
+        assert fd_idx == 0
+        return upload_id, fd_list.steal_fds()[fd_idx]
+
+    def update(self, item_id, old_etag=''):
+        args = GLib.Variant('(ss)', (item_id, old_etag))
+        result, fd_list = self._proxy.call_with_unix_fd_list_sync(
+            'Update', args, 0, -1)
+        upload_id, fd_idx = result.unpack()
+        assert fd_list.get_length() == 1
+        assert fd_idx == 0
+        return upload_id, fd_list.steal_fds()[fd_idx]
+
+    def cancel_upload(self, upload_id):
+        self._proxy.CancelUpload('(s)', upload_id)
+
+    def finish_upload(self, upload_id):
+        return self._proxy.FinishUpload('(s)', upload_id)
+
+    def download(self, item_id):
+        args = GLib.Variant('(s)', (item_id,))
+        result, fd_list = self._proxy.call_with_unix_fd_list_sync(
+            'Download', args, 0, -1)
+        download_id, fd_idx = result.unpack()
+        assert fd_list.get_length() == 1
+        assert fd_idx == 0
+        return download_id, fd_list.steal_fds()[fd_idx]
+
+    def finish_download(self, download_id):
+        return self._proxy.FinishDownload('(s)', download_id)
+
+    def delete(self, item_id):
+        self._proxy.Delete('(s)', item_id)
+
+    def move(self, item_id, new_parent_id, new_name):
+        return self._proxy.Move('(sss)', item_id, new_parent_id, new_name)
+
+    def copy(self, item_id, new_parent_id, new_name):
+        return self._proxy.Copy('(sss)', item_id, new_parent_id, new_name)
+
+
+def main(argv):
+    bus = Gio.bus_get_sync(Gio.BusType.SESSION, None)
+    provider = Provider(bus, PROVIDER_BUS_NAME, argv[1])
+
+    print("Getting roots...", end='', flush=True)
+    roots = provider.roots()
+    print(roots)
+    print()
+
+    root_id = roots[0][0]
+
+    print("Listing %r..." % root_id, end='', flush=True)
+    children, next_token = provider.list(root_id, '')
+    print(children)
+    print()
+
+    child_id = children[0][0]
+    child_name = children[0][2]
+    print("Looking up %r under %r..." % (child_name, root_id), end='', flush=True)
+    items = provider.lookup(root_id, child_name)
+    print(items)
+    print()
+
+    print("Getting metadata for %r..." % child_id, end='', flush=True)
+    item = provider.metadata(child_id)
+    print(item)
+    print()
+
+    print("Creating folder...", end='', flush=True)
+    provider.create_folder(root_id, 'Some folder')
+    print("done")
+    print()
+
+    print("Preparing to upload file...", end='', flush=True)
+    upload_id, fd = provider.create_file(
+        root_id, 'file name', 'text/plain', False)
+    print(upload_id, fd)
+
+    os.write(fd, b'Hello world\n' * 1000)
+    os.close(fd)
+
+    provider.finish_upload(upload_id)
+    print("Completed upload")
+    print()
+
+    print("Preparing to download file...", end='', flush=True)
+    download_id, fd = provider.download("some-id")
+    print(download_id, fd)
+    with os.fdopen(fd) as fp:
+        contents = fp.read()
+    provider.finish_download(download_id)
+    print("Contents: %r" % contents)
+
+    print("Moving file...", end='', flush=True)
+    item = provider.move(child_id, root_id, "New Name")
+    print(item)
+    print()
+
+    print("Copying file...", end='', flush=True)
+    item = provider.copy(child_id, root_id, "Copy name")
+    print(item)
+    print()
+
+if __name__ == '__main__':
+    sys.exit(main(sys.argv))

=== modified file 'include/CMakeLists.txt'
--- include/CMakeLists.txt	2016-04-20 00:53:53 +0000
+++ include/CMakeLists.txt	2016-07-21 12:22:21 +0000
@@ -1,1 +1,4 @@
+set(client_base_includedir ${CMAKE_INSTALL_INCLUDEDIR}/storage-framework-client-${SF_CLIENT_API_VERSION})
+set(provider_base_includedir ${CMAKE_INSTALL_INCLUDEDIR}/storage-framework-provider-${SF_PROVIDER_API_VERSION})
+
 add_subdirectory(unity)

=== modified file 'include/unity/storage/CMakeLists.txt'
--- include/unity/storage/CMakeLists.txt	2016-04-20 00:53:53 +0000
+++ include/unity/storage/CMakeLists.txt	2016-07-21 12:22:21 +0000
@@ -1,1 +1,11 @@
-add_subdirectory(client)
+set(includeprefix unity/storage)
+file(GLOB common_headers *.h)
+
+# Install common headers to both include prefixes
+install(FILES ${common_headers}
+  DESTINATION ${client_base_includedir}/${includeprefix})
+install(FILES ${common_headers}
+  DESTINATION ${provider_base_includedir}/${includeprefix})
+
+add_subdirectory(provider)
+add_subdirectory(qt)

=== removed directory 'include/unity/storage/client'
=== removed file 'include/unity/storage/client/Account.h'
--- include/unity/storage/client/Account.h	2016-04-19 04:01:16 +0000
+++ include/unity/storage/client/Account.h	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-#pragma once
-
-#include <memory>
-#include <vector>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-class RootsResult;
-
-/**
-\brief Class that represents an account.
-*/
-
-class Account
-{
-public:
-    ~Account();
-    Account(Account const&) = delete;
-    Account& operator=(Account const&) = delete;
-    Account(Account&&);
-    Account& operator=(Account&&);
-
-    typedef std::unique_ptr<Account> UPtr;
-
-    std::string owner() const;
-    std::string owner_id() const;
-    std::string description() const;
-
-    // TODO: Will almost certainly need more here. Description? Other details?
-
-    /**
-    \brief Returns the root directories for the account.
-
-    An account can have more than one root directory (for providers that support the concept of multiple drives).
-    */
-    void get_roots(std::function<void(RootsResult const&)> roots_callback) const;
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/AccountsResult.h'
--- include/unity/storage/client/AccountsResult.h	2016-04-20 01:56:37 +0000
+++ include/unity/storage/client/AccountsResult.h	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-#pragma once
-
-#include <unity/storage/client/Account.h>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-typedef std::vector<Account::UPtr> AccountList;
-
-class AccountsResult
-{
-public:
-    ~AccountsResult();
-    AccountsResult(AccountsResult const&) = delete;
-    AccountsResult& operator=(AccountsResult const&) = delete;
-    AccountsResult(AccountsResult&&) = delete;
-    AccountsResult& operator=(AccountsResult&&) = delete;
-
-    AccountList get_accounts() const;
-
-private:
-    AccountsResult();
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/CreateResult.h'
--- include/unity/storage/client/CreateResult.h	2016-04-20 01:56:37 +0000
+++ include/unity/storage/client/CreateResult.h	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <unity/storage/client/Item.h>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-class CreateResult
-{
-public:
-    ~CreateResult();
-    CreateResult(CreateResult const&) = delete;
-    CreateResult& operator=(CreateResult const&) = delete;
-    CreateResult(CreateResult&&) = delete;
-    CreateResult& operator=(CreateResult&&) = delete;
-
-    Item::UPtr get_item() const;
-
-private:
-    CreateResult();
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/DestroyResult.h'
--- include/unity/storage/client/DestroyResult.h	2016-04-18 02:55:43 +0000
+++ include/unity/storage/client/DestroyResult.h	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-#pragma once
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-class Item;
-
-class DestroyResult
-{
-public:
-    ~DestroyResult();
-    DestroyResult(DestroyResult const&) = delete;
-    DestroyResult& operator=(DestroyResult const&) = delete;
-    DestroyResult(DestroyResult&&) = delete;
-    DestroyResult& operator=(DestroyResult&&) = delete;
-
-    Item const& get_item() const;  // Dubious, what if Item is no longer there?
-
-private:
-    DestroyResult();
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/Directory.h'
--- include/unity/storage/client/Directory.h	2016-04-20 01:56:37 +0000
+++ include/unity/storage/client/Directory.h	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-#pragma once
-
-#include <unity/storage/client/Item.h>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-class CreateResult;
-class IterationResult;
-class ParentResult;
-
-/**
-\brief Class that represents a directory.
-
-A directory is an unordered set of files and/or directories. The names (as returned by Item::name())
-of the members of a directory are unique.
-*/
-
-class Directory : public Item
-{
-public:
-    ~Directory();
-    Directory(Directory const&) = delete;
-    Directory& operator=(Directory const&) = delete;
-    Directory(Directory&&);
-    Directory& operator=(Directory&&);
-
-    typedef std::unique_ptr<Directory> UPtr;
-
-    /**
-    \brief Returns the contents of a directory.
-    \param iteration_callback As results become available, the runtime
-    calls iteration_callback once for each item. The iteration functor
-    can call IterationResult::get_item() to retrieve the item. A `nullptr`
-    return value from `get_item()` indicates end-of-iteration.
-    */
-    void list(std::function<void(IterationResult const&)> iteration_callback);
-
-    /**
-    \brief Returns the list of parent directories of this directory.
-    \param parents_callback As parent directories become available, the runtime
-    calls parents_callback once for each parent directory. The parents functor
-    can call ParentResult::get_directory() to retrieve the Directory. A `nullptr`
-    return value from `get_directory()` indicates end-of-iteration.
-    */
-    void parents(std::function<void(ParentResult const&)> parents_callback);
-
-    /**
-    \brief Creates a new directory with the current directory as the parent.
-    \param name The name of the new directory. Note that the actual name may be changed
-    by the provider; call Item::name() once the directory is created to get its actual name.
-    \param completion_callback Once the directory is created, the runtime calls completion_callback.
-    The completion functor can call CreateResult::get_item() to access the new directory.
-    \note Error information is returned as exceptions that are thrown from `get_item`.
-    */
-    void create_dir(std::string const& name, std::function<void(CreateResult const&)> completion_callback);
-
-    /**
-    \brief Creates a new empty file with the current directory as the parent.
-    \param name The name of the new file. Note that the actual name may be changed
-    by the provider; call Item::name() once the file is created to get its actual name.
-    \param completion_callback Once the file is created, the runtime calls completion_callback.
-    The completion functor can call CreateResult::get_item() to access the new file.
-    \note Error information is returned as exceptions that are thrown from `get_item`.
-    */
-    void create_file(std::string const& name, std::function<void(CreateResult const&)> completion_callback);
-
-private:
-    Directory();
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/DownloadResult.h'
--- include/unity/storage/client/DownloadResult.h	2016-04-20 01:56:37 +0000
+++ include/unity/storage/client/DownloadResult.h	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-#pragma once
-
-#include <unity/storage/client/Item.h>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-class DownloadResult
-{
-public:
-    ~DownloadResult();
-    DownloadResult(DownloadResult const&) = delete;
-    DownloadResult& operator=(DownloadResult const&) = delete;
-    DownloadResult(DownloadResult&&) = delete;
-    DownloadResult& operator=(DownloadResult&&) = delete;
-
-    /**
-    Checks for errors once a download has completed.
-
-    If the download has completed, this method returns normally. Otherwise, it throws an exception
-    that provides more details about the error.
-    \throws TODO: list of exceptions
-    */
-    void check_error() const;
-
-private:
-    DownloadResult();
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/Downloader.h'
--- include/unity/storage/client/Downloader.h	2016-04-20 01:56:37 +0000
+++ include/unity/storage/client/Downloader.h	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-#pragma once
-
-#include <memory>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-class DownloadResult;
-
-class Downloader
-{
-public:
-    /**
-    \brief Destroys the downloader.
-
-    The destructor implicitly calls close() if it has not been called already.
-    */
-    ~Downloader();
-
-    Downloader(Downloader const&) = delete;
-    Downloader& operator=(Downloader const&) = delete;
-    Downloader(Downloader&&);
-    Downloader& operator=(Downloader&&);
-
-    typedef std::unique_ptr<Downloader> UPtr;
-
-    /**
-    \brief Returns a file descriptor that is open for reading.
-
-    To download the file contents, read from the returned file descriptor. The descriptor
-    may not be able to deliver arbitrarily large amounts of data without blocking. If the
-    code that reads from the descriptor cannot block, use non-blocking reads. Once the
-    descriptor indicates EOF, call close() to check for errors.
-
-    \return A file descriptor open for reading. If fd() is called after close() or cancel()
-    have been called, the return value is `-1`.
-    \throws TODO: All sorts of exceptions when things go wrong, list them.
-    */
-    int fd() const;
-
-    /**
-    \brief Finalizes the download.
-
-    Once the descriptor returned by fd() indicates EOF, you must call close(). The runtime
-    closes the descriptor and calls close_callback once the state of the download has been verified.
-    Call DownloadResult::check_error() from the callback to verify whether the download completed successfully.
-
-    If a read on the descriptor returns an error, this indicates a fatal error condition, and further
-    reads on the descriptor will fail as well. In this case, a call to close() results in close_callback()
-    being invoked as usual, and DownloadResult::check_error() will return the error details
-    via an exception.
-
-    \param close_callback The functor called by the runtime once the download is finalized.
-    The passed value must not be `nullptr`.
-    \warning Do not assume that a download completed successfully once you detect EOF on the file descriptor.
-    If something goes wrong during a download on the server side, the file descriptor will return EOF
-    for a partially-downloaded file.
-    */
-    void close(std::function<void(DownloadResult const&)> close_callback);
-
-    /**
-    \brief Cancels a download.
-
-    Calling cancel() informs the provider that the download is no longer needed. The provider
-    will make a best-effort attempt to cancel the download from the remote service.
-
-    Calling cancel() more than once, or calling cancel() after a call to close() is safe and does nothing.
-    \throws TODO: All sorts of things.
-    */
-    void cancel();
-
-private:
-    Downloader();
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/File.h'
--- include/unity/storage/client/File.h	2016-04-20 01:56:37 +0000
+++ include/unity/storage/client/File.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-#pragma once
-
-#include <unity/storage/client/Downloader.h>
-#include <unity/storage/client/Item.h>
-#include <unity/storage/client/Uploader.h>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-enum class ConflictPolicy { error_if_conflict, overwrite };
-
-/**
-\brief Class that represents a file.
-
-A file is a sequence of bytes.
-*/
-
-class File : public Item
-{
-public:
-    ~File();
-    File(File const&) = delete;
-    File& operator=(File const&) = delete;
-    File(File&&);
-    File& operator=(File&&);
-
-    typedef std::unique_ptr<File> UPtr;
-
-    /**
-    \brief Returns the size of the file in bytes.
-    \throws DestroyedException if the file has been destroyed.
-    */
-    int64_t size() const;
-
-    /**
-    \brief Creates an uploader for the file.
-    \param policy The conflict resolution policy.
-    \param ready_callback The runtime calls ready_callback once the uploader is ready to accept data.
-    */
-    void create_uploader(ConflictPolicy policy, std::function<void(Uploader::UPtr)> ready_callback);
-
-    /**
-    \brief Creates a downloader for the file.
-    \param ready_callback The runtime calls ready_callback once the downloader is ready to deliver data.
-    */
-    void create_downloader(std::function<void(Downloader::UPtr)> ready_callback);
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/Item.h'
--- include/unity/storage/client/Item.h	2016-04-19 04:01:16 +0000
+++ include/unity/storage/client/Item.h	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-#pragma once
-
-#include <map>
-#include <memory>
-#include <string>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-namespace internal
-{
-
-class ItemImpl;
-
-}  // namespace internal
-
-class DestroyResult;
-class MetadataResult;
-
-/**
-\brief Base class for files and directories.
-*/
-
-class Item
-{
-public:
-    ~Item();
-    Item(Item const&) = delete;
-    Item& operator=(Item const&) = delete;
-    Item(Item&&);
-    Item& operator=(Item&&);
-
-    typedef std::unique_ptr<Item> UPtr;
-
-    /**
-    \brief Returns the native identifier used by the provider.
-    */
-    std::string native_identity() const;
-
-    /**
-    \brief Returns the name of the file or directory.
-
-    The returned name may not be the same as the name that was used to create the item because the provider
-    may have changed it in some way (such as converting upper case characters to lower case).
-    */
-    std::string name() const;
-
-    /**
-    \brief Returns metadata for the item.
-    \param metadata_callback The metadata functor can call MetadataResult::get_metadata() to retrieve the metadata.
-    */
-    void get_metadata(std::function<void(MetadataResult const&)> metadata_callback);
-
-    /**
-    \brief Permamently destroys the item.
-    \warning Destroying a directory recursively destroys its contents.
-    */
-    void destroy(std::function<void(DestroyResult const&)> completion_callback);
-
-private:
-    Item();
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/IterationResult.h'
--- include/unity/storage/client/IterationResult.h	2016-04-20 01:56:37 +0000
+++ include/unity/storage/client/IterationResult.h	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <unity/storage/client/Item.h>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-class IterationResult
-{
-public:
-    ~IterationResult();
-    IterationResult(IterationResult const&) = delete;
-    IterationResult& operator=(IterationResult const&) = delete;
-    IterationResult(IterationResult&&) = delete;
-    IterationResult& operator=(IterationResult&&) = delete;
-
-    Item::UPtr get_item() const;
-
-private:
-    IterationResult();
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/MetadataResult.h'
--- include/unity/storage/client/MetadataResult.h	2016-04-20 01:56:37 +0000
+++ include/unity/storage/client/MetadataResult.h	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-#pragma once
-
-#include <unity/storage/client/Variant.h>
-
-#include <chrono>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-class MetadataResult
-{
-public:
-    ~MetadataResult();
-    MetadataResult(MetadataResult const&) = delete;
-    MetadataResult& operator=(MetadataResult const&) = delete;
-    MetadataResult(MetadataResult&&) = delete;
-    MetadataResult& operator=(MetadataResult&&) = delete;
-
-    VariantMap get_metadata() const;
-
-    /**
-    \brief Returns the time at which the item was last modified.
-    \throws DestroyedException if the item has been destroyed.
-    */
-    std::chrono::system_clock::time_point modified_time() const;
-
-    /**
-    \brief Returns the mime type of the item.
-    \returns For directories, the mime type is `inode/directory`. If the mime type is unknown, the returned string is empty.
-    \throws DestroyedException if the item has been destroyed.
-    */
-    std::string mime_type() const;
-
-
-private:
-    MetadataResult();
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/ParentResult.h'
--- include/unity/storage/client/ParentResult.h	2016-04-20 01:56:37 +0000
+++ include/unity/storage/client/ParentResult.h	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-#pragma once
-
-#include <unity/storage/client/Directory.h>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-class ParentResult
-{
-public:
-    ~ParentResult();
-    ParentResult(ParentResult const&) = delete;
-    ParentResult& operator=(ParentResult const&) = delete;
-    ParentResult(ParentResult&&) = delete;
-    ParentResult& operator=(ParentResult&&) = delete;
-
-    Directory::UPtr get_directory() const;
-
-private:
-    ParentResult();
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/Root.h'
--- include/unity/storage/client/Root.h	2016-04-20 01:56:37 +0000
+++ include/unity/storage/client/Root.h	1970-01-01 00:00:00 +0000
@@ -1,44 +0,0 @@
-#pragma once
-
-#include <unity/storage/client/Directory.h>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-class Result;  // Same as CreateResult?
-
-/**
-\brief Class that represents a root directory.
-*/
-
-class Root : public Directory
-{
-public:
-    ~Root();
-    Root(Root const&) = delete;
-    Root& operator=(Root const&) = delete;
-    Root(Root&&);
-    Root& operator=(Root&&);
-
-    typedef std::unique_ptr<Root> UPtr;
-
-    int64_t free_space_bytes() const;  // Needs to be async, make part of metadata?
-    int64_t used_space_bytes() const;  // Needs to be async, make part of metadata?
-
-    void get(std::string native_identity, std::function<void(Result)> result_callback) const;
-
-private:
-    Root();
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/Runtime.h'
--- include/unity/storage/client/Runtime.h	2016-04-19 04:01:16 +0000
+++ include/unity/storage/client/Runtime.h	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <memory>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-class AccountsResult;
-
-class Runtime
-{
-public:
-    ~Runtime();
-    Runtime(Runtime const&) = delete;
-    Runtime& operator=(Runtime const&) = delete;
-    Runtime(Runtime&&);
-    Runtime& operator=(Runtime&&);
-
-    typedef std::unique_ptr<Runtime> UPtr;
-
-    static UPtr create();
-
-    void get_accounts(std::function<void(AccountsResult const&)> accounts_callback);
-
-private:
-    Runtime();
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/UploadResult.h'
--- include/unity/storage/client/UploadResult.h	2016-04-20 01:56:37 +0000
+++ include/unity/storage/client/UploadResult.h	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-#pragma once
-
-#include <unity/storage/client/Item.h>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-class UploadResult
-{
-public:
-    ~UploadResult();
-    UploadResult(UploadResult const&) = delete;
-    UploadResult& operator=(UploadResult const&) = delete;
-    UploadResult(UploadResult&&) = delete;
-    UploadResult& operator=(UploadResult&&) = delete;
-
-    /**
-    Checks for errors once an upload has completed.
-
-    If the download has completed, this method returns normally. Otherwise, it throws an exception
-    that provides more details about the error.
-    \throws TODO: list of exceptions
-    */
-    void check_error() const;
-
-private:
-    UploadResult();
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/Uploader.h'
--- include/unity/storage/client/Uploader.h	2016-04-20 01:56:37 +0000
+++ include/unity/storage/client/Uploader.h	1970-01-01 00:00:00 +0000
@@ -1,77 +0,0 @@
-#pragma once
-
-#include <memory>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-class UploadResult;
-
-class Uploader
-{
-public:
-    ~Uploader();
-    Uploader(Uploader const&) = delete;
-    Uploader& operator=(Uploader const&) = delete;
-    Uploader(Uploader&&);
-    Uploader& operator=(Uploader&&);
-
-    typedef std::unique_ptr<Uploader> UPtr;
-
-    /**
-    \brief Returns a file descriptor that is open for writing.
-
-    To upload the file contents, write to the returned file descriptor. The descriptor
-    may not be able to accept arbitrarily large amounts of data without blocking. If the
-    code that writes to the descriptor cannot block, use non-blocking writes. Once the
-    contents of the file have been written, call close() to check for errors.
-
-    If a write on the descriptor returns an error, this indicates a fatal error condition, and further
-    writes on the descriptor will fail as well. In this case, a call to close() results in close_callback()
-    being invoked as usual, and UploadResult::check_error() will return the error details
-    via an exception.
-
-    After an error, the file is in an indeterminate state.
-    \return A file descriptor open for writing. If fd() is called after close() or cancel()
-    have been called, the return value is `-1`.
-    \throws TODO: All sorts of exceptions when things go wrong, list them.
-    */
-    int fd() const;
-
-    /**
-    \brief Finalizes the upload.
-
-    Once you have written the file contents to the descriptor returned by fd(), you must call close(). The runtime
-    calls closes the descriptor and calls close_callback once the state of the upload has been verified.
-    Call UploadResult::check_error() from the callback to verify whether the upload completed successfully.
-    \param close_callback The functor called by the runtime once the upload is finalized.
-    The passed value must not be `nullptr`.
-    */
-    void close(std::function<void(UploadResult const&)> close_callback);
-
-    /**
-    \brief Cancels an upload.
-
-    Calling cancel() informs the provider that the upload is no longer needed. The provider
-    will make a best-effort attempt to cancel the upload to the remote service.
-
-    Calling cancel() more than once, or calling cancel() after a call to close() is safe and does nothing.
-    \throws TODO: All sorts of things.
-    */
-    void cancel();
-
-private:
-    Uploader();
-};
-
-}  // namespace client
-
-}  // namespace storage
-
-}  // namespace unity

=== removed file 'include/unity/storage/client/Variant.h'
--- include/unity/storage/client/Variant.h	2016-04-19 04:01:16 +0000
+++ include/unity/storage/client/Variant.h	1970-01-01 00:00:00 +0000
@@ -1,236 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <memory>
-#include <string>
-#include <map>
-#include <vector>
-
-namespace unity
-{
-
-namespace storage
-{
-
-namespace client
-{
-
-class Variant;
-
-/**
- \typedef VariantMap
- \brief A dictionary of (string, Variant) pairs.
-*/
-typedef std::map<std::string, Variant> VariantMap;
-
-/**
- \brief An array of variants
-*/
-typedef std::vector<Variant> VariantArray;
-
-namespace internal
-{
-
-class VariantImpl;
-class NullVariant;
-
-} // namespace internal
-
-/**
-\brief Simple variant class that can hold an integer, boolean, string, double, dictionary, array or null value.
-*/
-
-class Variant final
-{
-public:
-    /**
-    \brief Type of value held by a Variant instance.
-    */
-    enum Type { Null, Int, Bool, String, Double, Dict, Array };
-
-    /**@name Constructors and destructor
-    */
-    /**
-    \brief The default constructor creates a Variant instance containing a null.
-    */
-    Variant() noexcept;
-
-    /**
-    \brief Creates a Variant instance that stores the supplied integer.
-    */
-    explicit Variant(int64_t val) noexcept;
-
-    /**
-    \brief Creates a Variant instance that stores the supplied double.
-    */
-    explicit Variant(double val) noexcept;
-
-    /**
-    \brief Creates a Variant instance that stores the supplied boolean.
-    */
-    explicit Variant(bool val) noexcept;
-
-    /**
-    \brief Creates a Variant instance that stores the supplied string.
-    */
-    explicit Variant(std::string const& val);
-
-    /**
-    \brief Converts the supplied pointer to a string and stores the string in the Variant instance.
-    */
-    explicit Variant(char const* val);          // Required to prevent Variant("Hello") from storing a bool
-
-    explicit Variant(VariantMap const& val);
-
-    explicit Variant(VariantArray const& val);
-
-    /**
-    \brief Constructs a null variant.
-    */
-    static Variant const& null();
-
-    /**
-    \brief Destructor.
-    */
-    ~Variant();
-
-    /**@name Copy and assignment
-    Copy and assignment operators (move and non-move versions) have the usual value semantics.
-    */
-    //{@
-    Variant(Variant const&);
-    Variant(Variant&&);
-    Variant& operator=(Variant const&);
-    Variant& operator=(Variant&&);
-    //@}
-
-    /**@name Value assignment
-    The assignment operators replace the value currently held by a Variant with the supplied value, potentially
-    changing the type of the value held by the Variant. Assigning a `const char*` to a Variant stores the
-    corresponding `std::string` value.
-    */
-    //{@
-    Variant& operator=(int64_t val) noexcept;
-    Variant& operator=(double val) noexcept;
-    Variant& operator=(bool val) noexcept;
-    Variant& operator=(std::string const& val);
-    Variant& operator=(char const* val);        // Required to prevent v = "Hello" from storing a bool
-    Variant& operator=(VariantMap const& val);
-    Variant& operator=(VariantArray const& val);
-    //@}
-
-    /**@name Comparison operators
-    Two variants are considered equal if they both store values of the same type and equal value.
-
-    For Variants storing values of different type, ordering follows the types defined in the Type enum. For example,
-    any integer value compares less than any boolean value. For Variants of the same type, the stored values determine
-    order as usual.
-    */
-    //{@
-    bool operator==(Variant const&) const noexcept;
-    bool operator<(Variant const&) const noexcept;
-    //@}
-
-    /**@name Value accessors
-    The accessor methods retrieve a value of the specified type.
-
-    If a Variant currently stores a value of different type, these methods throw `unity::LogicException`.
-    */
-    //{@
-    int64_t get_int() const;
-    double get_double() const;
-    bool get_bool() const;
-    std::string get_string() const;
-    VariantMap get_dict() const;
-    VariantArray get_array() const;
-
-    /**
-    \brief Test if variant holds null value.
-    \return True if variant holds null.
-    */
-    bool is_null() const;
-    //@}
-
-    /**@name Observers
-    */
-    /**
-    \brief Returns the type of value currently stored by this Variant.
-    */
-    Type which() const noexcept;
-
-    /**
-    \brief Returns a hash value for this Variant.
-    */
-    size_t hash() const;
-
-    /**@name Modifiers
-    */
-    /**
-    \brief Swaps the contents of this Variant with `other`.
-    */
-    void swap(Variant& other) noexcept;
-
-    /**@name Serialization
-    */
-    //@{
-    /**
-    \brief Serializes the variant to a JSON encoded string.
-    */
-    std::string serialize_json() const;  // TODO: drop this?
-    /**
-    \brief Deserializes a JSON encoded string to a `Variant`.
-    */
-    static Variant deserialize_json(std::string const& json_string);  // TODO: drop this?
-    //@}
-
-private:
-    Variant(internal::NullVariant const&);
-
-    std::unique_ptr<internal::VariantImpl> p;
-    friend class VariantImpl;
-};
-
-/**
-\brief Swaps the contents of two Variants.
-*/
-void swap(Variant&, Variant&) noexcept;
-
-} // namespace client
-
-} // namespace storage
-
-} // namespace unity
-
-namespace std
-{
-
-template<>
-struct hash<unity::storage::client::Variant>
-{
-    typedef unity::storage::client::Variant argument_type;
-    typedef std::size_t result_type;
-
-    result_type operator()(argument_type const& s) const
-    {
-        return s.hash();
-    }
-};
-
-}  // namespace std

=== removed directory 'include/unity/storage/client/internal'
=== added file 'include/unity/storage/common.h'
--- include/unity/storage/common.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/common.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+namespace unity
+{
+namespace storage
+{
+
+enum class ItemType
+{
+    file,
+    folder,
+    root,
+    LAST_ENTRY__
+};
+
+enum class ConflictPolicy
+{
+    error_if_conflict,
+    overwrite,
+};
+
+}  // namespace storage
+}  // namespace unity

=== added directory 'include/unity/storage/internal'
=== added file 'include/unity/storage/internal/ItemMetadata.h'
--- include/unity/storage/internal/ItemMetadata.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/internal/ItemMetadata.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/common.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QMap>
+#include <QVariant>
+#pragma GCC diagnostic pop
+
+namespace unity
+{
+namespace storage
+{
+namespace internal
+{
+
+struct ItemMetadata
+{
+    QString item_id;
+    QString parent_id;
+    QString name;
+    QString etag;
+    ItemType type;
+    QMap<QString, QVariant> metadata;
+};
+
+}  // namespace internal
+}  // namespace storage
+}  // namespace unity

=== added directory 'include/unity/storage/provider'
=== added file 'include/unity/storage/provider/CMakeLists.txt'
--- include/unity/storage/provider/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/CMakeLists.txt	2016-07-21 12:22:21 +0000
@@ -0,0 +1,5 @@
+set(includeprefix unity/storage/provider)
+file(GLOB provider_headers *.h)
+
+install(FILES ${provider_headers}
+  DESTINATION ${provider_base_includedir}/${includeprefix})

=== added file 'include/unity/storage/provider/Credentials.h'
--- include/unity/storage/provider/Credentials.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/Credentials.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/visibility.h>
+
+#include <boost/blank.hpp>
+#include <boost/variant.hpp>
+
+#include <string>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+
+struct UNITY_STORAGE_EXPORT NoCredentials
+{
+};
+
+struct UNITY_STORAGE_EXPORT OAuth1Credentials
+{
+    std::string consumer_key;
+    std::string consumer_secret;
+    std::string token;
+    std::string token_secret;
+};
+
+struct UNITY_STORAGE_EXPORT OAuth2Credentials
+{
+    std::string access_token;
+};
+
+struct UNITY_STORAGE_EXPORT PasswordCredentials
+{
+    std::string username;
+    std::string password;
+};
+
+typedef boost::variant<boost::blank,OAuth1Credentials,OAuth2Credentials,PasswordCredentials> Credentials;
+
+}
+}
+}

=== added file 'include/unity/storage/provider/DownloadJob.h'
--- include/unity/storage/provider/DownloadJob.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/DownloadJob.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/visibility.h>
+
+#include <boost/thread/future.hpp>
+#include <stdexcept>
+#include <string>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+namespace internal
+{
+class DownloadJobImpl;
+class PendingJobs;
+class ProviderInterface;
+}
+
+class UNITY_STORAGE_EXPORT DownloadJob
+{
+public:
+    DownloadJob(std::string const& download_id);
+    virtual ~DownloadJob();
+
+    std::string const& download_id() const;
+    int write_socket() const;
+
+    // If the result of the download is reported with either of the
+    // following two functions, then neither cancel() or finish() will
+    // be called.
+    void report_complete();
+    void report_error(std::exception_ptr p);
+
+    virtual boost::future<void> cancel() = 0;
+    virtual boost::future<void> finish() = 0;
+
+protected:
+    DownloadJob(internal::DownloadJobImpl *p) UNITY_STORAGE_HIDDEN;
+    internal::DownloadJobImpl *p_ = nullptr;
+
+    friend class internal::PendingJobs;
+    friend class internal::ProviderInterface;
+};
+
+}
+}
+}

=== added file 'include/unity/storage/provider/ProviderBase.h'
--- include/unity/storage/provider/ProviderBase.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/ProviderBase.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/common.h>
+#include <unity/storage/visibility.h>
+#include <unity/storage/provider/Credentials.h>
+
+#include <boost/thread/future.hpp>
+
+#include <sys/types.h>
+#include <string>
+#include <map>
+#include <vector>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+
+class DownloadJob;
+class UploadJob;
+
+struct UNITY_STORAGE_EXPORT Context
+{
+    uid_t uid;
+    pid_t pid;
+    std::string security_label;
+
+    Credentials credentials;
+};
+
+struct UNITY_STORAGE_EXPORT Item
+{
+    std::string item_id;
+    std::string parent_id;
+    std::string title;
+    std::string etag;
+    unity::storage::ItemType type;
+    // Should be map<string,variant>
+    std::map<std::string,std::string> metadata;
+};
+
+typedef std::vector<Item> ItemList;
+
+class UNITY_STORAGE_EXPORT ProviderBase
+{
+public:
+    ProviderBase();
+    virtual ~ProviderBase();
+
+    ProviderBase(ProviderBase const& other) = delete;
+    ProviderBase& operator=(ProviderBase const& other) = delete;
+
+    virtual boost::future<ItemList> roots(Context const& context) = 0;
+    virtual boost::future<std::tuple<ItemList,std::string>> list(
+        std::string const& item_id, std::string const& page_token,
+        Context const& context) = 0;
+    virtual boost::future<ItemList> lookup(
+        std::string const& parent_id, std::string const& name,
+        Context const& context) = 0;
+    virtual boost::future<Item> metadata(std::string const& item_id,
+        Context const& context) = 0;
+
+    virtual boost::future<Item> create_folder(
+        std::string const& parent_id, std::string const& name,
+        Context const& context) = 0;
+
+    virtual boost::future<std::unique_ptr<UploadJob>> create_file(
+        std::string const& parent_id, std::string const& title,
+        std::string const& content_type, bool allow_overwrite,
+        Context const& context) = 0;
+    virtual boost::future<std::unique_ptr<UploadJob>> update(
+        std::string const& item_id, std::string const& old_etag,
+        Context const& context) = 0;
+
+    virtual boost::future<std::unique_ptr<DownloadJob>> download(
+        std::string const& item_id, Context const& context) = 0;
+
+    virtual boost::future<void> delete_item(
+        std::string const& item_id, Context const& context) = 0;
+    virtual boost::future<Item> move(
+        std::string const& item_id, std::string const& new_parent_id,
+        std::string const& new_name, Context const& context) = 0;
+    virtual boost::future<Item> copy(
+        std::string const& item_id, std::string const& new_parent_id,
+        std::string const& new_name, Context const& context) = 0;
+};
+
+}
+}
+}

=== added file 'include/unity/storage/provider/Server.h'
--- include/unity/storage/provider/Server.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/Server.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/visibility.h>
+
+#include <memory>
+#include <string>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+
+namespace internal
+{
+class ServerImpl;
+}
+
+class ProviderBase;
+
+class UNITY_STORAGE_EXPORT ServerBase
+{
+public:
+    ServerBase(std::string const& bus_name, std::string const& account_service_id);
+    virtual ~ServerBase();
+
+    void init(int& argc, char** argv);
+    void run();
+
+protected:
+    virtual std::unique_ptr<ProviderBase> make_provider() = 0;
+private:
+    std::unique_ptr<internal::ServerImpl> p_;
+
+    friend class internal::ServerImpl;
+};
+
+template <typename T>
+class Server : public ServerBase
+{
+public:
+    using ServerBase::ServerBase;
+protected:
+    std::unique_ptr<ProviderBase> make_provider() override {
+        return std::unique_ptr<ProviderBase>(new T);
+    }
+};
+
+}
+}
+}

=== added file 'include/unity/storage/provider/TempfileUploadJob.h'
--- include/unity/storage/provider/TempfileUploadJob.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/TempfileUploadJob.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/provider/UploadJob.h>
+#include <unity/storage/visibility.h>
+
+#include <string>
+#include <memory>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+
+namespace internal
+{
+class TempfileUploadJobImpl;
+}
+
+class UNITY_STORAGE_EXPORT TempfileUploadJob : public UploadJob
+{
+public:
+    TempfileUploadJob(std::string const& upload_id);
+    virtual ~TempfileUploadJob();
+
+    std::string file_name() const;
+
+protected:
+    TempfileUploadJob(internal::TempfileUploadJobImpl *p) UNITY_STORAGE_HIDDEN;
+};
+
+}
+}
+}

=== added file 'include/unity/storage/provider/UploadJob.h'
--- include/unity/storage/provider/UploadJob.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/UploadJob.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/visibility.h>
+
+#include <boost/thread/future.hpp>
+#include <string>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+
+struct Item;
+
+namespace internal
+{
+class PendingJobs;
+class ProviderInterface;
+class UploadJobImpl;
+}
+
+class UNITY_STORAGE_EXPORT UploadJob
+{
+public:
+    UploadJob(std::string const& upload_id);
+    virtual ~UploadJob();
+
+    std::string const& upload_id() const;
+    int read_socket() const;
+
+    // If an error is reported early, cancel() or finish() will not be
+    // invoked.
+    void report_error(std::exception_ptr p);
+
+    virtual boost::future<void> cancel() = 0;
+    virtual boost::future<Item> finish() = 0;
+
+protected:
+    UploadJob(internal::UploadJobImpl *p) UNITY_STORAGE_HIDDEN;
+    internal::UploadJobImpl *p_ = nullptr;
+
+    friend class internal::PendingJobs;
+    friend class internal::ProviderInterface;
+};
+
+}
+}
+}

=== added directory 'include/unity/storage/provider/internal'
=== added file 'include/unity/storage/provider/internal/AccountData.h'
--- include/unity/storage/provider/internal/AccountData.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/internal/AccountData.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/provider/Credentials.h>
+
+#include <OnlineAccounts/Account>
+#include <OnlineAccounts/PendingCallWatcher>
+#include <QObject>
+#include <QDBusConnection>
+
+#include <string>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+
+class ProviderBase;
+
+namespace internal
+{
+
+class DBusPeerCache;
+class PendingJobs;
+
+class AccountData : public QObject
+{
+    Q_OBJECT
+public:
+    AccountData(std::unique_ptr<ProviderBase>&& provider,
+                std::shared_ptr<DBusPeerCache> const& dbus_peer,
+                QDBusConnection const& bus,
+                OnlineAccounts::Account* account,
+                QObject* parent=nullptr);
+    virtual ~AccountData();
+
+    void authenticate(bool interactive);
+    bool has_credentials();
+    Credentials const& credentials();
+
+    ProviderBase& provider();
+    DBusPeerCache& dbus_peer();
+    PendingJobs& jobs();
+
+Q_SIGNALS:
+    void authenticated();
+
+private Q_SLOTS:
+    void on_authenticated();
+
+private:
+    std::unique_ptr<ProviderBase> const provider_;
+    std::shared_ptr<DBusPeerCache> const dbus_peer_;
+    std::unique_ptr<PendingJobs> const jobs_;
+
+    OnlineAccounts::Account* const account_;
+    std::unique_ptr<OnlineAccounts::PendingCallWatcher> auth_watcher_;
+    bool authenticating_interactively_ = false;
+
+    bool credentials_valid_ = false;
+    Credentials credentials_;
+
+    Q_DISABLE_COPY(AccountData)
+};
+
+}
+}
+}
+}

=== added file 'include/unity/storage/provider/internal/DBusPeerCache.h'
--- include/unity/storage/provider/internal/DBusPeerCache.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/internal/DBusPeerCache.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+
+#pragma once
+
+#include <boost/thread/future.hpp>
+#include <QDBusConnection>
+#include <QDBusPendingReply>
+#include <QString>
+
+#include <functional>
+#include <map>
+#include <memory>
+#include <string>
+#include <sys/types.h>
+
+class BusInterface;
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+namespace internal
+{
+
+class DBusPeerCache final {
+public:
+    struct Credentials
+    {
+        bool valid = false;
+        uid_t uid = 0;
+        pid_t pid = 0;
+        // Not using QString, because this is not necessarily unicode.
+        std::string label;
+    };
+
+    DBusPeerCache(QDBusConnection const& bus);
+    ~DBusPeerCache();
+
+    DBusPeerCache(DBusPeerCache const&) = delete;
+    DBusPeerCache& operator=(DBusPeerCache const&) = delete;
+
+    // Retrieve the security credentials for the given D-Bus peer.
+    boost::future<Credentials> get(QString const& peer);
+
+private:
+    struct Request;
+
+    std::unique_ptr<BusInterface> bus_daemon_;
+    bool apparmor_enabled_;
+
+    std::map<QString,Credentials> cache_;
+    std::map<QString,Credentials> old_cache_;
+    std::map<QString,std::unique_ptr<Request>> pending_;
+
+    void received_credentials(QString const& peer, QDBusPendingReply<QVariantMap> const& reply);
+};
+
+}  // namespace internal
+}  // namespace provider
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/provider/internal/DownloadJobImpl.h'
--- include/unity/storage/provider/internal/DownloadJobImpl.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/internal/DownloadJobImpl.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <QObject>
+
+#include <boost/thread/future.hpp>
+
+#include <exception>
+#include <mutex>
+#include <string>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+class DownloadJob;
+
+namespace internal
+{
+
+class DownloadJobImpl : public QObject
+{
+    Q_OBJECT
+public:
+    explicit DownloadJobImpl(std::string const& download_id);
+    virtual ~DownloadJobImpl();
+
+    std::string const& download_id() const;
+    int write_socket() const;
+    int take_read_socket();
+
+    std::string const& sender_bus_name() const;
+    void set_sender_bus_name(std::string const& bus_name);
+
+    void report_complete();
+    void report_error(std::exception_ptr p);
+    boost::future<void> finish(DownloadJob& job);
+    boost::future<void> cancel(DownloadJob& job);
+
+public Q_SLOTS:
+    virtual void complete_init();
+
+protected:
+    std::string const download_id_;
+    int read_socket_ = -1;
+    int write_socket_ = -1;
+    std::string sender_bus_name_;
+
+    std::mutex completion_lock_;
+    bool completed_ = false;
+    boost::promise<void> completion_promise_;
+
+    Q_DISABLE_COPY(DownloadJobImpl)
+};
+
+}
+}
+}
+}

=== added file 'include/unity/storage/provider/internal/Handler.h'
--- include/unity/storage/provider/internal/Handler.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/internal/Handler.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/provider/ProviderBase.h>
+#include <unity/storage/provider/internal/DBusPeerCache.h>
+
+#include <boost/thread/future.hpp>
+
+#include <QObject>
+#include <QDBusConnection>
+#include <QDBusMessage>
+
+#include <functional>
+#include <memory>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+namespace internal
+{
+
+class AccountData;
+class PendingJobs;
+
+class Handler : public QObject
+{
+    Q_OBJECT
+public:
+    typedef std::function<boost::future<QDBusMessage>(std::shared_ptr<AccountData> const&, Context const&, QDBusMessage const&)> Callback;
+
+    Handler(std::shared_ptr<AccountData> const& account,
+            Callback const& callback,
+            QDBusConnection const& bus, QDBusMessage const& message);
+
+public Q_SLOTS:
+    void begin();
+
+private Q_SLOTS:
+    void credentials_received();
+    void send_reply();
+
+Q_SIGNALS:
+    void finished();
+
+private:
+    std::shared_ptr<AccountData> const account_;
+    Callback const callback_;
+    QDBusConnection const bus_;
+    QDBusMessage const message_;
+
+    boost::future<void> creds_future_;
+    boost::future<void> reply_future_;
+    Context context_;
+    QDBusMessage reply_;
+
+    Q_DISABLE_COPY(Handler)
+};
+
+}
+}
+}
+}

=== added file 'include/unity/storage/provider/internal/MainLoopExecutor.h'
--- include/unity/storage/provider/internal/MainLoopExecutor.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/internal/MainLoopExecutor.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <boost/version.hpp>
+
+#if BOOST_VERSION >= 105600
+#  define SF_SUPPORTS_EXECUTORS
+#endif
+#ifdef SF_SUPPORTS_EXECUTORS
+#  include <boost/thread/executor.hpp>
+#endif
+#include <QObject>
+
+#include <functional>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+namespace internal
+{
+
+#ifdef SF_SUPPORTS_EXECUTORS
+
+/* Declare future continuations like so to execute within the event
+ * loop if possible:
+ *
+ *   auto f2 = f.then(EXEC_IN_MAIN [](decltype(f) f) { ... });
+ *
+ * On Boost >= 1.56, this will use a custom executor to run the
+ * continuation as an event in the main thread.  On older versions,
+ * the continuation will be executed in a new thread.
+ */
+
+#define EXEC_IN_MAIN MainLoopExecutor::instance(),
+
+class MainLoopExecutor : public QObject, public boost::executors::executor {
+    Q_OBJECT
+public:
+    static MainLoopExecutor& instance();
+
+    void submit(work&& closure) override;
+    void close() override;
+    bool closed() override;
+    bool try_executing_one() override;
+
+    bool event(QEvent *event) override;
+
+private:
+    MainLoopExecutor();
+    void execute(work& closure) noexcept;
+
+    Q_DISABLE_COPY(MainLoopExecutor)
+};
+
+#else
+
+#define EXEC_IN_MAIN /*nothing*/
+
+#endif
+
+}
+}
+}
+}

=== added file 'include/unity/storage/provider/internal/PendingJobs.h'
--- include/unity/storage/provider/internal/PendingJobs.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/internal/PendingJobs.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <QDBusConnection>
+#include <QDBusServiceWatcher>
+#include <QObject>
+
+#include <map>
+#include <memory>
+#include <mutex>
+#include <string>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+
+class DownloadJob;
+class UploadJob;
+
+namespace internal
+{
+
+
+class PendingJobs : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit PendingJobs(QDBusConnection const& bus, QObject *parent=nullptr);
+    virtual ~PendingJobs();
+
+    void add_download(std::unique_ptr<DownloadJob> &&job);
+    std::shared_ptr<DownloadJob> get_download(std::string const& download_id);
+    std::shared_ptr<DownloadJob> remove_download(std::string const& download_id);
+
+    void add_upload(std::unique_ptr<UploadJob> &&job);
+    std::shared_ptr<UploadJob> get_upload(std::string const& upload_id);
+    std::shared_ptr<UploadJob> remove_upload(std::string const& upload_id);
+
+private Q_SLOTS:
+    void service_disconnected(QString const& service_name);
+
+private:
+    void watch_peer(std::string const& bus_name);
+    void unwatch_peer(std::string const& bus_name);
+
+    std::mutex lock_;
+    std::map<std::string,std::shared_ptr<UploadJob>> uploads_;
+    std::map<std::string,std::shared_ptr<DownloadJob>> downloads_;
+
+    QDBusServiceWatcher watcher_;
+    std::map<std::string,int> services_;
+
+    Q_DISABLE_COPY(PendingJobs)
+};
+
+}
+}
+}
+}

=== added file 'include/unity/storage/provider/internal/ProviderInterface.h'
--- include/unity/storage/provider/internal/ProviderInterface.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/internal/ProviderInterface.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/internal/ItemMetadata.h>
+#include <unity/storage/provider/internal/Handler.h>
+
+#include <QObject>
+#include <QList>
+#include <QDBusConnection>
+#include <QDBusContext>
+#include <QDBusUnixFileDescriptor>
+
+#include <map>
+#include <memory>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+namespace internal
+{
+
+class AccountData;
+
+class ProviderInterface : public QObject, protected QDBusContext
+{
+    Q_OBJECT
+
+public:
+    ProviderInterface(std::shared_ptr<AccountData> const& account_data,
+                      QObject *parent=nullptr);
+    ~ProviderInterface();
+
+private:
+    typedef unity::storage::internal::ItemMetadata IMD;  // To keep things readable
+
+public Q_SLOTS:
+    QList<IMD> Roots();
+    QList<IMD> List(QString const& item_id, QString const& page_token, QString& next_token);
+    QList<IMD> Lookup(QString const& parent_id, QString const& name);
+    IMD Metadata(QString const& item_id);
+    IMD CreateFolder(QString const& parent_id, QString const& name);
+    QString CreateFile(QString const& parent_id, QString const& name, QString const& content_type, bool allow_overwrite, QDBusUnixFileDescriptor& file_descriptor);
+    QString Update(QString const& item_id, QString const& old_etag, QDBusUnixFileDescriptor& file_descriptor);
+    IMD FinishUpload(QString const& upload_id);
+    void CancelUpload(QString const& upload_id);
+    QString Download(QString const& item_id, QDBusUnixFileDescriptor& file_descriptor);
+    void FinishDownload(QString const& download_id);
+    void Delete(QString const& item_id);
+    IMD Move(QString const& item_id, QString const& new_parent_id, QString const& new_name);
+    IMD Copy(QString const& item_id, QString const& new_parent_id, QString const& new_name);
+
+private Q_SLOTS:
+    void request_finished();
+
+private:
+    void queue_request(Handler::Callback callback);
+
+    std::shared_ptr<AccountData> const account_;
+    std::map<Handler*, std::unique_ptr<Handler>> requests_;
+
+    Q_DISABLE_COPY(ProviderInterface)
+};
+
+}
+}
+}
+}

=== added file 'include/unity/storage/provider/internal/ServerImpl.h'
--- include/unity/storage/provider/internal/ServerImpl.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/internal/ServerImpl.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/provider/Server.h>
+#include <unity/storage/provider/internal/DBusPeerCache.h>
+#include <unity/storage/provider/internal/ProviderInterface.h>
+
+#include <OnlineAccounts/Manager>
+#include <OnlineAccounts/Account>
+#include <QObject>
+#include <QCoreApplication>
+#include <QDBusConnection>
+
+#include <map>
+#include <memory>
+#include <string>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+
+namespace internal
+{
+
+class ServerImpl : public QObject {
+    Q_OBJECT
+public:
+    ServerImpl(ServerBase* server, std::string const& bus_name, std::string const& account_service_id);
+    ~ServerImpl();
+
+    void init(int& argc, char **argv);
+    void run();
+
+private Q_SLOTS:
+    void account_manager_ready();
+
+private:
+    ServerBase* const server_;
+    std::string const bus_name_;
+    std::string const service_id_;
+
+    std::unique_ptr<QCoreApplication> app_;
+    std::unique_ptr<OnlineAccounts::Manager> manager_;
+    std::shared_ptr<DBusPeerCache> dbus_peer_;
+    std::map<OnlineAccounts::AccountId,std::unique_ptr<ProviderInterface>> interfaces_;
+
+    Q_DISABLE_COPY(ServerImpl)
+};
+
+}
+}
+}
+}

=== added file 'include/unity/storage/provider/internal/TempfileUploadJobImpl.h'
--- include/unity/storage/provider/internal/TempfileUploadJobImpl.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/internal/TempfileUploadJobImpl.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/provider/internal/UploadJobImpl.h>
+
+#include <QLocalSocket>
+#include <QTemporaryFile>
+
+#include <memory>
+#include <string>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+namespace internal
+{
+
+class TempfileUploadJobImpl : public UploadJobImpl
+{
+    Q_OBJECT
+public:
+    explicit TempfileUploadJobImpl(std::string const& upload_id);
+    virtual ~TempfileUploadJobImpl();
+
+    void complete_init() override;
+
+    std::string file_name() const;
+
+private Q_SLOTS:
+    void on_ready_read();
+    void on_read_channel_finished();
+
+private:
+    std::unique_ptr<QLocalSocket> reader_;
+    std::unique_ptr<QTemporaryFile> tmpfile_;
+
+    Q_DISABLE_COPY(TempfileUploadJobImpl)
+};
+
+}
+}
+}
+}

=== added file 'include/unity/storage/provider/internal/UploadJobImpl.h'
--- include/unity/storage/provider/internal/UploadJobImpl.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/internal/UploadJobImpl.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/provider/ProviderBase.h>
+
+#include <boost/thread/future.hpp>
+#include <QObject>
+
+#include <exception>
+#include <mutex>
+#include <string>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+class UploadJob;
+
+namespace internal
+{
+
+class UploadJobImpl : public QObject
+{
+    Q_OBJECT
+public:
+    explicit UploadJobImpl(std::string const& upload_id);
+    virtual ~UploadJobImpl();
+
+    std::string const& upload_id() const;
+    int read_socket() const;
+    int take_write_socket();
+
+    std::string const& sender_bus_name() const;
+    void set_sender_bus_name(std::string const& bus_name);
+
+    void report_error(std::exception_ptr p);
+    boost::future<Item> finish(UploadJob& job);
+    boost::future<void> cancel(UploadJob& job);
+
+public Q_SLOTS:
+    virtual void complete_init();
+
+protected:
+    std::string const upload_id_;
+    int read_socket_ = -1;
+    int write_socket_ = -1;
+    std::string sender_bus_name_;
+
+    std::mutex completion_lock_;
+    bool completed_ = false;
+    boost::promise<Item> completion_promise_;
+
+    Q_DISABLE_COPY(UploadJobImpl)
+};
+
+}
+}
+}
+}

=== added file 'include/unity/storage/provider/internal/dbusmarshal.h'
--- include/unity/storage/provider/internal/dbusmarshal.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/provider/internal/dbusmarshal.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: James Henstridge <[e-mail]>
+ */
+
+#pragma once
+
+#include <QDBusArgument>
+#include <QVariant>
+#include <vector>
+
+namespace unity
+{
+namespace storage
+{
+namespace provider
+{
+
+struct Item;
+
+QDBusArgument& operator<<(QDBusArgument& argument, Item const& item);
+QDBusArgument const& operator>>(QDBusArgument const& argument, Item& item);
+
+QDBusArgument& operator<<(QDBusArgument& argument, std::vector<Item> const& items);
+QDBusArgument const& operator>>(QDBusArgument const& argument, std::vector<Item>& items);
+
+}
+}
+}
+
+Q_DECLARE_METATYPE(unity::storage::provider::Item)

=== added directory 'include/unity/storage/qt'
=== added file 'include/unity/storage/qt/CMakeLists.txt'
--- include/unity/storage/qt/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/CMakeLists.txt	2016-07-21 12:22:21 +0000
@@ -0,0 +1,1 @@
+add_subdirectory(client)

=== added directory 'include/unity/storage/qt/client'
=== added file 'include/unity/storage/qt/client/Account.h'
--- include/unity/storage/qt/client/Account.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/client/Account.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/visibility.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QFuture>
+#pragma GCC diagnostic pop
+#include <QString>
+#include <QVector>
+
+#include <memory>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace client
+{
+
+class Runtime;
+class Root;
+
+namespace internal
+{
+
+class AccountBase;
+
+namespace local_client
+{
+
+class RuntimeImpl;
+
+}  // namespace local_client
+
+namespace remote_client
+{
+
+class ItemImpl;
+class RuntimeImpl;
+
+}  // namespace remote_client
+}  // namespace internal
+
+/**
+\brief Class that represents an account.
+*/
+class UNITY_STORAGE_EXPORT Account final
+{
+public:
+    /// @cond
+    ~Account();
+    /// @endcond
+
+    Account(Account&&);
+    Account& operator=(Account&&);
+
+    typedef std::shared_ptr<Account> SPtr;
+
+    Runtime* runtime() const;
+
+    QString owner() const;
+    QString owner_id() const;
+    QString description() const;
+
+    // TODO: Will almost certainly need more here. Other details?
+
+    /**
+    \brief Returns the root directories for the account.
+
+    An account can have more than one root directory (for providers that support the concept of multiple drives).
+    */
+    QFuture<QVector<std::shared_ptr<Root>>> roots() const;
+
+private:
+    Account(internal::AccountBase*) UNITY_STORAGE_HIDDEN;
+
+    std::shared_ptr<internal::AccountBase> p_;
+
+    friend class internal::local_client::RuntimeImpl;
+    friend class internal::remote_client::ItemImpl;
+    friend class internal::remote_client::RuntimeImpl;
+};
+
+}  // namespace client
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/client/CMakeLists.txt'
--- include/unity/storage/qt/client/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/client/CMakeLists.txt	2016-07-21 12:22:21 +0000
@@ -0,0 +1,15 @@
+set(includeprefix unity/storage/qt/client)
+file(GLOB public_hdrs *.h)
+set(convenience_hdr ${CMAKE_CURRENT_BINARY_DIR}/client-api.h)
+
+add_custom_command(
+    OUTPUT ${convenience_hdr}
+    COMMAND ${CMAKE_SOURCE_DIR}/tools/create_globalheader.py
+        ${convenience_hdr} ${includeprefix} ${CMAKE_CURRENT_SOURCE_DIR}
+    DEPENDS ${public_hdrs})
+
+add_custom_target(qt-client-all-headers ALL DEPENDS ${convenience_hdr})
+
+install(
+    FILES ${public_hdrs} ${convenience_hdr}
+    DESTINATION ${client_base_includedir}/${includeprefix})

=== added file 'include/unity/storage/qt/client/Downloader.h'
--- include/unity/storage/qt/client/Downloader.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/client/Downloader.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/common.h>
+#include <unity/storage/visibility.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QFuture>
+#pragma GCC diagnostic pop
+#include <QLocalSocket>
+
+#include <memory>
+
+class QLocalSocket;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace client
+{
+
+class File;
+
+namespace internal
+{
+
+class DownloaderBase;
+
+namespace local_client
+{
+
+class FileImpl;
+
+}  // namespace local_client
+
+namespace remote_client
+{
+
+class DownloaderImpl;
+
+}  // namespace remote_client
+}  // namespace internal
+
+class UNITY_STORAGE_EXPORT Downloader final
+{
+public:
+    /**
+    \brief Destroys the downloader.
+
+    The destructor implicitly calls cancel() if it has not been called already.
+    */
+    ~Downloader();
+
+    Downloader(Downloader&&);
+    Downloader& operator=(Downloader&&);
+
+    /**
+    \brief Convenience type definition.
+    */
+    typedef std::shared_ptr<Downloader> SPtr;
+
+    /**
+    \brief Returns the file for this downloader.
+    */
+    std::shared_ptr<File> file() const;
+
+    /**
+    \brief Returns a socket that is open for reading.
+
+    To download the file contents, read from the returned socket.
+    \return A socket open for reading.
+    */
+    std::shared_ptr<QLocalSocket> socket() const;
+
+    /**
+    \brief Finalizes the download.
+
+    Once the returned socket indicates EOF, you must call finish_download(), which closes
+    the socket. Call `waitForFinished()` on the returned future to check for errors. If an error
+    occurred, `waitForFinished()` throws an exception. If the download was cancelled, `waitForFinished()` throws
+    CancelledException.
+
+    \warning Do not assume that a download completed successfully once you detect EOF on the socket.
+    If something goes wrong during a download on the server side, the socket will return EOF
+    for a partially-downloaded file.
+    */
+    QFuture<void> finish_download();
+
+    /**
+    \brief Cancels a download.
+
+    Calling cancel() informs the provider that the download is no longer needed. The provider
+    will make a best-effort attempt to cancel the download from the remote service.
+
+    You can check whether the cancel was successfully sent by calling `waitForFinished()` on the returned future.
+    If this does not throw an exception, the message was received and acted upon by the provider. However,
+    successful completion does _not_ indicate that the download was actually cancelled. (For example,
+    the download may have completed already by the time the provider received the cancel request, or the provider
+    may not support cancellation.)
+
+    Calling cancel() more than once, or calling cancel() after a call to finish_download() is safe and does nothing.
+    */
+    QFuture<void> cancel();
+
+private:
+    Downloader(internal::DownloaderBase*) UNITY_STORAGE_HIDDEN;
+
+    std::shared_ptr<internal::DownloaderBase> p_;
+
+    friend class internal::local_client::FileImpl;
+    friend class internal::remote_client::DownloaderImpl;
+};
+
+}  // namespace client
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/client/Exceptions.h'
--- include/unity/storage/qt/client/Exceptions.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/client/Exceptions.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/visibility.h>
+
+#include <QException>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace client
+{
+
+/**
+\brief Base exception class for all exceptions returned by the API.
+*/
+class UNITY_STORAGE_EXPORT StorageException : public QException
+{
+public:
+    StorageException();
+    ~StorageException();
+
+    virtual StorageException* clone() const override;
+    virtual void raise() const override;
+};
+
+/**
+\brief Indicates errors in the communication with the storage provider service.
+*/
+class UNITY_STORAGE_EXPORT LocalCommsException : public StorageException
+{
+public:
+    LocalCommsException();
+    ~LocalCommsException();
+
+    virtual LocalCommsException* clone() const override;
+    virtual void raise() const override;
+};
+
+/**
+\brief Indicates errors in the communication between the storage provider and the cloud service.
+*/
+class UNITY_STORAGE_EXPORT RemoteCommsException : public StorageException
+{
+public:
+    RemoteCommsException();
+    ~RemoteCommsException();
+
+    virtual RemoteCommsException* clone() const override;
+    virtual void raise() const override;
+};
+
+/**
+\brief Indicates that the caller invoked an operation on a file or folder that was deleted.
+*/
+class UNITY_STORAGE_EXPORT DeletedException : public StorageException
+{
+public:
+    DeletedException();
+    ~DeletedException();
+
+    virtual DeletedException* clone() const override;
+    virtual void raise() const override;
+};
+
+/**
+\brief Indicates that the caller destroyed the runtime.
+*/
+class UNITY_STORAGE_EXPORT RuntimeDestroyedException : public StorageException
+{
+public:
+    RuntimeDestroyedException();
+    ~RuntimeDestroyedException();
+
+    virtual RuntimeDestroyedException* clone() const override;
+    virtual void raise() const override;
+};
+
+/**
+\brief Indicates that an item does not exist.
+*/
+class UNITY_STORAGE_EXPORT NotExistException : public StorageException
+{
+public:
+    NotExistException();
+    ~NotExistException();
+
+    virtual NotExistException* clone() const override;
+    virtual void raise() const override;
+};
+
+/**
+\brief Indicates that an upload detected a version mismatch.
+*/
+class UNITY_STORAGE_EXPORT ConflictException : public StorageException
+{
+public:
+    ConflictException();
+    ~ConflictException();
+
+    virtual ConflictException* clone() const override;
+    virtual void raise() const override;
+};
+
+/**
+\brief Indicates that an upload or download was cancelled before it could complete.
+*/
+class UNITY_STORAGE_EXPORT CancelledException : public StorageException
+{
+public:
+    CancelledException();
+    ~CancelledException();
+
+    virtual CancelledException* clone() const override;
+    virtual void raise() const override;
+};
+
+}  // namespace client
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/client/File.h'
--- include/unity/storage/qt/client/File.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/client/File.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/qt/client/Item.h>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace client
+{
+
+class Downloader;
+class Uploader;
+namespace internal
+{
+
+class FileBase;
+
+namespace local_client
+{
+
+class FileImpl;
+
+}  // namespace local_client
+
+namespace remote_client
+{
+
+class FileImpl;
+
+}  // namespace remotelocal_client
+}  // namespace internal
+
+/**
+\brief Class that represents a file.
+
+A file is a sequence of bytes.
+*/
+class UNITY_STORAGE_EXPORT File final : public Item
+{
+public:
+    /// @cond
+    virtual ~File();
+    /// @endcond
+
+    File(File&&);
+    File& operator=(File&&);
+
+    /**
+    \brief Convenience type definition.
+    */
+    typedef std::shared_ptr<File> SPtr;
+
+    /**
+    \brief Returns the size of the file in bytes.
+    \throws DestroyedException if the file has been destroyed.
+    */
+    int64_t size() const;
+
+    /**
+    \brief Creates an uploader for the file.
+    \param policy The conflict resolution policy. If set to ConflictPolicy::overwrite,
+    the contents of the file will be overwritten even if the file was modified
+    after this File instance was retrieved. Otherwise, if set to ConflictPolicy::error_if_conflict,
+    an attempt to retrieve the File instance from the future returned by Uploader::finish_upload()
+    throws ConflictException.
+    */
+    QFuture<std::shared_ptr<Uploader>> create_uploader(ConflictPolicy policy);
+
+    /**
+    \brief Creates a downloader for the file.
+    */
+    QFuture<std::shared_ptr<Downloader>> create_downloader();
+
+private:
+    File(internal::FileBase*) UNITY_STORAGE_HIDDEN;
+
+    friend class internal::local_client::FileImpl;
+    friend class internal::remote_client::FileImpl;
+};
+
+}  // namespace client
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/client/Folder.h'
--- include/unity/storage/qt/client/Folder.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/client/Folder.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/qt/client/File.h>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace client
+{
+namespace internal
+{
+
+class FolderBase;
+
+namespace local_client
+{
+
+class FolderImpl;
+class ItemImpl;
+
+}  // namespace local_client
+
+namespace remote_client
+{
+
+class FolderImpl;
+class ItemImpl;
+
+}  // namespace local_client
+}  // namespace internal
+
+/**
+\brief Class that represents a folder.
+
+A folder is an unordered set of files and/or folders.
+*/
+class UNITY_STORAGE_EXPORT Folder : public Item
+{
+public:
+    /// @cond
+    virtual ~Folder();
+    /// @endcond
+
+    Folder(Folder&&);
+    Folder& operator=(Folder&&);
+
+    typedef std::shared_ptr<Folder> SPtr;
+
+    /**
+    \brief Returns the contents of a folder.
+    \return A vector of items or, if this folder is empty,
+    an empty vector. If there is a large number of items,
+    the returned future may become ready
+    more than once. (See QFutureWatcher for more information.)
+    */
+    QFuture<QVector<Item::SPtr>> list() const;
+
+    /**
+    \brief Returns the item within this folder with the given name.
+    \return The item. If no such item exists, retrieving the result
+    from the future throws an exception.
+    */
+    QFuture<QVector<Item::SPtr>> lookup(QString const& name) const;
+
+    /**
+    \brief Creates a new folder with the current folder as the parent.
+    \param name The name of the new folder. Note that the actual name may be changed
+    by the provider; call Item::name() once the folder is created to get its actual name.
+    \warn Do not rely on create_folder() to fail if an attempt is made to create
+    a folder with the same name as an already existing folder or file. Depending on the cloud
+    provider, it may be possible to have several folders with the same name.
+    // TODO: Explain issues with metacharacters.
+    \return The new folder.
+    */
+    QFuture<Folder::SPtr> create_folder(QString const& name);
+
+    /**
+    \brief Creates a new file with the current folder as the parent.
+
+    Use the returned Uploader to write data to the file. You must call Uploader::finish_upload()
+    for the file to actually be created (whether data was written to the file or not).
+    \param name The name of the new file. Note that the actual name may be changed
+    by the provider; call Item::name() once the file is created to get its actual name.
+    \warn Do not rely on create_file() to fail if an attempt is made to create
+    a file with the same name as an already existing file or folder. Depending on the cloud
+    provider, it may be possible to have several files with the same name.
+    // TODO: Explain issues with metacharacters.
+    */
+    QFuture<std::shared_ptr<Uploader>> create_file(QString const& name);
+
+protected:
+    Folder(internal::FolderBase*) UNITY_STORAGE_HIDDEN;
+
+    friend class internal::local_client::FolderImpl;
+    friend class internal::local_client::ItemImpl;
+    friend class internal::remote_client::FolderImpl;
+};
+
+}  // namespace client
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/client/Item.h'
--- include/unity/storage/qt/client/Item.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/client/Item.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/common.h>
+#include <unity/storage/visibility.h>
+
+#include <QDateTime>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QFuture>
+#pragma GCC diagnostic pop
+#include <QString>
+
+#include <memory>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace client
+{
+
+class Folder;
+class Root;
+
+namespace internal
+{
+
+class ItemBase;
+
+namespace local_client
+{
+
+class UploadWorker;
+
+}  // namespace local_client
+
+namespace remote_client
+{
+
+class CopyHandler;
+class ItemImpl;
+class LookupHandler;
+class MetadataHandler;
+
+}  // namespace remote_client
+}  // namespace internal
+
+/**
+\brief Base class for files and folders.
+*/
+class UNITY_STORAGE_EXPORT Item
+{
+public:
+    /// @cond
+    virtual ~Item();
+    /// @endcond
+
+    Item(Item&&);
+    Item& operator=(Item&&);
+
+    /**
+    \brief Convenience type definition.
+    */
+    typedef std::shared_ptr<Item> SPtr;
+
+    /**
+    \brief Returns the native identifier used by the provider.
+    */
+    QString native_identity() const;
+
+    /**
+    \brief Returns the name of the file or folder.
+
+    The returned name may not be the same as the name that was used to create the item because the provider
+    may have changed it in some way (such as converting upper case characters to lower case).
+    */
+    QString name() const;
+
+    /**
+    \brief Returns the root folder for this item.
+
+    If this item is a root, the returned pointer points at this item.
+    */
+    Root* root() const;
+
+    /**
+    \brief Returns the type of the item.
+    */
+    ItemType type() const;
+
+    /**
+    \brief Returns a version identifier for the item.
+
+    The version identifier changes each time the file is updated (possibly
+    via some channel other than this API).
+    */
+    QString etag() const;
+
+    /**
+    \brief Returns metadata for the item.
+
+    TODO: Needs a lot more doc. Explain standard and provider-specific metadata.
+    */
+    QVariantMap metadata() const;
+
+    /**
+    \brief Returns the time at which the item was last modified.
+    */
+    QDateTime last_modified_time() const;
+
+    /**
+    \brief Returns a list of parent folders of this item.
+    \return A vector of parents. For a root, the returned vector is empty.
+    \warn Depending on the provider, a single file or folder may have multiple
+    parents. Do not assume that only a single parent will be returned, or that
+    parents are returned in a particular order.
+    */
+    QFuture<QVector<std::shared_ptr<Folder>>> parents() const;
+
+    /**
+    \brief Returns the native identities of the parents of this item.
+    \return A vector of parent identities. For a root, the returned vector is empty.
+    \warn Depending on the provider, a single file or folder may have multiple
+    parents. Do not assume that only a single parent ID will be returned, or that
+    parent IDs are returned in a particular order.
+    */
+    QVector<QString> parent_ids() const;
+
+    /**
+    \brief Copies this item.
+
+    Copying a folder recursively copies its contents.
+    \param new_parent The new parent folder for the item. If the item is to be copied within
+    its current folder, this parameter must designate the currently existing parent.
+    \param new_name The new name for the file.
+    \warn Do not rely on copy() to fail if an attempt is made to copy
+    a file or folder to a destination name that is the same as that of an already existing file or folder.
+    Depending on the cloud provider, it may be possible to have several folders with the same name.
+    */
+    QFuture<Item::SPtr> copy(std::shared_ptr<Folder> const& new_parent, QString const& new_name);
+
+    /**
+    \brief Renames and/or moves a file or folder.
+    \param new_parent The new parent folder for the item. If the item is to be renamed within
+    its current folder, this parameter must designate the currently existing parent.
+    \param new_name The new name for the item.
+    \warn Do not rely on move() to fail if an attempt is made to move
+    a file or folder to a destination name that is the same as that of an already existing file or folder.
+    Depending on the cloud provider, it may be possible to have several files or folders with the same name.
+    \note It is not possible to move or rename the root folder.
+    */
+    QFuture<Item::SPtr> move(std::shared_ptr<Folder> const& new_parent, QString const& new_name);
+
+    /**
+    \brief Permamently deletes the item.
+    \warning Deleting a folder recursively deletes its contents.
+    */
+    QFuture<void> delete_item();
+
+    /**
+    \brief Compares two items for equality.
+
+    Equality comparison is deep, that is, it compares the native identities of two items, not
+    their `shared_ptr` values.
+    \note If you retrieve the same item more than once (such as by calling Root::get() twice
+    with the same file ID) and then perform an upload using one of the two file handles, the
+    files still have the same identity after the upload. However, the etag() values of the two
+    file handles differ after the upload. Despite this, equal_to() still returns `true` for
+    the two files, that is, the ETags are ignored for equality comparison.
+    \return `!this->native_identity() == other->native_identity()`
+    \throws DeletedException if `this` or `other` have been deleted.
+    */
+    bool equal_to(Item::SPtr const& other) const noexcept;
+
+protected:
+    Item(internal::ItemBase* p) UNITY_STORAGE_HIDDEN;
+
+    std::shared_ptr<internal::ItemBase> p_;
+
+    friend class internal::local_client::UploadWorker;
+    friend class internal::remote_client::CopyHandler;
+    friend class internal::remote_client::ItemImpl;
+    friend class internal::remote_client::LookupHandler;
+    friend class internal::remote_client::MetadataHandler;
+};
+
+}  // namespace client
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/client/Root.h'
--- include/unity/storage/qt/client/Root.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/client/Root.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/qt/client/Folder.h>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace client
+{
+
+class Account;
+class Item;
+
+namespace internal
+{
+
+class RootBase;
+
+namespace local_client
+{
+
+class RootImpl;
+
+}  // namespace local_client
+
+namespace remote_client
+{
+
+class RootImpl;
+
+}  // namespace remote_client
+}  // namespace internal
+
+/**
+\brief Class that represents a root folder.
+*/
+class UNITY_STORAGE_EXPORT Root final : public Folder
+{
+public:
+    // @cond
+    virtual ~Root();
+    /// @endcond
+
+    Root(Root&&);
+    Root& operator=(Root&&);
+
+    typedef std::shared_ptr<Root> SPtr;
+
+    /**
+    \brief Returns the account for this root.
+    */
+    Account* account() const;
+
+    QFuture<int64_t> free_space_bytes() const;
+    QFuture<int64_t> used_space_bytes() const;
+
+    QFuture<Item::SPtr> get(QString native_identity) const;
+
+    // TODO: Do we need a method to get lots of things?
+
+private:
+    Root(internal::RootBase*) UNITY_STORAGE_HIDDEN;
+
+    friend class internal::local_client::RootImpl;
+    friend class internal::remote_client::RootImpl;
+};
+
+}  // namespace client
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/client/Runtime.h'
--- include/unity/storage/qt/client/Runtime.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/client/Runtime.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/visibility.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QFuture>
+#pragma GCC diagnostic pop
+
+#include <memory>
+
+class QDBusConnection;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace client
+{
+
+class Account;
+
+namespace internal
+{
+
+class RuntimeBase;
+
+namespace remote_client
+{
+
+class AccountImpl;
+
+}  // namespace remote_client
+
+}  // namespace internal
+
+/**
+TODO
+*/
+class UNITY_STORAGE_EXPORT Runtime final
+{
+public:
+    /**
+    \brief Destroys the runtime.
+
+    The destructor implicitly calls shutdown().
+
+    \warning Do not invoke methods on any other part of the API once the runtime is destroyed;
+    doing so has undefined behavior.
+    */
+    ~Runtime();
+
+    Runtime(Runtime&&);
+    Runtime& operator=(Runtime&&);
+
+    typedef std::shared_ptr<Runtime> SPtr;
+
+    /**
+    \brief Initializes the runtime.
+    */
+    static SPtr create();
+    static SPtr create(QDBusConnection const& bus);
+
+    /**
+    \brief Shuts down the runtime.
+
+    This method shuts down the runtime. Calling shutdown() more than once is safe and does nothing.
+
+    The destructor implicitly calls shutdown(). This method is provided mainly to permit logging of any
+    errors that might arise during shut-down.
+    \throws Various exceptions, depending on the error. TODO
+    */
+    void shutdown();
+
+    QFuture<QVector<std::shared_ptr<Account>>> accounts();
+
+private:
+    Runtime(internal::RuntimeBase* p) UNITY_STORAGE_HIDDEN;
+
+    std::shared_ptr<internal::RuntimeBase> p_;
+
+    friend class internal::remote_client::AccountImpl;
+};
+
+}  // namespace client
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/client/Uploader.h'
--- include/unity/storage/qt/client/Uploader.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/client/Uploader.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <unity/storage/visibility.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QFuture>
+#pragma GCC diagnostic pop
+#include <QLocalSocket>
+
+#include <memory>
+
+class QLocalSocket;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace client
+{
+
+class File;
+
+namespace internal
+{
+
+class UploaderBase;
+
+namespace local_client
+{
+
+class FileImpl;
+class FolderImpl;
+
+}  // namespace local_client
+
+namespace remote_client
+{
+
+class UploaderImpl;
+
+}  // namespace remote_client
+}  // namespace internal
+
+class UNITY_STORAGE_EXPORT Uploader final
+{
+public:
+    /**
+    \brief Destroys the uploader.
+
+    The destructor implicitly calls cancel() if it has not been called already.
+    */
+    ~Uploader();
+
+    Uploader(Uploader&&);
+    Uploader& operator=(Uploader&&);
+
+    /**
+    \brief Convenience type definition.
+    */
+    typedef std::shared_ptr<Uploader> SPtr;
+
+    /**
+    \brief Returns a socket that is open for writing.
+
+    To upload the file contents, write to the returned socket.
+    If an operation on the socket returns an error, the file is in an indeterminate state.
+
+    \return A socket open for writing.
+    */
+    std::shared_ptr<QLocalSocket> socket() const;
+
+    /**
+    \brief Finalizes the upload.
+
+    Once you have written the file contents to the socket returned by socket(), you must call finish_upload(),
+    which closes the socket. Call `result()` on the returned future to check for errors. If an error
+    occurred, `result()` throws an exception. If the upload was cancelled, `result` throws CancelledException.
+    Otherwise, it returns the File that was uploaded.
+
+    Calling finish_upload() more than once is safe; subsequent calls do nothing and return the future
+    that was returned by the first call.
+    */
+    QFuture<std::shared_ptr<File>> finish_upload();
+
+    /**
+    \brief Cancels an upload.
+
+    Calling cancel() informs the provider that the upload is no longer needed. The provider
+    will make a best-effort attempt to cancel the upload to the remote service.
+
+    You can check whether the cancel was successfully sent by calling `waitForFinished()` on the returned future.
+    If this does not throw an exception, the message was received and acted upon by the provider. However,
+    successful completion does _not_ indicate that the upload was actually cancelled. (For example,
+    the upload may have completed already by the time the provider received the cancel request, or the provider
+    may not support cancellation.)
+
+    Calling cancel() more than once, or calling cancel() after a call to finish_upload() is safe and does nothing.
+    */
+    QFuture<void> cancel();
+
+private:
+    Uploader(internal::UploaderBase*) UNITY_STORAGE_HIDDEN;
+
+    std::shared_ptr<internal::UploaderBase> p_;
+
+    friend class internal::local_client::FileImpl;
+    friend class internal::local_client::FolderImpl;
+    friend class internal::remote_client::UploaderImpl;
+};
+
+}  // namespace client
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added directory 'include/unity/storage/qt/client/internal'
=== added file 'include/unity/storage/qt/client/internal/AccountBase.h'
--- include/unity/storage/qt/client/internal/AccountBase.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/client/internal/AccountBase.h	2016-07-21 12:22:21 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2016 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors: Michi Henning <[e-mail]>
+ */
+
+#pragma once