Merge lp:~abreu-alexandre/unity-webapps-qml/new-content-hub-api into lp:unity-webapps-qml

[Alexandre Abreu]

Add support for the new content hub api

Add support for the new content hub api.

You need https://code.launchpad.net/~michael-sheldon/content-hub/peer_picker_ui (new implementation for content hub)

- Testing the feature
---------------------

you have the examples/api-bindings/:

- content-hub: example of an import application. It lists the potential sources for images,

- content-hub-exporter: exmaple of an exporter application (exporting pictures). The click package should be installed locally (see the README file in the local folder) and it should be listed as peer by the importer (if not make sure that you killed the content-hub service and registered the new peer w/ by running the content-hub-peer-hook /usr/lib/x86_64-linux-gnu/content-hub/content-hub-peer-hook). What usually happens is that I manually start the app before testing the importers, to avoid upstart issues & crashes on the desktop w/ e.g.:

APP_ID=com.ubuntu.developer.alexandre-abreu.content-hub-html5-exporter_content-hub-html5-exporter_0.6 qmlscene -I `pwd`/../../../src main.qml

- content-hub-picker: example of an application that uses the Content Peer Picker UI,

- Automated/unit tests
----------------------

Another branch will land that adds integration tests for all API components, which is why
no tests have been added/updated,

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/90/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/38
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/38

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/90/rebuild

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

