Merge lp:~abreu-alexandre/unity-webapps-qml/fail-safe-content-hub-bindings into lp:unity-webapps-qml

[Alexandre Abreu]

Make sure that the content hub bindings are fail safe since the content hub package is a suggests (which is fine since it is not there by default on desktop).

Make sure that the content hub bindings are fail safe since the content hub package is a suggests (which is fine since it is not there by default on desktop).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:138
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/151/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-armhf-ci/5

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

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

I don't think that you need to import the QtQuick 2.0 module.
Also, I'm not sure if the exception will always be thrown, or if it's possible for Qt.createQmlObject() to return null without raising the exception; if so, you should check for its return value != null as well.

But I'm not sure of either points, so if you have already tested this and this is the correct solution, +1 from me.

review: Approve

[Alexandre Abreu (abreu-alexandre)]

> I don't think that you need to import the QtQuick 2.0 module.

I didn't initially, but it seems to be required to known about QtObject,

> Also, I'm not sure if the exception will always be thrown, or if it's possible
> for Qt.createQmlObject() to return null without raising the exception; if so,
> you should check for its return value != null as well.

+1

> But I'm not sure of either points, so if you have already tested this and this
> is the correct solution, +1 from me.

[Alexandre Abreu (abreu-alexandre)]

> I don't think that you need to import the QtQuick 2.0 module.

I didn't initially, but it seems to be required to known about QtObject,

> Also, I'm not sure if the exception will always be thrown, or if it's possible
> for Qt.createQmlObject() to return null without raising the exception; if so,
> you should check for its return value != null as well.

+1

> But I'm not sure of either points, so if you have already tested this and this
> is the correct solution, +1 from me.

[lp:~abreu-alexandre/unity-webapps-qml/fail-safe-content-hub-bindings]

139. By Alexandre Abreu on 2014-11-26

updates

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:139
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/152/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-vivid-armhf-ci/6

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

review: Approve (continuous-integration)

[lp:~abreu-alexandre/unity-webapps-qml/fail-safe-content-hub-bindings]

140. By Alexandre Abreu on 2014-12-01

revert change

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-11-21 21:12:26 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-12-01 15:44:28 +0000
@@ -784,7 +784,8 @@
                 return AlarmApiBackend.createAlarmApi(UnityBackends.backendDelegate)
             }),
 
-            ContentHub: ContentHubApiBackend.createContentHubApi(UnityBackends.backendDelegate),
+            ContentHub: ContentHubApiBackend.createContentHubApi(
+                            UnityBackends.backendDelegate, webapps),
 
             RuntimeApi:  __injectResourceIfExtraApisAreEnabled(function() {
                 return RuntimeApiBackend.createRuntimeApi(UnityBackends.backendDelegate)

=== modified file 'src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js'
--- src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js	2014-06-17 13:53:49 +0000
+++ src/Ubuntu/UnityWebApps/bindings/content-hub/backend/content-hub.js	2014-12-01 15:44:28 +0000
@@ -16,15 +16,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-.import Ubuntu.Content 0.1 as ContentHubBridge
-
 /**
  *
  * ContentHub API backend binding
  *
  */
 
-function createContentHubApi(backendDelegate, accessPolicy) {
+function createContentHubApi(backendDelegate, parent) {
+
+    var bridge = null
+    try {
+        bridge = Qt.createQmlObject(
+            'import QtQuick 2.0; import Ubuntu.Content 0.1 as ContentHubBridge; \
+            QtObject { property var hub: ContentHubBridge }', parent)
+    }
+    catch(e) { }
+
+    if (!bridge) {
+        console.log('Could not create ContentHub backend (does not appear to be installed)')
+        return {};
+    }
+
+    var ContentHubBridge = bridge.hub;
+
     var PLUGIN_URI = 'Ubuntu.Content';
     var VERSION = 0.1;