Merge lp:~mzanetti/reminders-app/shoot into lp:reminders-app

[Michael Zanetti]

Add feature to take a picture with the camera and attach it to the note.

Note: This changes the main.cpp to be mandatory. The CameraHelper class really doesn't belong to the evernote plugin and with the current Ubuntu SDK it's impossible to use the QML Camera element with QML only.

Because of this I added the CameraHelper to the main.cpp which in turn requires us to use the built reminders binary to launch instead of qmlscene.

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

PASSED: Continuous integration, rev:33
http://91.189.93.70:8080/job/reminders-app-ci/75/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/793
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/75
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/75

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/75/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

The branch worked nicely, but I noticed a couple of things:

1) The camera pictures on the device (Nexus 4) are offset 90 degrees counterclockwise
2) It uses the default save location of the Camera component (e.g. /home/phablet/Pictures/image20140127_0001.jpg), which would require extra apparmor permissions and a change to the manifest. It might be ok, but we should discuss whether we want the Reminders shots stored or not.

I'm not sure it's related to this change, but I've noticed the same thing I did when I tested a previous branch:

- After creating a note and taking a shot, once saved and back on the notes list, the "add note" button in the toolbar apparently no longer works. However, it does work: but it takes about 30 seconds to react. I saw this in the debug output, but I'm not sure it's related:

Got a transport exception: Could not refill buffer . Trying to reestablish connection...
Thrift: Mon Jan 27 09:08:53 2014 SSL_shutdown: error code: 0

I'll try to reproduce and file a bug properly. I just wanted to note that with the recent branches (from Content Hub onwards) have brought up this issue.

review: Needs Fixing

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

FAILED: Continuous integration, rev:34
http://91.189.93.70:8080/job/reminders-app-ci/81/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/820/console
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/81
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/81

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/81/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/reminders-app/shoot]

38. By Michael Zanetti on 2014-01-27

debug--

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

PASSED: Continuous integration, rev:38
http://91.189.93.70:8080/job/reminders-app-ci/82/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/828
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/82
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/82

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/82/rebuild

review: Approve (continuous-integration)

[lp:~mzanetti/reminders-app/shoot]

39. By Michael Zanetti on 2014-01-28

return something in CameraHelper::save()

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

PASSED: Continuous integration, rev:39
http://91.189.93.70:8080/job/reminders-app-ci/85/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/843
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/85
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/85

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/85/rebuild

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Works well, I can add take without problems

> 1) The camera pictures on the device (Nexus 4) are offset 90 degrees counterclockwise

Not anymore

> - After creating a note and taking a shot, once saved and back on the notes list, the "add note" button in the
> toolbar apparently no longer works. However, it does work: but it takes about 30 seconds to react. I saw this in the > debug output, but I'm not sure it's related:

Confirm that add note button doesn't work for ~30 sec, but I haven't error messages on my terminal

review: Approve

[Michael Zanetti (mzanetti)]

> Confirm that add note button doesn't work for ~30 sec, but I haven't error
> messages on my terminal

This happens if we're waiting for a response from the evernote server and it takes so long. Given that we don't support offline note editing with later syncing, the current code needs to wait for a confirmation when creating a new note. This should obviously change in the future, but out of the scope of this merge.

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

review: Approve (continuous-integration)

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-28 12:18:59 +0000
+++ CMakeLists.txt	2014-01-28 12:18:59 +0000
@@ -33,11 +33,11 @@
     set(CMAKE_INSTALL_PREFIX /)
     set(CMAKE_INSTALL_BINDIR /)
 	set(DATA_DIR /)
-	set(EXEC "qmlscene $@ -I .${QT_IMPORTS_DIR} qml/${MAIN_QML}")
+	set(EXEC "./reminders -I .${QT_IMPORTS_DIR}")
 	set(DESKTOP_DIR ${DATA_DIR})
 else(CLICK_MODE)
 	set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
-	set(EXEC "qmlscene $@ ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/qml/${MAIN_QML}")
+	set(EXEC "reminders")
 	set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON}")
 	set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
 endif(CLICK_MODE)

=== modified file 'src/app/CMakeLists.txt'
--- src/app/CMakeLists.txt	2014-01-28 12:18:59 +0000
+++ src/app/CMakeLists.txt	2014-01-28 12:18:59 +0000
@@ -2,6 +2,7 @@
 
 set(reminders_SRCS
     main.cpp
+    camerahelper.cpp
     ${QML_SRCS}
 )
 
@@ -15,6 +16,8 @@
 )
 
 install(DIRECTORY qml DESTINATION ${DATA_DIR})
-if(NOT CLICK_MODE)
+if(CLICK_MODE)
+  install(TARGETS reminders DESTINATION ${DATA_DIR})
+else()
   install(TARGETS reminders RUNTIME DESTINATION bin)
 endif()

