Merge lp:~ajalkane/ubuntu-filemanager-app/open-files-using-content-hub into lp:ubuntu-filemanager-app

[Arto Jalkanen]

Using Content-Hub to open clicked files. Contains hard-coded mappings between file-extensions and ContentHub's ContentTypes. In future, when ContentHub supports MIME types, this can be improved.

Using Content-Hub to open clicked files. Contains hard-coded mappings between file-extensions and ContentHub's ContentTypes. In future, when ContentHub supports MIME types, this can be improved.

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

PASSED: Continuous integration, rev:306
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/365/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1201
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1201/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/163

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

review: Approve (continuous-integration)

[Carlos Jose Mazieri (carlos-mazieri)]

Great, very good job.

Thanks.

review: Approve

[Carlos Jose Mazieri (carlos-mazieri)]

Great, very good job.

Thanks.

review: Approve

=== added directory 'src/app/qml/content-hub'
=== added file 'src/app/qml/content-hub/FileOpener.qml'
--- src/app/qml/content-hub/FileOpener.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/content-hub/FileOpener.qml	2014-10-22 22:05:43 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 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 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 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/>.
+ *
+ * Authored by: Arto Jalkanen <[e-mail]>
+ */
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+import Ubuntu.Content 0.1
+
+import "contenttyperesolver.js" as Resolver
+
+Page {
+    id: root
+    title: i18n.tr("Open with")
+
+    property var activeTransfer
+
+    property string fileUrl
+
+    Component.onCompleted: {
+        var contentType = Resolver.resolveContentType(fileUrl)
+        console.log("Resolved contenttype: " + contentType)
+        peerPicker.contentType = contentType
+    }
+
+    Component {
+        id: resultComponent
+        ContentItem {}
+    }
+
+    function __exportItems(url) {
+        if (root.activeTransfer.state === ContentTransfer.InProgress)
+        {
+            root.activeTransfer.items = [ resultComponent.createObject(root, {"url": url}) ];
+            root.activeTransfer.state = ContentTransfer.Charged;
+        }
+    }
+    ContentPeerPicker {
+        id: peerPicker
+        showTitle: false
+
+        // Type of handler: Source, Destination, or Share
+        handler: ContentHandler.Destination
+        contentType: ContentType.Pictures
+
+        onPeerSelected: {
+            root.activeTransfer = peer.request();
+            pageStack.pop();
+            if (root.activeTransfer.state === ContentTransfer.InProgress) {
+                root.__exportItems(root.fileUrl);
+            }
+        }
+
+        onCancelPressed: {
+            pageStack.pop();
+        }
+    }
+}

=== added file 'src/app/qml/content-hub/contenttyperesolver.js'
--- src/app/qml/content-hub/contenttyperesolver.js	1970-01-01 00:00:00 +0000
+++ src/app/qml/content-hub/contenttyperesolver.js	2014-10-22 22:05:43 +0000
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 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 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 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/>.
+ *
+ * Authored by: Arto Jalkanen <[e-mail]>
+ */
+.import Ubuntu.Content 0.1 as CH
+
+/**
+ * For now a simple static mapping of file extensions to ContentHub types.
+ * This is enough for RTM, but in the future a better strategy would be
+ * for asking for the MIME-type of the file and mapping that to the
+ * ContentType
+ */
+var __mapping = {
+    'png': CH.ContentType.Pictures,
+    'jpg': CH.ContentType.Pictures,
+    'jpeg': CH.ContentType.Pictures,
+    'bmp': CH.ContentType.Pictures,
+    'gif': CH.ContentType.Pictures,
+
+    'mp3': CH.ContentType.Music,
+    'ogg': CH.ContentType.Music,
+    'wav': CH.ContentType.Music,
+
+    'avi': CH.ContentType.Videos,
+    'mpeg': CH.ContentType.Videos,
+    'mp4': CH.ContentType.Videos,
+    'mkv': CH.ContentType.Videos,
+    'mov': CH.ContentType.Videos,
+    'wmv': CH.ContentType.Videos,
+
+    'txt': CH.ContentType.Documents,
+    'doc': CH.ContentType.Documents,
+    'docx': CH.ContentType.Documents,
+    'xls': CH.ContentType.Documents,
+    'xlsx': CH.ContentType.Documents,
+    'pdf': CH.ContentType.Documents,
+}
+
+function resolveContentType(fileUrl) {
+    console.log("resolveContentType for file", fileUrl)
+    var extension = __fileExtension(fileUrl)
+    extension = extension.toLowerCase()
+    console.log("file extension:", extension)
+    var contentType = __mapping[extension]
+
+    if (contentType === null) {
+        console.log("Unrecognized extension", extension)
+        contentTYpe = CH.ContentType.Unknown
+    }
+
+    console.log("returning contentType:", contentType)
+
+    return contentType
+}
+
+function __fileExtension(fileUrl) {
+    var lastDotIndex = fileUrl.lastIndexOf('.')
+    return lastDotIndex > -1 ? fileUrl.substring(lastDotIndex + 1) : ''
+}
+

=== modified file 'src/app/qml/filemanager.qml'
--- src/app/qml/filemanager.qml	2014-10-10 22:03:01 +0000
+++ src/app/qml/filemanager.qml	2014-10-22 22:05:43 +0000
@@ -136,6 +136,10 @@
         }
     }
 
+    function openFile(filePath) {
+        pageStack.push(Qt.resolvedUrl("content-hub/FileOpener.qml"), { fileUrl: "file://" + filePath} )
+    }
+
     Connections {
         target: ContentHub
         onExportRequested: {

=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2014-10-06 12:27:18 +0000
+++ src/app/qml/ui/FolderListPage.qml	2014-10-22 22:05:43 +0000
@@ -728,12 +728,6 @@
         }
     }
 
-    function openFile(filePath) {
-        if (!pageModel.openPath(filePath)) {
-            error(i18n.tr("File operation error"), i18n.tr("Unable to open '%1'").arg(filePath))
-        }
-    }
-
     function itemClicked(model) {
         if (model.isDir) {
             if (model.isReadable && model.isExecutable) {