Merge lp:~mzanetti/reminders-app/save-notebook into lp:reminders-app

[Michael Zanetti]

add API to save notebooks

[lp:~mzanetti/reminders-app/save-notebook]

222. By Michael Zanetti on 2014-08-17

fix typo

223. By Michael Zanetti on 2014-08-17

fix some comments and headers

[Riccardo Padovani (rpadovani)]

Looks good to me and works fine, thanks

review: Approve

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

PASSED: Continuous integration, rev:223
http://91.189.93.70:8080/job/reminders-app-ci/483/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1582
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/1582/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-utopic-amd64-ci/179

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

review: Approve (continuous-integration)

=== modified file 'src/plugin/Evernote/CMakeLists.txt'
--- src/plugin/Evernote/CMakeLists.txt	2014-02-15 17:04:45 +0000
+++ src/plugin/Evernote/CMakeLists.txt	2014-08-17 14:31:11 +0000
@@ -19,6 +19,7 @@
     jobs/createnotejob.cpp
     jobs/evernotejob.cpp
     jobs/savenotejob.cpp
+    jobs/savenotebookjob.cpp
     jobs/deletenotejob.cpp
     evernoteconnection.cpp
     jobs/userstorejob.cpp

=== added file 'src/plugin/Evernote/jobs/savenotebookjob.cpp'
--- src/plugin/Evernote/jobs/savenotebookjob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/savenotebookjob.cpp	2014-08-17 14:31:11 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright: 2014 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; version 3.
+ *
+ * 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 "savenotebookjob.h"
+#include "notebook.h"
+
+#include <QDebug>
+
+SaveNotebookJob::SaveNotebookJob(Notebook *notebook, QObject *parent) :
+    NotesStoreJob(parent)
+{
+    // Need to clone it. As startJob() will run in another thread we can't access the real notebook from there.
+    m_notebook = notebook->clone();
+
+    // Make sure we delete the clone when done
+    m_notebook->setParent(this);
+}
+
+void SaveNotebookJob::startJob()
+{
+    evernote::edam::Notebook notebook;
+    notebook.guid = m_notebook->guid().toStdString();
+    notebook.__isset.guid = true;
+    notebook.name = m_notebook->name().toStdString();
+    notebook.__isset.name = true;
+
+    client()->updateNotebook(token().toStdString(), notebook);
+}
+
+void SaveNotebookJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
+{
+    emit jobDone(errorCode, errorMessage);
+}

=== added file 'src/plugin/Evernote/jobs/savenotebookjob.h'
--- src/plugin/Evernote/jobs/savenotebookjob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/savenotebookjob.h	2014-08-17 14:31:11 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright: 2014 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; version 3.
+ *
+ * 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 SAVENOTEBOOKJOB_H
+#define SAVENOTEBOOKJOB_H
+
+#include "notesstorejob.h"
+
+class SaveNotebookJob : public NotesStoreJob
+{
+    Q_OBJECT
+public:
+    explicit SaveNotebookJob(Notebook *notebook, QObject *parent = 0);
+
+signals:
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
+
+protected:
+    void startJob();
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
+
+private:
+    Notebook* m_notebook;
+};
+
+#endif // SAVENOTEBOOKJOB_H

=== modified file 'src/plugin/Evernote/notebook.cpp'
--- src/plugin/Evernote/notebook.cpp	2014-05-19 14:20:45 +0000
+++ src/plugin/Evernote/notebook.cpp	2014-08-17 14:31:11 +0000
@@ -116,6 +116,21 @@
     return QString(gettext("on %1 %2")).arg(QLocale::system().standaloneMonthName(updateDate.month())).arg(updateDate.year());
 }
 