=== added file 'src/app/camerahelper.cpp'
--- src/app/camerahelper.cpp	1970-01-01 00:00:00 +0000
+++ src/app/camerahelper.cpp	2014-01-28 12:18:59 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders
+ *
+ * reminders 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, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * reminders 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/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#include "camerahelper.h"
+
+#include <QStandardPaths>
+#include <QCoreApplication>
+#include <QImage>
+#include <QTransform>
+
+CameraHelper::CameraHelper(QObject *parent):
+    QObject(parent)
+{
+
+}
+
+QString CameraHelper::importLocation() const
+{
+    QString homePath = QStandardPaths::standardLocations(QStandardPaths::HomeLocation).first();
+    QString appName = QCoreApplication::applicationName();
+    return  homePath + "/.cache/" + appName + '/';
+}
+
+bool CameraHelper::rotate(const QString &imageFile, int angle)
+{
+    QImage image;
+    if (!image.load(imageFile)) {
+        return false;
+    }
+    QTransform transform;
+    transform.rotate(angle);
+    image = image.transformed(transform);
+    return image.save(imageFile);
+}

=== added file 'src/app/camerahelper.h'
--- src/app/camerahelper.h	1970-01-01 00:00:00 +0000
+++ src/app/camerahelper.h	2014-01-28 12:18:59 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders
+ *
+ * reminders 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, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * reminders 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/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#ifndef CAMERAHELPER_H
+#define CAMERAHELPER_H
+
+#include <QObject>
+
+class CameraHelper: public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString importLocation READ importLocation CONSTANT)
+public:
+    CameraHelper(QObject *parent = 0);
+
+    QString importLocation() const;
+
+    Q_INVOKABLE bool rotate(const QString &imageFile, int angle);
+};
+
+#endif

=== modified file 'src/app/main.cpp'
--- src/app/main.cpp	2014-01-28 12:18:59 +0000
+++ src/app/main.cpp	2014-01-28 12:18:59 +0000
@@ -19,34 +19,43 @@
  * Authors: Michael Zanetti <[e-mail]>
  */
 
+#include "camerahelper.h"
+
 #include <QtGui/QGuiApplication>
 #include <QtQuick/QQuickView>
 #include <QtQml/QtQml>
 
 #include <QDebug>
 
-/*
- * This is just a minimalistic main to fire up our own qml scene which has the
- * import path for the plugin preconfigured. This is just used for easier
- * development and while we can ship this, we could also run the app ourselves
- * with:
- * qmlscene -I /path/to/plugin/ reminders.qml
- */
-
 int main(int argc, char *argv[])
 {
-
-    // Do the same as qmlscene does
     QGuiApplication a(argc, argv);
     QQuickView view;
     view.setResizeMode(QQuickView::SizeRootObjectToView);
 
-    // Additionally add the -I ../plugin to load the plugin
+    // Set up import paths
     QStringList importPathList = view.engine()->importPathList();
     importPathList.append(QDir::currentPath() + "/../plugin/");
+
+    QStringList args = a.arguments();
+    for (int i = 0; i < args.count(); i++) {
+        if (args.at(i) == "-I" && args.count() > i + 1) {
+            QString addedPath = args.at(i+1);
+            if (addedPath.startsWith('.')) {
+                addedPath = addedPath.right(addedPath.length() - 1);
+                addedPath.prepend(QDir::currentPath());
+            }
+            importPathList.append(addedPath);
+        }
+    }
+
     view.engine()->setImportPathList(importPathList);
 
-    // and directly load the qml file
+    // Set up camera helper
+    CameraHelper helper;
+    view.engine()->rootContext()->setContextProperty("cameraHelper", &helper);
+
+    // load the qml file
     view.setSource(QUrl::fromLocalFile("qml/reminders.qml"));
 
     view.show();

=== added file 'src/app/qml/ui/CameraPage.qml'
--- src/app/qml/ui/CameraPage.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/ui/CameraPage.qml	2014-01-28 12:18:59 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright: 2013 Canonical, Ltd
+ *
+ * This file is part of reminders-app
+ *
+ * reminders-app 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.
+ *
+ * reminders-app 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.0
+import Ubuntu.Components 0.1
+import QtMultimedia 5.0
+import QtQuick.Window 2.0
+import Evernote 0.1
+
+Page {
+    id: root
+    property var note
+    property int position
+
+    tools: ToolbarItems {
+        locked: true
+        opened: true
+        ToolbarButton {
+            text: "Shoot"
+            iconName: "camera-symbolic"
+            onTriggered: camera.imageCapture.captureToLocation(cameraHelper.importLocation);
+        }
+    }
+
+    Camera {
+        id: camera
+        flash.mode: Camera.FlashTorch
+        focus.focusMode: Camera.FocusContinuous
+        focus.focusPointMode: Camera.FocusPointAuto
+
+        imageCapture {
+
+            onImageSaved: {
+                if (videoOutput.orientation != 0) {
+                    cameraHelper.rotate(path, -videoOutput.orientation)
+                }
+
+                root.note.attachFile(root.position, path)
+                print("got image", path)
+                pagestack.pop();
+            }
+        }
+    }
+
+    VideoOutput {
+        id: videoOutput
+        anchors {
+            fill: parent
+        }
+        fillMode: Image.PreserveAspectCrop
+        orientation: Screen.primaryOrientation === Qt.PortraitOrientation  ? -90 : 0
+        source: camera
+        focus: visible
+    }
+}

=== modified file 'src/app/qml/ui/EditNotePage.qml'
--- src/app/qml/ui/EditNotePage.qml	2014-01-28 12:18:59 +0000
+++ src/app/qml/ui/EditNotePage.qml	2014-01-28 12:18:59 +0000
@@ -172,6 +172,10 @@
             MouseArea {
                 anchors.fill: parent
                 onClicked: {
+                    priv.insertPosition = noteTextArea.cursorPosition;
+                    note.richTextContent = noteTextArea.text;
+
+                    pagestack.push(Qt.resolvedUrl("CameraPage.qml"), {note: root.note, position: priv.insertPosition})
                 }
             }
         }

