Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/fix-1387651-1387023 into lp:ubuntu-docviewer-app/trunk

[Stefano Verzegnassi]

* Fixed a problem with AppArmor while trying to get mime type for a file with QProcess and /usr/bin/file. (lp:1387651)
* Added creation date property in file-qml-plugin (lp:1387023)
* Workaround for an issue in poppler-qml-plugin (PDF pages were loaded twice)
* Now 'architecture' field value in manifest.json.in is set by CMake while building the project.

Fixed a problem with AppArmor while trying to get mime type for a file with QProcess and /usr/bin/file. Now we use QMineType instead. (lp:1387651)

Added creation date property in file-qml-plugin, so that we don't have an empty field in Details page (lp:1387023)

Workaround for an issue in poppler-qml-plugin (PDF pages were loaded twice)

Now 'architecture' field value in manifest.json.in is set by CMake while building the project (I used 3 revisions to do that, because QtCreator/Ubuntu-SDK decided to overwrite the file with its own values)

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

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

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

review: Approve (continuous-integration)

[David Planella (dpm)]

Works as expected, thanks!

review: Approve

=== modified file 'manifest.json.in'
--- manifest.json.in	2014-09-24 05:06:10 +0000
+++ manifest.json.in	2014-10-31 16:43:26 +0000
@@ -1,7 +1,7 @@
 {
     "description": "Document Viewer application for Ubuntu devices",
     "framework": "ubuntu-sdk-14.10-qml-dev3",
-    "architecture": "all",
+    "architecture": "@CLICK_ARCH@",
     "hooks": {
         "docviewer": {
             "apparmor": "docviewer.apparmor",

=== modified file 'src/app/qml/PdfView.qml'
--- src/app/qml/PdfView.qml	2014-10-28 22:10:16 +0000
+++ src/app/qml/PdfView.qml	2014-10-31 16:43:26 +0000
@@ -16,10 +16,10 @@
         id: pdfView
         anchors {
             fill: parent
-            leftMargin: units.gu(2)
-            rightMargin: units.gu(2)
+            leftMargin: units.gu(1)
+            rightMargin: units.gu(1)
         }
-        spacing: units.gu(4)
+        spacing: units.gu(2)
 
         clip: true
         focus: false
@@ -43,7 +43,15 @@
 
         model: Poppler {
             id: poppler
-            path: file.path
+
+            /* 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.
+               (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). */
+            Component.onCompleted: path = file.path
 
             onPagesLoaded: {
                 activity.running = false;

=== modified file 'src/app/qml/loadComponent.js'
--- src/app/qml/loadComponent.js	2014-10-20 20:31:41 +0000
+++ src/app/qml/loadComponent.js	2014-10-31 16:43:26 +0000
@@ -1,14 +1,4 @@
-function getSimpleMimetype(longMimetype)
-{
-    var str = longMimetype;
-    str = str.substring(0, str.indexOf(";"));
-    return str;
-}
-
 function load(mimetype) {
-    if (mimetype.indexOf(";") !== -1)
-        mimetype = getSimpleMimetype(mimetype);
-
     var qmlToLoad = "";
 
     // Open all text files in text editor

=== modified file 'src/app/qml/ubuntu-docviewer-app.qml'
--- src/app/qml/ubuntu-docviewer-app.qml	2014-10-28 22:01:16 +0000
+++ src/app/qml/ubuntu-docviewer-app.qml	2014-10-31 16:43:26 +0000
@@ -1,7 +1,6 @@
 import QtQuick 2.3
 import Ubuntu.Components 1.1
 import Ubuntu.Components.Popups 1.0
-import Ubuntu.Components.ListItems 1.0 as ListItem
 import com.ubuntu.fileqmlplugin 1.0
 
 import "loadComponent.js" as LoadComponent

=== modified file 'src/plugin/file-qml-plugin/docviewerFile.cpp'
--- src/plugin/file-qml-plugin/docviewerFile.cpp	2014-10-20 18:45:09 +0000
+++ src/plugin/file-qml-plugin/docviewerFile.cpp	2014-10-31 16:43:26 +0000
@@ -1,8 +1,8 @@
-#include <QProcess>
 #include <QObject>
 #include <QDebug>
 #include <QFileInfo>
 #include <QDir>
+#include <QMimeDatabase>
 
 #include "docviewerFile.h"
 
@@ -50,6 +50,8 @@
         this->path = QFileInfo(QDir::currentPath(), p).absoluteFilePath();
     }
 
+    qDebug() << "[FILE] Path parsed as:" << this->path;
+
     this->open();
 
     emit pathChanged();
@@ -61,6 +63,7 @@
         QFileInfo file(path);
 
         if (file.exists()) {
+            qDebug() << "[FILE] Extracting informations from the file...";
 
             /**Get info of the file**/
             size = file.size();
@@ -69,38 +72,30 @@
             lastmodified = file.lastModified();
             emit lastmodifiedChanged();
 
+            creationTime = file.created();
+            emit creationTimeChanged();
+
             /**Get mimetype**/
-            QStringList mimeTypeCommand;
-            mimeTypeCommand << "-ib" << path;
-
-            mimeTypeProcess = new QProcess();
-
-            this->connect(mimeTypeProcess, SIGNAL(readyReadStandardOutput()), SLOT(s_readMimeType()));
-            this->connect(mimeTypeProcess, SIGNAL(finished(int)), SLOT(s_finished(int)));
-
-            mimeTypeProcess->start("file", mimeTypeCommand);
-
+            this->readMimeType();
         }
         else {
+            qDebug() << "[FILE] ERROR: Requested file does not exist!";
             error = -1;
             emit errorChanged();
         }
     }
-
-
-}
-
-/****SLOT****/
-
-void DocviewerFile::s_readMimeType()
-{
-    mimetype = mimeTypeProcess->readAllStandardOutput();
-    mimetype = mimetype.left(mimetype.size()-1);
-}
-
-void DocviewerFile::s_finished(int exitCode)
-{
-    if (exitCode != 0)
+}
+
+void DocviewerFile::readMimeType()
+{
+    QMimeDatabase db;
+    mimetype = db.mimeTypeForFile(this->path).name();
+
+    if (mimetype == "application/octet-stream") {
+        // Returned by Qt when it cannot determinate the mime type
         mimetype = "Unknown";
+    }
+
+    qDebug() << "[FILE] Mime type for the requested file is" << mimetype;
     emit mimetypeChanged();
 }

=== modified file 'src/plugin/file-qml-plugin/docviewerFile.h'
--- src/plugin/file-qml-plugin/docviewerFile.h	2014-09-26 11:47:46 +0000
+++ src/plugin/file-qml-plugin/docviewerFile.h	2014-10-31 16:43:26 +0000
@@ -13,6 +13,7 @@
     Q_PROPERTY( QString mimetype READ getMimetype NOTIFY mimetypeChanged )
     Q_PROPERTY( qint64 size READ getSize NOTIFY sizeChanged )
     Q_PROPERTY( QDateTime lastModified READ getLastmodified NOTIFY lastmodifiedChanged )
+    Q_PROPERTY( QDateTime creationTime READ getCreationTime NOTIFY creationTimeChanged )
     Q_PROPERTY( int error READ getError NOTIFY errorChanged )
     
 public:
@@ -29,27 +30,27 @@
 
     QDateTime getLastmodified() { return lastmodified; }
 
+    QDateTime getCreationTime() { return creationTime; }
+
     int getError() { return error; }
     
     QString path;
     QString mimetype;
     qint64 size;
     QDateTime lastmodified;
+    QDateTime creationTime;
     int error;
 
 private:
     void open();
-    QProcess *mimeTypeProcess;
-
-public slots:
-    void s_readMimeType();
-    void s_finished(int exitCode);
+    void readMimeType();
 
 Q_SIGNALS:
     void pathChanged();
     void mimetypeChanged();
     void sizeChanged();
     void lastmodifiedChanged();
+    void creationTimeChanged();
     void errorChanged();
 };
 

=== modified file 'src/plugin/poppler-qml-plugin/pdfModel.cpp'
--- src/plugin/poppler-qml-plugin/pdfModel.cpp	2014-10-20 21:38:36 +0000
+++ src/plugin/poppler-qml-plugin/pdfModel.cpp	2014-10-31 16:43:26 +0000
@@ -30,7 +30,7 @@
 PdfModel::PdfModel(QAbstractListModel *parent):
     QAbstractListModel(parent)
 {
-    int metatype_id = qRegisterMetaType<PdfPagesList>("PdfPagesList");
+    qRegisterMetaType<PdfPagesList>("PdfPagesList");
 }
 
 QHash<int, QByteArray> PdfModel::roleNames() const
@@ -65,8 +65,7 @@
 
 void PdfModel::setPath(QString &pathName)
 {
-    if (pathName.isEmpty())
-    {
+    if (pathName.isEmpty()) {
         return;
     }