+Notebook *Notebook::clone()
+{
+    Notebook *notebook = new Notebook(m_guid);
+    notebook->setName(m_name);
+    notebook->setLastUpdated(m_lastUpdated);
+    notebook->setPublished(m_published);
+
+    return notebook;
+}
+
+void Notebook::save()
+{
+    NotesStore::instance()->saveNotebook(m_guid);
+}
+
 void Notebook::noteAdded(const QString &noteGuid, const QString &notebookGuid)
 {
     Q_UNUSED(noteGuid)

=== modified file 'src/plugin/Evernote/notebook.h'
--- src/plugin/Evernote/notebook.h	2014-05-05 22:33:48 +0000
+++ src/plugin/Evernote/notebook.h	2014-08-17 14:31:11 +0000
@@ -28,12 +28,14 @@
 {
     Q_OBJECT
 
+    // Don't forget to update clone() if you add new properties
     Q_PROPERTY(QString guid READ guid CONSTANT)
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(int noteCount READ noteCount NOTIFY noteCountChanged)
     Q_PROPERTY(bool published READ published NOTIFY publishedChanged)
     Q_PROPERTY(QDateTime lastUpdated READ lastUpdated NOTIFY lastUpdatedChanged)
     Q_PROPERTY(QString lastUpdatedString READ lastUpdatedString NOTIFY lastUpdatedChanged)
+    // Don't forget to update clone() if you add new properties
 
 public:
     explicit Notebook(QString guid, QObject *parent = 0);
@@ -53,6 +55,11 @@
 
     QString lastUpdatedString() const;
 
+    Notebook *clone();
+
+public slots:
+    void save();
+
 signals:
     void nameChanged();
     void noteCountChanged();

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2014-07-14 07:38:42 +0000
+++ src/plugin/Evernote/notesstore.cpp	2014-08-17 14:31:11 +0000
@@ -30,6 +30,7 @@
 #include "jobs/fetchnotejob.h"
 #include "jobs/createnotejob.h"
 #include "jobs/savenotejob.h"
+#include "jobs/savenotebookjob.h"
 #include "jobs/deletenotejob.h"
 #include "jobs/createnotebookjob.h"
 #include "jobs/expungenotebookjob.h"
@@ -186,6 +187,18 @@
     EvernoteConnection::instance()->enqueue(job);
 }
 
+void NotesStore::saveNotebook(const QString &guid)
+{
+    Notebook *notebook = m_notebooksHash.value(guid);
+    if (!notebook) {
+        qWarning() << "Can't save notebook. Guid not found:" << guid;
+        return;
+    }
+    SaveNotebookJob *job = new SaveNotebookJob(notebook, this);
+    connect(job, &SaveNotebookJob::jobDone, this, &NotesStore::saveNotebookJobDone);
+    EvernoteConnection::instance()->enqueue(job);
+}
+
 void NotesStore::expungeNotebook(const QString &guid)
 {
     ExpungeNotebookJob *job = new ExpungeNotebookJob(guid);
@@ -473,6 +486,17 @@
     }
 }
 
+void NotesStore::saveNotebookJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
+{
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
+        qWarning() << "error saving notebook" << errorMessage;
+
+        // Lets fetch the notebook from the server again to reflect the non-saved state...
+        refreshNotebooks();
+        return;
+    }
+}
+
 void NotesStore::deleteNote(const QString &guid)
 {
     DeleteNoteJob *job = new DeleteNoteJob(guid, this);

=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h	2014-07-14 07:38:42 +0000
+++ src/plugin/Evernote/notesstore.h	2014-08-17 14:31:11 +0000
@@ -103,6 +103,7 @@
     QList<Notebook*> notebooks() const;
     Q_INVOKABLE Notebook* notebook(const QString &guid);
     Q_INVOKABLE void createNotebook(const QString &name);
+    Q_INVOKABLE void saveNotebook(const QString &guid);
     Q_INVOKABLE void expungeNotebook(const QString &guid);
 
 public slots:
@@ -133,6 +134,7 @@
     void fetchNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result, bool withResourceContent);
     void createNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);
     void saveNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Note &result);
+    void saveNotebookJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
     void deleteNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid);
     void createNotebookJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Notebook &result);
     void expungeNotebookJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid);