Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/content-hub-support into lp:ubuntu-docviewer-app/trunk

[Stefano Verzegnassi]

Added ContentHub support

Now we support ContentHub to load documents through other apps.
There are two ways to load a document on the device:
1) From the Application scope: a "welcome" page is shown and user can choose a peer from the list.
2) From an external app: e.g. ubuntu-filemanager-app. docviewer-app will appear in the list of apps that can import that type of content.

KNOWN ISSUES:
* On a device, 'Creation Date' always refers to the moment we import some content from the ContentHub. This is because ContentHub creates a new copy of the file in "$HOME/.cache".

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:41
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/91/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1421/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/63/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/91/rebuild

review: Needs Fixing (continuous-integration)

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/content-hub-support]

42. By Stefano Verzegnassi on 2014-11-01

Fixed autopilot error: 'Too many blank lines'

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:42
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/94/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1423
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1423/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/64

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/94/rebuild

review: Approve (continuous-integration)

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/content-hub-support]

43. By Stefano Verzegnassi on 2014-11-03

Added header backAction in imageView and textView

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:43
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/97/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1433
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1433/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/67

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/97/rebuild

review: Needs Fixing (continuous-integration)

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/content-hub-support]

44. By Stefano Verzegnassi on 2014-11-03

It's called head.backAction...

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:44
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/98/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1435
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1435/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/68

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/98/rebuild

review: Approve (continuous-integration)

[lp:~verzegnassi-stefano/ubuntu-docviewer-app/content-hub-support]

45. By Stefano Verzegnassi on 2014-11-04

Fixed issue with ContentPeerPicker (binding loop for visible property while importing a file from an external source)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:45
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/99/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1447
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1447/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-utopic-amd64-ci/69

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-ci/99/rebuild

review: Approve (continuous-integration)

[Arthur Mello (artmello)]

Code looks good to me.
I tested the branch opening PDF files from the Browser and the GMail web app and it worked as expected.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-21 13:23:11 +0000
+++ CMakeLists.txt	2014-11-04 18:55:53 +0000
@@ -54,11 +54,11 @@
     set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
     set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
     set(DATA_DIR /)
-    set (ICON ${ICON_FILE})
+    set(ICON ${ICON_FILE})
     set(DESKTOP_DIR ${DATA_DIR})
     set(URLS_DIR ${DATA_DIR})
     configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json docviewer.apparmor
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json docviewer.apparmor docviewer-content.json
             DESTINATION ${CMAKE_INSTALL_PREFIX})
     # Make the click files visible in Qt Creator
     file(GLOB CLICK_FILES

=== added file 'docviewer-content.json'
--- docviewer-content.json	1970-01-01 00:00:00 +0000
+++ docviewer-content.json	2014-11-04 18:55:53 +0000
@@ -0,0 +1,7 @@
+{
+    "destination": [
+        "pictures",
+        "documents",
+        "unknown"
+    ]
+}

=== modified file 'docviewer.apparmor'
--- docviewer.apparmor	2014-09-24 04:46:27 +0000
+++ docviewer.apparmor	2014-11-04 18:55:53 +0000
@@ -1,4 +1,6 @@
 {
-    "policy_groups": [],
+    "policy_groups": [
+        "content_exchange"
+    ],
     "policy_version": 1.2
-}
\ No newline at end of file
+}

=== modified file 'manifest.json.in'
--- manifest.json.in	2014-11-04 18:55:53 +0000
+++ manifest.json.in	2014-11-04 18:55:53 +0000
@@ -1,14 +1,15 @@
 {
     "description": "Document Viewer application for Ubuntu devices",
     "framework": "ubuntu-sdk-14.10-qml-dev3",
-    "architecture": "all",
+    "architecture": "@CLICK_ARCH@",
     "hooks": {
         "docviewer": {
             "apparmor": "docviewer.apparmor",
-            "desktop": "com.ubuntu.docviewer.desktop"
+            "desktop": "com.ubuntu.docviewer.desktop",
+	    "content-hub": "docviewer-content.json"
         }
     },
-    "maintainer": "Stefano Verzegnassi <[e-mail]>",
+    "maintainer": "Ubuntu App Cats <[e-mail]>",
     "name": "com.ubuntu.docviewer",
     "title": "Document viewer",
     "version": "0.1.@BZR_REVNO@"

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2014-10-08 05:09:22 +0000
+++ src/app/main.cpp	2014-11-04 18:55:53 +0000
@@ -122,6 +122,9 @@
         cacheDir.mkpath(cacheDir.absolutePath());
     }
 