=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2014-01-28 12:18:59 +0000
+++ src/plugin/Evernote/note.cpp	2014-01-28 12:18:59 +0000
@@ -242,9 +242,20 @@
 
 void Note::attachFile(int position, const QUrl &fileName)
 {
+    QFile importedFile(fileName.toString());
+    if (!importedFile.exists()) {
+        return;
+    }
+
+    qDebug() << "attaching file" << position << fileName;
     Resource *resource = addResource(fileName.path());
     m_content.attachFile(position, fileName.path(), resource->hash(), resource->type());
     emit contentChanged();
+
+    // Cleanup imported file.
+    // TODO: If the app should be extended to allow attaching other files, and we somehow
+    // can browse to unconfined files, this needs to be made conditional to not delete those files!
+    importedFile.remove();
 }
 
 Note *Note::clone()

=== modified file 'src/plugin/Evernote/resource.cpp'
--- src/plugin/Evernote/resource.cpp	2014-01-28 12:18:59 +0000
+++ src/plugin/Evernote/resource.cpp	2014-01-28 12:18:59 +0000
@@ -24,6 +24,7 @@
 #include <QStandardPaths>
 #include <QDebug>
 #include <QCryptographicHash>
+#include <QFileInfo>
 
 Resource::Resource(const QByteArray &data, const QString &hash, const QString &fileName, const QString &type, QObject *parent):
     m_hash(hash),
@@ -45,18 +46,18 @@
     }
 }
 
-Resource::Resource(const QString &path, QObject *parent):
-    m_filePath(path)
+Resource::Resource(const QString &path, QObject *parent)
 {
+
     QFile file(path);
     if (!file.open(QFile::ReadOnly)) {
         qWarning() << "Cannot open file for reading...";
         return;
     }
-
     QByteArray fileContent = file.readAll();
-    m_hash = QCryptographicHash::hash(fileContent, QCryptographicHash::Md5).toHex();
+    file.close();
 
+    m_hash = QCryptographicHash::hash(fileContent, QCryptographicHash::Md5).toHex();    
     m_fileName = path.split('/').last();
     if (m_fileName.endsWith(".png")) {
         m_type = "image/png";
@@ -65,6 +66,22 @@
     } else {
         qWarning() << "cannot determine mime type of file" << m_fileName;
     }
+
+    m_filePath = QStandardPaths::standardLocations(QStandardPaths::CacheLocation).first() + "/" + m_hash + "." + m_type.split('/').last();
+
+    QFile copy(m_filePath);
+    if (!copy.exists()) {
+
+        if (!copy.open(QFile::WriteOnly)) {
+            qWarning() << "error writing file" << m_filePath;
+            return;
+        }
+        copy.write(fileContent);
+        copy.close();
+    }
+
+
+    qDebug() << "created resource" << m_hash;
 }
 
 QString Resource::hash() const

=== modified file 'src/plugin/Evernote/utils/enmldocument.cpp'
--- src/plugin/Evernote/utils/enmldocument.cpp	2014-01-28 12:18:59 +0000
+++ src/plugin/Evernote/utils/enmldocument.cpp	2014-01-28 12:18:59 +0000
@@ -379,6 +379,7 @@
     writer.writeDTD("<!DOCTYPE en-note SYSTEM \"http://xml.evernote.com/pub/enml2.dtd\">");
 
     int textPos = 0;
+    bool inserted = false;
 
     while (!reader.atEnd() && !reader.hasError()) {
         QXmlStreamReader::TokenType token = reader.readNext();
@@ -397,6 +398,7 @@
                 writer.writeAttribute("hash", hash);
                 writer.writeAttribute("type", type);
                 writer.writeEndElement();
+                inserted = true;
 
                 writer.writeCharacters(textString.right(textString.length() - (position - textPos)));
             } else {
@@ -405,6 +407,15 @@
             textPos += textString.length();
         }
         if (token == QXmlStreamReader::EndElement) {
+
+            // The above logic would fail on an empty note
+            if (reader.name() == "en-note" && !inserted) {
+                writer.writeStartElement("en-media");
+                writer.writeAttribute("hash", hash);
+                writer.writeAttribute("type", type);
+                writer.writeEndElement();
+            }
+
             writer.writeEndElement();
         }
     }