L646: + if (this._modelAdaptor) {
I guess you wanted "if (!..."

L670: Isn't it possible to avoid building the code this way, and use backendDelegate.createQmlObject() as you did for the AccountServiceModel? (I guess you had your reasons not to do it this way, please explain :-) )

L673-678 (but also later): I'd put the ";" at the end of the line, rather than at the beginning. Otherwise if the first filter is not set and the second one is, you'd end up with code like "ContentPeerModel { ; handler: ..."

L952: I guess the result of the expression must be a boolean, so maybe write it as
  this._isDefaultPeer = content && content.isDefaultPeer

I didn't test it yet, will do that soon.

review: Needs Fixing

[Alberto Mardegan (mardy)]

I tested it, and the examples work.

[lp:~abreu-alexandre/unity-webapps-qml/new-content-hub-api]

101. By Alexandre Abreu on 2014-03-18

fixes

[Alexandre Abreu (abreu-alexandre)]

> L646: + if (this._modelAdaptor) {
> I guess you wanted "if (!..."

right, done

> L670: Isn't it possible to avoid building the code this way, and use
> backendDelegate.createQmlObject() as you did for the AccountServiceModel? (I
> guess you had your reasons not to do it this way, please explain :-) )

sure, the issue is w/ the plugin specific types that are not js builtins.
Things work find w/ the backend.create[..] when you have builtin types but
it is not really meant to specify custom type params like ContentType.Pictures, etc.
Those have to be handled specifically, hence the lousy creation steps,

>
> L673-678 (but also later): I'd put the ";" at the end of the line, rather than
> at the beginning. Otherwise if the first filter is not set and the second one
> is, you'd end up with code like "ContentPeerModel { ; handler: ..."

right, done

> L952: I guess the result of the expression must be a boolean, so maybe write
> it as
> this._isDefaultPeer = content && content.isDefaultPeer

done

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:101
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/92/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/40
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/40

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/92/rebuild

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

LGTM!

review: Approve

=== modified file 'examples/api-bindings/content-hub/www/js/app.js'
--- examples/api-bindings/content-hub/www/js/app.js	2014-02-11 09:18:34 +0000
+++ examples/api-bindings/content-hub/www/js/app.js	2014-03-18 13:59:59 +0000
@@ -6,32 +6,18 @@
     var pictureContentType = hub.ContentType.Pictures;
 
     var sourcePeers = {};
-    hub.knownSourcesForType(
-        pictureContentType
+    hub.getPeers(
+        {contentType: hub.ContentType.Pictures}
         , function (peers) {
+            if ( ! peers.length)
+                return;
+
             for (var j = 0; j < peers.length; ++j) {
                 addPeerElement(peers[j].appId(), peers[j].name());
                 sourcePeers[peers[j].appId()] = peers[j];
             }
-
-            console.log('peers defaultSourceForType: ' + peers)
-
-            hub.defaultSourceForType(
-                pictureContentType
-                , function(peer) {
-                    if (peer) {
-                        addPeerElement(peer.appId(), peer.name());
-                        sourcePeers[peer.appId()] = peer;
-                    }
-
-                    if (Object.keys(sourcePeers).length === 0) {
-                        nopeers();
-                        return;
-                    }
-                    document.getElementById('importdiv').style.display = 'block';
-                    document.getElementById('lowLevelImportdiv').style.display = 'block';
-                  }
-            );
+            document.getElementById('importdiv').style.display = 'block';
+            document.getElementById('lowLevelImportdiv').style.display = 'block';
         });
 
     document.getElementById('import').addEventListener('click', doSimpleApiImport);
@@ -132,7 +118,7 @@
 
         hub.api.importContent(pictureContentType
                       , peer
-                      , {importToLocalStore: true}
+                      , {scope: hub.ContentScope.App}
                       , function(items) {
                           for (var i = 0; i < items.length; ++i) {
                               addResult(items[i]);
@@ -159,40 +145,31 @@
             return;
         }
 
-        hub.importContentForPeer(
-            pictureContentType,
-            peer,
-            function(transfer) {
-
-                hub.defaultStoreForType(pictureContentType, function(store) {
-                    transfer.setStore(store, function() {
-
-                        transfer.start(function(state) {
-                            if (transferState.Aborted === state) {
-                                transfer.finalize();
-                                peer.destroy();
-                                transfer.destroy();
-                                aborted();
-                                return;
-                            }
-
-                            if (transferState.Charged === state) {
-                                transfer.items(function(items) {
-                                    for (var i = 0; i < items.length; ++i) {
-                                        addResult(items[i]);
-                                    }
-                                    transfer.finalize();
-                                    peer.destroy();
-                                    transfer.destroy();
-                                });
-                            }
+        hub.getStore(hub.ContentScope.App, function(store) {
+            peer.requestForStore(store, function(transfer) {
+                transfer.start(function(state) {
+                    if (transferState.Aborted === state) {
+                        transfer.finalize();
+                        peer.destroy();
+                        transfer.destroy();
+                        aborted();
+                        return;
+                    }
+
+                    if (transferState.Charged === state) {
+                        transfer.items(function(items) {
+                            for (var i = 0; i < items.length; ++i) {
+                                addResult(items[i]);
+                            }
+                            transfer.finalize();
+                            peer.destroy();
+                            transfer.destroy();
                         });
-                    });
-
+                    }
                 });
 
-            }
-        );
+            });
+        });
     };
 };
 
 
=== added directory 'examples/api-bindings/content-peer-picker'
=== added file 'examples/api-bindings/content-peer-picker/main.qml.in'
--- examples/api-bindings/content-peer-picker/main.qml.in	1970-01-01 00:00:00 +0000
+++ examples/api-bindings/content-peer-picker/main.qml.in	2014-03-18 13:59:59 +0000
@@ -0,0 +1,32 @@
+import QtQuick 2.0
+import QtWebKit 3.0 
+import QtWebKit.experimental 1.0
+import Ubuntu.Components 0.1
+import Ubuntu.UnityWebApps 0.1
+
+MainView {
+  id: root
+  focus: true
+  applicationName: \"helloworld\"
+
+  width: units.gu(100)
+  height: units.gu(100)
+
+  WebView {
+    id: webview
+    anchors.fill: parent
+    url: \"file://$$OUT_PWD/content-hub/www/index.html\"
+
+    experimental.preferences.navigatorQtObjectEnabled: true
+    experimental.preferences.developerExtrasEnabled: true
+
+    function getUnityWebappsProxies() {
+        return UnityWebAppsUtils.makeProxiesForQtWebViewBindee(webview);
+    }
+
+    UnityWebApps {
+        id: webapps
+        bindee: webview
+    }
+  }
+}
 
=== added directory 'examples/api-bindings/content-peer-picker/www'
=== added file 'examples/api-bindings/content-peer-picker/www/index.html'
--- examples/api-bindings/content-peer-picker/www/index.html	1970-01-01 00:00:00 +0000
+++ examples/api-bindings/content-peer-picker/www/index.html	2014-03-18 13:59:59 +0000
@@ -0,0 +1,33 @@
+<html>
+
+  <head>
+    <title>Content Hub: Content Peer Picker example</title>
+    <script src="./js/app.js"></script>
+  </head>
+  
+  <style>
+
+  .selected { background-color: red; }
+
+  </style>
+
+  <body>
+    <div>
+      Start Content Peer picking to import content: <input type="button" id="pick"></input>
+    </div>
+    
+    <div>
+      Selected peer:
+      <div id="selected-peer">
+      </div>
+    </div>
+
+    <div>
+      Imported Image:
+      <div id="results">
+      </div>
+    </div>
+
+  </body>
+  
+</html>
 
=== added directory 'examples/api-bindings/content-peer-picker/www/js'
=== added file 'examples/api-bindings/content-peer-picker/www/js/app.js'
--- examples/api-bindings/content-peer-picker/www/js/app.js	1970-01-01 00:00:00 +0000
+++ examples/api-bindings/content-peer-picker/www/js/app.js	2014-03-18 13:59:59 +0000
@@ -0,0 +1,104 @@
+window.onload = function() {
+    var api = external.getUnityObject('1.0');
+    var hub = api.ContentHub;
+
+    var transferState = hub.ContentTransfer.State;
+    var pictureContentType = hub.ContentType.Pictures;
+
+    document.getElementById('pick').addEventListener('click', doContentPeerPicking);
+    function doContentPeerPicking() {
+	hub.launchContentPeerPicker(
+	    {
+		contentType: hub.ContentType.Pictures,
+		handler: hub.ContentHandler.Source,
+	    },
+	    function(peer) {
+		if ( ! peer) {
+		    nopeers();
+		    return;
+		}
+		addPeerElement(peer.appId(), peer.name());
+		doSimpleApiImport(peer);
+	    },
+	    function() {
+		aborted();
+	    });
+    };
+
+    function addPeerElement(appId, name) {
+        var selectedpeer = document.querySelector('#selected-peer');
+        var span = document.createElement('span');
+
+        var text = document.createTextNode('appId: ' + appId + ', name: ' + name)
+        span.appendChild(text);
+        selectedpeer.appendChild(span);
+    };
+
+    var results = [];
+    function addResult(item) {
+        results.push({name: item.name, url: item.url});
+        renderResults(results);
+    };
+
+    function displayImages(images) {
+        var res = document.getElementById('results');
+        for (var i = 0; i < images.length; ++i) {
+            var img = document.createElement('img');
+
+            img.setAttribute('src', images[i].url);
+            img.setAttribute('height', '100px');
+            img.setAttribute('width', '100px');
+
+            if (images[i].name && images[i].name.length !== 0)
+                img.setAttribute('alt', images[i].name);
+
+            res.appendChild(img);
+        }
+    };
+
+    function aborted() {
+        setResults('Transfer aborted');
+    };
+
+    function nopeers() {
+        setResults('No peers found');
+    };
+
+    function setResults(results) {
+        var resultEl = document.getElementById('results');
+        resultEl.innerHTML = results;
+    };
+
+    function formatResults(results) {
+        var content = '<ul>';
+        for (var i = 0; i < results.length; ++i) {
+            content += '<li>'
+            + results[i].name
+            + ', '
+            + results[i].url
+            + '</li>';
+        }
+        content += '</ul>';
+        return content;
+    };
+
+    function renderResults(results) {
+        setResults(formatResults(results));
+        displayImages(results);
+    };
+
+    function doSimpleApiImport(peer) {
+        hub.api.importContent(pictureContentType
+                      , peer
+                      , {scope: hub.ContentScope.App}
+                      , function(items) {
+                          for (var i = 0; i < items.length; ++i) {
+                              addResult(items[i]);
+                          }
+                      }
+                      , function() {
+                          aborted();
+                      });
+    };
+};
+
 
=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsBackendComponents.js'
--- src/Ubuntu/UnityWebApps/UnityWebAppsBackendComponents.js	2014-02-26 13:21:37 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebAppsBackendComponents.js	2014-03-18 13:59:59 +0000
@@ -201,6 +201,14 @@
         return {object: this._objects[id], id: id};
     },
 
+    parent: function() {
+        return this._parent;
+    },
+
+    parentView: function() {
+        return this._parent ? this._parent.bindee : null;
+    },
+
     isObjectProxyInfo: function(info) {
         return 'type' in info &&
             info.type === 'object-proxy' &&
@@ -1308,14 +1316,32 @@
     // TODO find a better way
     function _nameToContentType(name) {
         var contentTypePerName = {
+            "All": ContentHubBridge.ContentType.All,
+            "Unknown": ContentHubBridge.ContentType.Unknown,
             "Pictures": ContentHubBridge.ContentType.Pictures,
-            "Documents": ContentHubBridge.ContentType.Pictures,
-            "Music": ContentHubBridge.ContentType.Pictures,
+            "Documents": ContentHubBridge.ContentType.Documents,
+            "Music": ContentHubBridge.ContentType.Music,
+            "Contacts": ContentHubBridge.ContentType.Contacts,
         };
         return name in contentTypePerName ?
                     contentTypePerName[name]
                   : ContentHubBridge.ContentType.Unknown;
     };
+    function _contentTypeToName(state) {
+        if (state === ContentHubBridge.ContentType.All)
+            return "All";
+        else if (state === ContentHubBridge.ContentType.Unknown)
+            return "Unknown";
+        else if (state === ContentHubBridge.ContentType.Pictures)
+            return "Pictures";
+        else if (state === ContentHubBridge.ContentType.Documents)
+            return "Documents";
+        else if (state === ContentHubBridge.ContentType.Music)
+            return "Music";
+        else if (state === ContentHubBridge.ContentType.Contacts)
+            return "Contacts";
+        return "Unknown";
+    };
 
     function _nameToContentTransferSelection(name) {
         var contentTypePerName = {
@@ -1334,10 +1360,31 @@
         return "Single";
     };
 
+    function _nameToContentHandler(name) {
+        var contentHandlerPerName = {
+            "Source": ContentHubBridge.ContentHandler.Source,
+            "Destination": ContentHubBridge.ContentHandler.Destination,
+            "Share": ContentHubBridge.ContentHandler.Share,
+        };
+        return name in contentHandlerPerName ?
+                    contentHandlerPerName[name]
+                  : ContentHubBridge.ContentHandler.Source;
+    };
+    function _contentHandlerToName(state) {
+        if (state === ContentHubBridge.ContentHandler.Source)
+            return "Source";
+        else if (state === ContentHubBridge.ContentHandler.Destination)
+            return "Destination";
+        else if (state === ContentHubBridge.ContentHandler.Share)
+            return "Share";
+        return "Source";
+    };
+
     function _nameToContentTransferDirection(name) {
         var contentTypePerName = {
             "Import": ContentHubBridge.ContentTransfer.Import,
             "Export": ContentHubBridge.ContentTransfer.Export,
+            "Share": ContentHubBridge.ContentTransfer.Share,
         };
         return name in contentTypePerName ?
                     contentTypePerName[name]
@@ -1348,9 +1395,31 @@
             return "Import";
         else if (state === ContentHubBridge.ContentTransfer.Export)
             return "Export";
+        else if (state === ContentHubBridge.ContentTransfer.Share)
+            return "Share";
         return "Import";
     };
 
+    function _nameToContentScope(name) {
+        var contentScopePerName = {
+            "System": ContentHubBridge.ContentScope.System,
+            "User": ContentHubBridge.ContentScope.User,
+            "App": ContentHubBridge.ContentScope.App,
+        };
+        return name in contentScopePerName ?
+                    contentScopePerName[name]
+                  : ContentHubBridge.ContentScope.App;
+    };
+    function _contentScopeToName(state) {
+        if (state === ContentHubBridge.ContentScope.System)
+            return "System";
+        else if (state === ContentHubBridge.ContentScope.User)
+            return "User";
+        else if (state === ContentHubBridge.ContentScope.App)
+            return "App";
+        return "App";
+    };
+
     function _nameToContentTransferState(name) {
         var contentTransferStatePerName = {
             "Created": ContentHubBridge.ContentTransfer.Created,
@@ -1426,6 +1495,8 @@
                 content: {
                     store: self._object.store,
                     state: self._object.state,
+                    selectionType: self._object.selectionType,
+                    direction: self._object.direction,
                 }
             }
         },
@@ -1461,6 +1532,15 @@
             if (callback && typeof(callback) === 'function')
                 callback();
         },
+        onStateChanged: function(callback) {
+            if (!callback || typeof(callback) !== 'function')
+                return;
+            this._validate();
+            var self = this;
+            this._object.onStateChanged.connect(function() {
+                callback(_contentTransferStateToName(self._object.state));
+            });
+        },
 
         selectionType: function(callback) {
             this._validate();
@@ -1504,16 +1584,11 @@
                 item.object.name = items[i].name;
                 item.object.url = items[i].url;
 
-                console.debug('setItems: adding item ' + item.object.name.toString()
-                              + ', ' + item.object.url.toString());
-
                 contentItems.push(item.object);
             }
 
             this._object.items = contentItems;
 
-            console.debug('setItems: grand total of ' + this._object.items.length + ' added');
-
             if (callback && typeof(callback) === 'function')
                 callback();
         },
@@ -1593,12 +1668,24 @@
 
                 content: {
                     uri: self._object.uri,
+                    scope: _contentScopeToName(self._object.scope),
                 }
             }
         },
 
         // properties
 
+        scope: function(callback) {
+            this._validate();
+            callback(_contentScopeToName(this._object.scope));
+        },
+        setScope: function(scope, callback) {
+            this._validate();
+            this._object.scope = _nameToContentScope(scope);
+            if (callback && typeof(callback) === 'function')
+                callback();
+        },
+
         //immutable
         uri: function(callback) {
             this._validate();
@@ -1648,23 +1735,165 @@
                 content: {
                     appId: self._object.appId,
                     name: self._object.name,
+                    handler: self._object.handler,
+                    contentType: self._object.contentType,
+                    selectionType: self._object.selectionType,
+                    isDefaultPeer: self._object.isDefaultPeer,
                 },
             }
         },
 
         // properties
 
-        // immutable
         appId: function(callback) {
             this._validate();
             callback(this._object.appId);
         },
+        setAppId: function(appId, callback) {
+            this._validate();
+            this._object.appId = appId;
+            if (callback && typeof(callback) === 'function')
+                callback();
+        },
+
+        handler: function(callback) {
+            this._validate();
+            callback(_contentHandlerToName(this._object.handler));
+        },
+        setHandler: function(handler, callback) {
+            this._validate();
+            this._object.handler = _nameToContentHandler(handler);
+            if (callback && typeof(callback) === 'function')
+                callback();
+        },
+
+        contentType: function(callback) {
+            this._validate();
+            callback(_contentTypeToName(this._object.contentType));
+        },
+        setContentType: function(contentType, callback) {
+            this._validate();
+            this._object.contentType = _nameToContentType(contentType);
+            if (callback && typeof(callback) === 'function')
+                callback();
+        },
+
+        selectionType: function(callback) {
+            this._validate();
+            callback(_contentTransferSelectionToName(this._object.selectionType));
+        },
+        setSelectionType: function(selectionType, callback) {
+            this._validate();
+            this._object.selectionType = _nameToContentTransferSelection(selectionType);
+            if (callback && typeof(callback) === 'function')
+                callback();
+        },
 
         // immutable
         name: function(callback) {
             this._validate();
             callback(this._object.name);
         },
+
+        isDefaultPeer: function(callback) {
+            this._validate();
+            callback(this._object.isDefaultPeer);
+        },
+
+        // methods
+
+        request: function(callback) {
+            this._validate();
+            var transfer = new ContentTransfer(this._object.request());
+
+            if (callback && typeof(callback) === 'function')
+                callback(transfer.serialize());
+        },
+
+        requestForStore: function(store, callback) {
+            if ( ! store) {
+                callback(null);
+                return;
+            }
+
+            if (! backendDelegate.isObjectProxyInfo(store)) {
+                console.debug('requestForStore: invalid store object proxy')
+                callback("Invalid store");
+                return;
+            }
+
+            var _store = backendDelegate.objectFromId(store.objectid);
+            if ( ! _store) {
+                callback("Invalid store object (NULL)");
+                return;
+            }
+            this._validate();
+
+            var transfer = new ContentTransfer(this._object.request(_store));
+            if (callback && typeof(callback) === 'function')
+                callback(transfer.serialize());
+        },
+
+        // internal
+
+        internal: {
+            request: function(self) {
+                return self._object.request();
+            }
+        }
+    };
+
+    function ContentPeerModel(filterParams) {
+        var result = backendDelegate.createQmlObject(
+                    PLUGIN_URI, VERSION, 'ContentPeerModel', filterParams);
+        this._id = result.id;
+        this._object = result.object;
+
+        this._modelAdaptor = backendDelegate.createModelAdaptorFor(this._object);
+        this._roles = this._modelAdaptor.roles();
+    };
+    ContentPeerModel.prototype = {
+        _validate: function() {
+            if (! this._object)
+                throw new TypeError("Invalid object null");
+        },
+
+        destroy: function() {
+            if (! this._object)
+                return;
+            this._object.destroy();
+            this._modelAdaptor.destroy();
+            backendDelegate.deleteId(this._id);
+        },
+
+        // properties
+        setContentType: function(contentType, callback) {
+            this._validate();
+            this._object.contentType = contentType;
+            if (callback)
+                callback();
+        },
+
+        setHandler: function(handler, callback) {
+            this._validate();
+            this._object.handler = handler;
+            if (callback)
+                callback();
+        },
+
+        peers: function() {
+            this._validate();
+            return this._object.peers;
+        },
+
+        // QAbtractListModel prototype
+        count: function(callback) {
+            if (!this._modelAdaptor) {
+                callback(-1);
+                return;
+            }
+            callback(this._modelAdaptor.rowCount());
+        },
     };
 
     function _constructorFromName(className) {
@@ -1679,33 +1908,95 @@
     }
 
     return {
-        defaultSourceForType: function(type, callback) {
-            var _type = _nameToContentType(type);
-            var peer = _contenthub.defaultSourceForType(_type)
-            var source = new ContentPeer(peer);
-            callback(source.serialize());
+        getPeers: function(filters, callback) {
+            if ( ! filters){
+                callback(null);
+                return;
+            }
+
+            var statement = "import QtQuick 2.0; import Ubuntu.Content 0.1; ContentPeerModel {";
+            var filterParams = {};
+            if (filters.contentType) {
+                statement += " contentType: ContentType." + filters.contentType + ";";
+            }
+            if (filters.handler) {
+                statement += " handler: ContentHandler." + filters.handler + ";";
+            }
+            statement += " }";
+
+            var peerModel = Qt.createQmlObject(statement, backendDelegate.parent());
+            var onPeersFound = function() {
+                var peers = peerModel.peers;
+
+                var wrappedPeers = [];
+                for (var i = 0; i < peers.length; ++i) {
+                    var wrappedPeer = new ContentPeer(peers[i]);
+                    wrappedPeers.push(wrappedPeer.serialize());
+                }
+                peerModel.onFindPeersCompleted.disconnect(onPeersFound);
+                callback(wrappedPeers);
+            };
+            peerModel.onFindPeersCompleted.connect(onPeersFound);
         },
 
-        defaultStoreForType: function(type, callback) {
-            var store = new ContentStore(_contenthub.defaultStoreForType(_nameToContentType(type)));
+        getStore: function(scope, callback) {
+            if ( ! scope){
+                callback(null);
+                return;
+            }
+            var store = new ContentStore();
+            store.setScope(scope);
             callback(store.serialize());
         },
 
-        importContent: function(type, callback) {
-            var transfer = new ContentTransfer(_contenthub.importContent(_nameToContentType(type)));
-            callback(transfer.serialize());
-        },
-
-        knownSourcesForType: function(type, callback) {
-            var peers = _contenthub.knownSourcesForType(_nameToContentType(type));
-            var wrappedPeers = [];
-
-            for (var i = 0; i < peers.length; ++i) {
-                var wrappedPeer = new ContentPeer(peers[i]);
-                wrappedPeers.push(wrappedPeer.serialize());
-            }
-
-            callback(wrappedPeers);
+        launchContentPeerPicker: function(filters, onPeerSelected, onCancelPressed) {
+            if ( ! filters){
+                callback(null);
+                return;
+            }
+
+            var parentItem = backendDelegate.parentView();
+            if ( ! parentItem || ! parentItem.visible || ! parentItem.height || ! parentItem.width) {
+                console.debug("Cannot launch the content peer picker UI, invalid parent item: " + parentItem);
+                onCancelPressed();
+                return;
+            }
+
+            var statement = "import QtQuick 2.0; import Ubuntu.Content 0.1; ContentPeerPicker {";
+            var filterParams = {};
+            if (filters.contentType) {
+                statement += " contentType: ContentType." + filters.contentType + "";
+            }
+            if (filters.handler) {
+                statement += "; handler: ContentHandler." + filters.handler + "";
+            }
+            if (filters.showTitle) {
+                statement += "; showTitle: " + filters.showTitle === false ? "false" : "true";
+            }
+            statement += "; visible: true; }";
+
+            if (parentItem.parent)
+                parentItem.visible = false;
+            var contentPeerPicker = Qt.createQmlObject(statement,
+                                                       parentItem.parent ? parentItem.parent : parentItem);
+            function _onPeerSelected() {
+                var peer = new ContentPeer(contentPeerPicker.peer);
+                contentPeerPicker.visible = false;
+                parentItem.visible = true;
+                onPeerSelected(peer.serialize());
+                contentPeerPicker.onPeerSelected.disconnect(_onPeerSelected);
+                contentPeerPicker.destroy();
+            }
+            function _onCancelPressed() {
+                contentPeerPicker.visible = false;
+                parentItem.visible = true;
+                onCancelPressed();
+                contentPeerPicker.onPeerSelected.disconnect(_onCancelPressed);
+                contentPeerPicker.destroy();
+            }
+
+            contentPeerPicker.onPeerSelected.connect(_onPeerSelected);
+            contentPeerPicker.onCancelPressed.connect(_onCancelPressed);
         },
 
         apiImportContent: function(type, peer, transferOptions, onSuccess, onFailure) {
@@ -1714,59 +2005,44 @@
                 onError("Invalid peer");
                 return;
             }
+
             var _type = _nameToContentType(type);
             var _peer = backendDelegate.objectFromId(peer.objectid);
             if ( ! _peer) {
                 onError("Invalid peer object (NULL)");
                 return;
             }
+            var _transfer = null;
+            if (transferOptions.scope) {
+                var store = new ContentStore();
+                store.setScope(transferOptions.scope);
+                _transfer = _peer.request(store._object);
+            }
+            else {
+                _transfer = _peer.request();
+            }
 
-            var transfer = _contenthub.importContent(_type, _peer);
-            console.log('*** Transfer object: ' + transfer + '')
             if (transferOptions.multipleFiles) {
-                transfer.selectionType = ContentHubBridge.ContentTransfer.Multiple;
+                _transfer.selectionType = ContentHubBridge.ContentTransfer.Multiple;
             }
             else {
-                transfer.selectionType = ContentHubBridge.ContentTransfer.Single;
-            }
-
-            if (transferOptions.importToLocalStore) {
-                var store = _contenthub.defaultStoreForType(_type);
-                transfer.setStore(store);
-            }
-
-            var _transfer = new ContentTransfer(transfer)
-            transfer.stateChanged.connect(function() {
-                console.log('** Transfer state change: ' + transfer + ', state: ' + _contentTransferStateToName(transfer.state));
-                if (transfer.state === ContentHubBridge.ContentTransfer.Aborted) {
+                _transfer.selectionType = ContentHubBridge.ContentTransfer.Single;
+            }
+
+            var transfer = new ContentTransfer(_transfer)
+            _transfer.stateChanged.connect(function() {
+                if (_transfer.state === ContentHubBridge.ContentTransfer.Aborted) {
                     onFailure("Aborted");
                     return;
                 }
-                else if (transfer.state === ContentHubBridge.ContentTransfer.Charged) {
-                    console.log('*** Transfer complete: got: ' + transfer.items.length + ' items (' + transfer + ')')
-                    for (var i = 0; i < transfer.items.length; ++i) {
-                        console.log('** item ' + i + ' : ' + transfer.items[i].url);
-                    }
-
-                    var d = _transfer.internal.serializeItems(transfer);
+                else if (_transfer.state === ContentHubBridge.ContentTransfer.Charged) {
+                    var d = transfer.internal.serializeItems(_transfer);
                     onSuccess(d);
-                    transfer.finalize();
+                    _transfer.finalize();
                     return;
                 }
             });
-            transfer.start();
-        },
-
-        importContentForPeer: function(type, peerProxy, callback) {
-            if (! backendDelegate.isObjectProxyInfo(peerProxy)) {
-                console.debug('importContentForPeer: invalid peer object proxy')
-                callback();
-                return;
-            }
-            var peer = backendDelegate.objectFromId(peerProxy.objectid);
-            var transfer = new ContentTransfer(_contenthub.importContent(_nameToContentType(type), peer));
-
-            callback(transfer.serialize());
+            _transfer.start();
         },
 
         onExportRequested: function(callback) {
 
=== modified file 'src/Ubuntu/UnityWebApps/bindings/content-hub/client/content-hub.js'
--- src/Ubuntu/UnityWebApps/bindings/content-hub/client/content-hub.js	2014-03-04 20:40:16 +0000
+++ src/Ubuntu/UnityWebApps/bindings/content-hub/client/content-hub.js	2014-03-18 13:59:59 +0000
@@ -42,6 +42,10 @@
              ? content.store : null;
         this._state = content && content.state
              ? content.state : null;
+        this._selectionType = content && content.selectionType
+             ? content.selectionType : null;
+        this._direction = content && content.direction
+             ? content.direction : null;
     };
     ContentTransfer.prototype = {
         // object methods
@@ -77,7 +81,7 @@
          *
          * @method setStore
          * @param store {ContentStore}
-         * @param callback (optional) {Function()}
+         * @param callback (optional) {Function()} called when the store has been updated
          */
         setStore: function(store, callback) {
             this._proxy.call('setStore', [store.serialize(), callback]);
@@ -108,6 +112,15 @@
         setState: function(state, callback) {
             this._proxy.call('setState', [state, callback]);
         },
+        /**
+         * Notifies the listener when the state of the transfer changes.
+         *
+         * @method onStateChanged
+         * @param callback {Function(ContentTransfer.State)}
+         */
+        onStateChanged: function(callback) {
+            this._proxy.call('onStateChanged', [callback]);
+        },
 
         /**
          * Retrieves the current selection type.
@@ -116,7 +129,11 @@
          * @param callback {Function(ContentTransfer.SelectionType)}
          */
         selectionType: function(callback) {
-            this._proxy.call('selectionType', [], callback);
+            if (callback && typeof(callback) === 'function') {
+                this._proxy.call('selectionType', [], callback);
+                return;
+            }
+            return this._selectionType;
         },
         /**
          * Sets the selection type (single or multiple).
@@ -126,17 +143,24 @@
          * @param callback {Function()} called when the state has been updated
          */
         setSelectionType: function(selectionType, callback) {
+            this._selectionType = selectionType;
             this._proxy.call('setSelectionType', [selectionType, callback]);
         },
 
         /**
          * Retrieves the current transfer direction.
          *
+         * If the callback parameter is not set, the current "local" value is retrieved.
+         *
          * @method direction
-         * @param callback {Function(ContentTransfer.Direction)}
+         * @param callback (optional) {Function(ContentTransfer.Direction)}
          */
         direction: function(callback) {
-            this._proxy.call('direction', [], callback);
+            if (callback && typeof(callback) === 'function') {
+                this._proxy.call('direction', [], callback);
+                return;
+            }
+            return this._direction;
         },
         /**
          * Sets the transfer direction (import or export).
@@ -146,6 +170,7 @@
          * @param callback {Function()} called when the state has been updated
          */
         setDirection: function(direction, callback) {
+            this._direction = direction;
             this._proxy.call('setDirection', [direction, callback]);
         },
 
@@ -231,6 +256,13 @@
              ? content.appId : null;
         this._name = content && content.name
              ? content.name : null;
+        this._handler = content && content.handler
+             ? content.handler : null;
+        this._contentType = content && content.contentType
+             ? content.contentType : null;
+        this._selectionType = content && content.selectionType
+             ? content.selectionType : null;
+        this._isDefaultPeer = content && content.isDefaultPeer;
     };
     ContentPeer.prototype = {
         // object methods
@@ -246,14 +278,13 @@
 
         // properties
 
-        // immutable
-
         /**
          * Retrieves the app Id of the associated peer.
          *
          * If the callback parameter is not set, the current "local" value is retrieved.
          *
          * @method appId
+         * @return {String} Application Id for this peer
          * @param callback (optional) {Function(String)}
          */
         appId: function(callback) {
@@ -263,8 +294,97 @@
             }
             return this._appId;
         },
-
-        // immutable
+        /**
+         * Sets the app Id of the associated peer.
+         *
+         * @method setAppId
+         * @param appId {String}
+         * @param callback {Function()} called when the appId has been updated
+         */
+        setAppId: function(appId, callback) {
+            this._proxy.call('setAppId', [appId, callback]);
+        },
+
+        /**
+         * Retrieves the specific ContentHandler for this peer.
+         *
+         * If the callback parameter is not set, the current "local" value is retrieved.
+         *
+         * @method handler
+         * @return {String} ContentHandler for this peer
+         * @param callback (optional) {Function(String)}
+         */
+        handler: function(callback) {
+            if (callback && typeof(callback) === 'function') {
+                this._proxy.call('handler', [], callback);
+                return;
+            }
+            return this._handler;
+        },
+        /**
+         * Sets specific ContentHandler for this peer.
+         *
+         * @method setHandler
+         * @param handler {ContentHandler}
+         * @param callback {Function()} called when the appId has been updated
+         */
+        setHandler: function(handler, callback) {
+            this._proxy.call('setHandler', [handler, callback]);
+        },
+
+        /**
+         * Retrieves the specific ContentType for this peer.
+         *
+         * If the callback parameter is not set, the current "local" value is retrieved.
+         *
+         * @method contentType
+         * @return {String} ContentType for this peer
+         * @param callback (optional) {Function(String)}
+         */
+        contentType: function(callback) {
+            if (callback && typeof(callback) === 'function') {
+                this._proxy.call('contentType', [], callback);
+                return;
+            }
+            return this._contentType;
+        },
+        /**
+         * Sets specific ContentType for this peer.
+         *
+         * @method setContentType
+         * @param contentType {ContentType}
+         * @param callback {Function()} called when the content type has been updated
+         */
+        setContentType: function(contentType, callback) {
+            this._proxy.call('setContentType', [contentType, callback]);
+        },
+
+        /**
+         * Retrieves the specific SelectionType for this peer.
+         *
+         * If the callback parameter is not set, the current "local" value is retrieved.
+         *
+         * @method selectionType
+         * @return {String} ContentTransfer.SelectionType for this peer
+         * @param callback (optional) {Function(String)}
+         */
+        selectionType: function(callback) {
+            if (callback && typeof(callback) === 'function') {
+                this._proxy.call('selectionType', [], callback);
+                return;
+            }
+            return this._selectionType;
+        },
+        /**
+         * Sets specific SelectionType for this peer.
+         *
+         * @method setSelectionType
+         * @param selectionType {ContentTransfer.SelectionType}
+         * @param callback {Function()} called when the content type has been updated
+         */
+        setSelectionType: function(selectionType, callback) {
+            this._proxy.call('setSelectionType', [selectionType, callback]);
+        },
 
         /**
          * Retrieves the name of the associated peer.
@@ -282,6 +402,45 @@
             return this._name;
         },
 
+        /**
+         * Returns true if the peer is a default one, false otherwise.
+         *
+         * If the callback parameter is not set, the current "local" value is retrieved.
+         *
+         * @method isDefaultPeer
+         * @param callback (optional) {Function(Bool)}
+         */
+        isDefaultPeer: function(callback) {
+            if (callback && typeof(callback) === 'function') {
+                this._proxy.call('isDefaultPeer', [], callback);
+                return;
+            }
+            return this._isDefaultPeer;
+        },
+
+        // methods
+
+        /**
+         * Request to import data from this ContentPeer.
+         *
+         * @method request
+         * @param callback {Function(ContentTransfer)} Called with the resulting content transfer
+         */
+        request: function(callback) {
+            this._proxy.call('request', [], callback);
+        },
+
+        /**
+         * Request to import data from this ContentPeer and use a ContentStore for permanent storage.
+         *
+         * @method requestForStore
+         * @param store {ContentStore} Store used as a permanent storage
+         * @param callback {Function(ContentTransfer)} Called with the resulting content transfer
+         */
+        requestForStore: function(store, callback) {
+            this._proxy.call('requestForStore', [store.serialize()], callback);
+        },
+
         // extras
 
         /**
@@ -321,6 +480,8 @@
 
         this._uri = content && content.uri
              ? content.uri : null;
+        this._scope = content && content.scope
+             ? content.scope : null;
     };
     ContentStore.prototype = {
         // object methods
@@ -343,6 +504,7 @@
          * If the callback parameter is not set, the current "local" value is retrieved.
          *
          * @method uri
+         * @return {String} current uri
          * @param callback (optional) {Function(String)}
          */
         uri: function(callback) {
@@ -353,6 +515,33 @@
             return this._uri;
         },
 
+        /**
+         * Retrieves the current scope.
+         *
+         * If the callback parameter is not set, the current "local" value is retrieved.
+         *
+         * @method scope
+         * @return {ContentScope} current scope
+         * @param callback (optional) {Function(ContentScope)}
+         */
+        scope: function(callback) {
+            if (callback && typeof(callback) === 'function') {
+                this._proxy.call('scope', [], callback);
+                return;
+            }
+            return this._scope;
+        },
+        /**
+         * Sets the current scope.
+         *
+         * @method setScope
+         * @param scope {ContentScope}
+         * @param callback {Function()} called when the scope has been updated
+         */
+        setScope: function(scope, callback) {
+            this._proxy.call('setScope', [scope, callback]);
+        },
+
         // extras
 
         /**
@@ -394,7 +583,9 @@
              Documents
              
              Music
-          
+
+             Contacts
+
          @static
          @property ContentType {String}
          
@@ -406,9 +597,52 @@
           var pictureContentType = hub.ContentType.Pictures;
          */
         ContentType: {
+            All: "All",
+            Unknown: "Unknown",
             Pictures: "Pictures",
             Documents: "Documents",
-            Music: "Music"
+            Music: "Music",
+            Contacts: "Contacts",
+        },
+
+        /**
+          ContentHandler is an enumeration of well known content handlers.
+
+           Values:
+
+             Source
+
+             Destination
+
+             Share
+
+           @static
+           @property ContentHandler {String}
+         */
+        ContentHandler: {
+            Source: "Source",
+            Destination: "Destination",
+            Share: "Share",
+        },
+
+        /**
+          ContentScope is an enumeration of well known scope types.
+
+           Values:
+
+             System
+
+             User
+
+             App
+
+           @static
+           @property ContentScope {String}
+         */
+        ContentScope: {
+            System: "System",
+            User: "User",
+            App: "App",
         },
 
         ContentTransfer: {
@@ -527,67 +761,46 @@
         /**
          * Creates a ContentPeer object for the given source type.
          *
-         * @method defaultSourceForType
-         * @param type {ContentType} Content type.
-         * @param callback {Function (ContentPeer)} Function called with the created ContentPeer.
-         */
-        defaultSourceForType: function(type, callback) {
-            backendBridge.call('ContentHub.defaultSourceForType',
-                               [type],
-                               callback);
-        },
-
-        /**
-         * Creates a ContentStore object for the given content type.
-         *
-         * @method defaultStoreForType
-         * @param type {ContentType} Content type.
-         * @param callback {Function (ContentStore)} Function called with the created ContentStore.
-         */
-        defaultStoreForType: function(type, callback) {
-            backendBridge.call('ContentHub.defaultStoreForType',
-                               [type],
-                               callback);
-        },
-
-        /**
-         * Returns all possible peers for the given ContentType.
-         *
-         * @method knownSourcesForType
-         * @param type {ContentType} Content type.
-         * @param callback {Function (Array of ContentPeer)} Function called with the possible ContentPeers.
-         */
-        knownSourcesForType: function(type, callback) {
-            backendBridge.call('ContentHub.knownSourcesForType',
-                               [type],
-                               callback);
-        },
-
-        /**
-         * Creates a ContentTransfer object for the given content type.
-         *
-         * @method importContent
-         * @param type {ContentType} Content type.
-         * @param callback {Function(ContentTransfer)} Function called with the created ContentTransfer.
-         */
-        importContent: function(type, callback) {
-            backendBridge.call('ContentHub.importContent',
-                               [type],
-                               callback);
-        },
-
-        /**
-         * Creates a ContentTransfer object for the given ContentPeer.
-         *
-         * @method importContentForPeer
-         * @param type {ContentType} Content type.
-         * @param peer {ContentPeer} Content peer.
-         * @param callback {Function(ContentTransfer)} Function called with the created ContentTransfer.
-         */
-        importContentForPeer: function(type, peer, callback) {
-            backendBridge.call('ContentHub.importContentForPeer',
-                               [type, peer.serialize()],
-                               callback);
+         * @method getPeers
+         * @param filters {Object} A dictionary of parameters to filter the result. The filtering keys are:
+         * - contentType: desired ContentType
+         * - handler: desired ContentHandler
+         *
+         * @param callback {Function(List of ContentPeer objects)} Callback that receives the result or null
+         */
+        getPeers: function(filter, callback) {
+            backendBridge.call('ContentHub.getPeers',
+                               [filter],
+                               callback);
+        },
+
+        /**
+         * Creates a ContentStore object for the given scope type.
+         *
+         * @method getStore
+         * @param scope {ContentScope} The content scope for the store
+         * @param callback {Function(ContentStore)} Callback that receives the result or null
+         */
+        getStore: function(scope, callback) {
+            backendBridge.call('ContentHub.getStore',
+                               [scope],
+                               callback);
+        },
+
+        /**
+         * Launches the content peer picker ui that allows the user to select a peer.
+         *
+         * @method launchContentPeerPicker
+         * @param filters {Object} A dictionary of parameters to filter the result. The filtering keys are:
+         * - contentType: desired ContentType
+         * - handler: desired ContentHandler
+         * - showTitle: boolean value indicating if the title should be visible
+         * @param onPeerSelected {Function(ContentPeer)} Called when the user has selected a peer
+         * @param onCancelPressed {Function()} Called when the user has pressed cancel
+         */
+        launchContentPeerPicker: function(filters, onPeerSelected, onCancelPressed) {
+            backendBridge.call('ContentHub.launchContentPeerPicker',
+                               [filters, onPeerSelected, onCancelPressed]);
         },
 
         /**
@@ -631,7 +844,9 @@
              * @method api.importContent
              * @param type {ContentType} type of the content to import
              * @param peer {ContentPeer} peer whos content should be imported
-             * @param transferOptions {Object {multipleFiles: {Bool}, importToLocalStore: {Bool}} } the set of options for the transfer
+             * @param transferOptions {Object} a dictionary of transfer options. The options are the following:
+             * - multipleFiles {Bool}: specified if a transfer should involve multiple files or not
+             * - scope {ContentScope}: specifies the location where the transferred files should be copied to
              * @param onError {Function(reason:)} called when the transfer has failed
              * @param onSuccess {Function(Array of {ContentItem})} called when the transfer has been a success and items are available
              */