+    // Expose quit() signal to QML
+    QObject::connect(view.engine(), SIGNAL(quit()), &a, SLOT(quit()));
+
     qDebug() << "using main qml file from:" << qmlfile;
     view.setSource(QUrl::fromLocalFile(qmlfile));
     view.show();

=== added file 'src/app/qml/ContentHubProxy.qml'
--- src/app/qml/ContentHubProxy.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/ContentHubProxy.qml	2014-11-04 18:55:53 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2012-2014 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Content 1.1 as ContentHub
+
+QtObject {
+    property QtObject pageStack: null
+    property list<QtObject> objects: [
+        Connections {
+            target: ContentHub.ContentHub
+
+            onImportRequested: {
+                if (transfer.state === ContentHub.ContentTransfer.Charged) {
+                    // We have no signals to know if an import was requested before Component.completed signal
+                    //  is emitted. So clear the stack when this occurs.
+                    pageStack.clear()
+
+                    console.log("[CONTENT-HUB] Incoming Import Request")
+                    file.path = transfer.items[0].url.toString().replace("file://", "");
+                }
+            }
+        }
+    ]
+}

=== modified file 'src/app/qml/DetailsPage.qml'
--- src/app/qml/DetailsPage.qml	2014-10-28 22:41:46 +0000
+++ src/app/qml/DetailsPage.qml	2014-11-04 18:55:53 +0000
@@ -6,6 +6,8 @@
 
 Page {
     id: detailsPage
+    objectName: "detailsPage"
+
     title: i18n.tr("Details")
 
     Column {
@@ -22,7 +24,6 @@
 
         ListItem.Subtitled {
             text: i18n.tr("Created")
-            // FIXME: the creationTime property is not yet available
             subText: file.creationTime.toLocaleString(Qt.locale())
         }
 
@@ -35,7 +36,7 @@
             id: mimetypeItem
             objectName: "mimetypeItem"
             text: i18n.tr("MIME type")
-            subText: mainView.mimetype
+            subText: file.mimetype
         }
     }
 }

=== added file 'src/app/qml/ErrorDialog.qml'
--- src/app/qml/ErrorDialog.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/ErrorDialog.qml	2014-11-04 18:55:53 +0000
@@ -0,0 +1,16 @@
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.Popups 1.0
+
+Dialog {
+    id: errorDialogue
+    title: i18n.tr("Error")
+    text: i18n.tr("File does not exist")
+
+    Button {
+        text: i18n.tr("Close")
+        color: "red"
+
+        onClicked: Qt.quit();
+    }
+}

=== modified file 'src/app/qml/ImageView.qml'
--- src/app/qml/ImageView.qml	2014-10-20 20:31:41 +0000
+++ src/app/qml/ImageView.qml	2014-11-04 18:55:53 +0000
@@ -7,8 +7,24 @@
     id: pageMain
     title: Utils.getNameOfFile(file.path);
 
+    head.backAction: Action {
+        iconName: "back"
+        text: (pageStack.depth > 1) ? i18n.tr("Back") : i18n.tr("Close")
+        onTriggered: {
+            if (pageStack.depth > 1) {
+                // Go back to Welcome page
+                pageStack.pop();
+            } else {
+                // File has been imported through Content Hub (or was not chosen through WelcomePage)
+                // Close the application and show our source app (e.g. ubuntu-filemanager-app if used to open a document)
+                Qt.quit()
+            }
+        }
+    }
+
     head.actions: [
         Action {
+            objectName: "detailsAction"
             text: i18n.tr("Details")
             iconName: "info"
             onTriggered: pageStack.push(Qt.resolvedUrl("DetailsPage.qml"))

=== modified file 'src/app/qml/PdfView.qml'
--- src/app/qml/PdfView.qml	2014-11-04 18:55:53 +0000
+++ src/app/qml/PdfView.qml	2014-11-04 18:55:53 +0000
@@ -47,7 +47,7 @@
             /* FIXME: Don't set 'path' property directly, but set it through onCompleted signal.
                By doing otherwise, PDF pages are loaded two times, but only
                the first delegates are working. Asking to the image provider
-               to get the second ones makes the app instable.
+               to get the second ones, makes the app instable.
                (e.g. We have a PDF document with 10 pages. The plugin loads
                them twice - 2x10 = 20 pages - but only the first 10 are shown.
                While trying to get the 11th, the app crashes). */
@@ -126,6 +126,17 @@
 
             backAction: Action {
                 iconName: "back"
+                text: (pageStack.depth > 1) ? i18n.tr("Back") : i18n.tr("Close")
+                onTriggered: {
+                    if (pageStack.depth > 1) {
+                        // Go back to Welcome page
+                        pageStack.pop();
+                    } else {
+                        // File has been imported through Content Hub (or was not chosen through WelcomePage)
+                        // Close the application and show our source app (e.g. ubuntu-filemanager-app if used to open a document)
+                        Qt.quit()
+                    }
+                }
             }
 
             actions: [
@@ -143,6 +154,7 @@
                 },
 
                 Action {
+                    objectName: "detailsAction"
                     text: i18n.tr("Details")
                     iconName: "info"
                     onTriggered: pageStack.push(Qt.resolvedUrl("DetailsPage.qml"))

=== modified file 'src/app/qml/TextView.qml'
--- src/app/qml/TextView.qml	2014-10-21 15:15:11 +0000
+++ src/app/qml/TextView.qml	2014-11-04 18:55:53 +0000
@@ -8,8 +8,24 @@
     id: pageMain
     title: Utils.getNameOfFile(file.path);
 
+    head.backAction: Action {
+        iconName: "back"
+        text: (pageStack.depth > 1) ? i18n.tr("Back") : i18n.tr("Close")
+        onTriggered: {
+            if (pageStack.depth > 1) {
+                // Go back to Welcome page
+                pageStack.pop();
+            } else {
+                // File has been imported through Content Hub (or was not chosen through WelcomePage)
+                // Close the application and show our source app (e.g. ubuntu-filemanager-app if used to open a document)
+                Qt.quit()
+            }
+        }
+    }
+
     head.actions: [
         Action {
+            objectName: "detailsAction"
             text: i18n.tr("Details")
             iconName: "info"
             onTriggered: pageStack.push(Qt.resolvedUrl("DetailsPage.qml"))

=== added file 'src/app/qml/WelcomePage.qml'
--- src/app/qml/WelcomePage.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/WelcomePage.qml	2014-11-04 18:55:53 +0000
@@ -0,0 +1,51 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import Ubuntu.Content 1.1
+
+Page {
+    id: picker
+
+    property var activeTransfer
+
+    ContentTransferHint {
+        id: transferHint
+        anchors.fill: parent
+        activeTransfer: picker.activeTransfer
+    }
+
+    title: i18n.tr("Open with...")
+    head.sections.model: [i18n.tr("Pictures"), i18n.tr("Documents"), i18n.tr("Unknown")]
+    head.backAction: Action {
+        iconName: "close"
+        text: i18n.tr("Close")
+        onTriggered: Qt.quit()
+    }
+
+    ContentPeerPicker {
+        showTitle: false
+
+        contentType: {
+            switch (picker.head.sections.selectedIndex) {
+            case 0:
+                return ContentType.Pictures
+            case 1:
+                return ContentType.Documents
+            case 2:
+                return ContentType.Unknown
+            }
+        }
+        handler: ContentHandler.Source
+
+        onPeerSelected: picker.activeTransfer = peer.request();
+    }
+
+    Connections {
+        target: picker.activeTransfer ? picker.activeTransfer : null
+        onStateChanged: {
+            if (picker.activeTransfer.state === ContentTransfer.Charged) {
+                file.path = picker.activeTransfer.items[0].url.toString().replace("file://", "")
+                console.log("[CONTENT-HUB] Content imported!")
+            }
+        }
+    }
+}

=== modified file 'src/app/qml/ubuntu-docviewer-app.qml'
--- src/app/qml/ubuntu-docviewer-app.qml	2014-11-04 18:55:53 +0000
+++ src/app/qml/ubuntu-docviewer-app.qml	2014-11-04 18:55:53 +0000
@@ -15,11 +15,11 @@
     width: units.gu(50)
     height: units.gu(75)
 
-    property string mimetype: "none"
-
-   Arguments {
+    Arguments {
         id: args
 
+        // It returns "expected argument" message when not specified a path.
+        // It works anyway, but it may be worth to use Argument{} in future
         defaultArgument.help: "Path of the document"
         defaultArgument.valueNames: ["path"]
     }
@@ -27,29 +27,42 @@
     File {
         objectName: "fileObject"
         id: file
-        path: args.defaultArgument.at(0)
-
-        onMimetypeChanged: mainView.mimetype = LoadComponent.load(file.mimetype);
-    }
-
-    PageStack {
-        id: pageStack
-
-        Component {
-            DetailsPage {
-                objectName: "TabDetails"
-                id: tabDetails;
+
+        onMimetypeChanged: LoadComponent.load(mimetype)
+        onErrorChanged: { if (error == -1); PopupUtils.open(errorDialog) }
+    }
+
+    Component.onCompleted: {
+        // Check if a value has been specified for "path" argument
+        if (args.defaultArgument.at(0)) {
+            // If so, send the path to the File plugin
+            console.log("Path argument is:", args.defaultArgument.at(0))      
+            file.path = args.defaultArgument.at(0)
+        } else {
+            // Otherwise, push a welcome screen in the stack
+            pageStack.push(Qt.resolvedUrl("WelcomePage.qml"))
+        }
+    }
+
+    // Content Importer
+    Loader {
+        id: contentHubLoader
+
+        asynchronous: true
+        source: Qt.resolvedUrl("ContentHubProxy.qml")
+        onStatusChanged: {
+            if (status === Loader.Ready) {
+                item.pageStack = pageStack
             }
         }
     }
 
-    Component {
-        id: unknownTypeDialog
-        UnknownTypeDialog {}
-    }
-
-    function runUnknownTypeDialog()
-    {
+    function runUnknownTypeDialog() {
         PopupUtils.open(unknownTypeDialog);
     }
+
+    PageStack { id: pageStack }
+
+    Component { id: errorDialog; ErrorDialog {} }
+    Component { id: unknownTypeDialog; UnknownTypeDialog {} }
 }

=== modified file 'tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py'
--- tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py	2014-10-28 22:01:16 +0000
+++ tests/autopilot/ubuntu_docviewer_app/tests/test_docviewer.py	2014-11-04 18:55:53 +0000
@@ -74,10 +74,15 @@
         self.check_mimeType()
 
     def check_mimeType(self):
+        # Click "Details" action in the header
+        header = self.main_view.get_header()
+        header.click_action_button('detailsAction')
+
+        mimetypeItem = self.main_view.select_single(
+            "Subtitled", objectName="mimetypeItem")
+
         self.assertThat(
-            self.app.select_single("MainView",
-                                   objectName="docviewer").mimetype,
-            Eventually(NotEquals(False)))
+            mimetypeItem.subText, Eventually(NotEquals(False)))
 
     def test_unknown_file_type(self):
         filePath = 'ubuntu_docviewer_app/files/unknown.type'