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

[Michael Zanetti]

Added createNotebook to plugin API.

Added createNotebook to plugin API.

I've also added expungeNote, however, with the current API key we aren't allowed to call that.

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

21. By Michael Zanetti on 2013-12-12

add copyright headers

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

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

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

review: Approve (continuous-integration)

[Jordan Keyes (jkeyes0)]

Create notebook option seems to work here, at least as far as creating a new notebook named "new notebook" :)

review: Approve

=== modified file 'src/app/qml/ui/NotebooksPage.qml'
--- src/app/qml/ui/NotebooksPage.qml	2013-11-26 17:18:33 +0000
+++ src/app/qml/ui/NotebooksPage.qml	2013-12-12 22:46:16 +0000
@@ -30,6 +30,16 @@
         }
     }
 
+    tools: ToolbarItems {
+        ToolbarButton {
+            text: "add notebook"
+            enabled: notes.filterNotebookGuid.length > 0
+            onTriggered: {
+                NotesStore.createNotebook("new notebook");
+            }
+        }
+    }
+
     Notebooks {
         id: notebooks
     }

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2013-12-12 22:46:16 +0000
+++ src/app/qml/ui/NotesPage.qml	2013-12-12 22:46:16 +0000
@@ -62,7 +62,7 @@
             }
 
             onPressAndHold: {
-                notes.note(guid).remove();
+                NotesStore.deleteNote(guid);
             }
         }
     }

=== modified file 'src/plugin/Evernote/Evernote.pro'
--- src/plugin/Evernote/Evernote.pro	2013-12-12 22:46:16 +0000
+++ src/plugin/Evernote/Evernote.pro	2013-12-12 22:46:16 +0000
@@ -27,7 +27,9 @@
     evernoteconnection.cpp \
     jobs/userstorejob.cpp \
     jobs/notesstorejob.cpp \
-    jobs/fetchusernamejob.cpp
+    jobs/fetchusernamejob.cpp \
+    jobs/createnotebookjob.cpp \
+    jobs/expungenotebookjob.cpp
 
 HEADERS += evernoteplugin.h \
     notesstore.h \
@@ -47,7 +49,9 @@
     evernoteconnection.h \
     jobs/userstorejob.h \
     jobs/notesstorejob.h \
-    jobs/fetchusernamejob.h
+    jobs/fetchusernamejob.h \
+    jobs/createnotebookjob.h \
+    jobs/expungenotebookjob.h
 
 message(building in $$OUT_PWD)
 LIBS += -L$$OUT_PWD/../../../3rdParty/evernote-sdk-cpp/ -L$$OUT_PWD/../../../3rdParty/libthrift/ -levernote-sdk-cpp -llibthrift -lssl -lcrypto

=== added file 'src/plugin/Evernote/jobs/createnotebookjob.cpp'
--- src/plugin/Evernote/jobs/createnotebookjob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/createnotebookjob.cpp	2013-12-12 22:46:16 +0000
@@ -0,0 +1,41 @@
+/*
+ * 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/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#include "createnotebookjob.h"
+
+#include <QDebug>
+
+CreateNotebookJob::CreateNotebookJob(const QString &name, QObject *parent) :
+    NotesStoreJob(parent),
+    m_name(name)
+{
+}
+
+void CreateNotebookJob::startJob()
+{
+    m_result.name = m_name.toStdString();
+    m_result.__isset.name = true;
+    client()->createNotebook(m_result, token().toStdString(), m_result);
+}
+
+void CreateNotebookJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
+{
+    emit jobDone(errorCode, errorMessage, m_result);
+}

=== added file 'src/plugin/Evernote/jobs/createnotebookjob.h'
--- src/plugin/Evernote/jobs/createnotebookjob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/createnotebookjob.h	2013-12-12 22:46:16 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#ifndef CREATENOTEBOOKJOB_H
+#define CREATENOTEBOOKJOB_H
+
+#include "notesstorejob.h"
+
+class CreateNotebookJob : public NotesStoreJob
+{
+    Q_OBJECT
+public:
+    explicit CreateNotebookJob(const QString &name, QObject *parent = 0);
+
+    virtual void startJob() override;
+
+signals:
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Notebook &result);
+
+private slots:
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
+
+private:
+    QString m_name;
+
+    evernote::edam::Notebook m_result;
+};
+
+#endif // CREATENOTEBOOKJOB_H

=== modified file 'src/plugin/Evernote/jobs/evernotejob.cpp'
--- src/plugin/Evernote/jobs/evernotejob.cpp	2013-12-12 22:46:16 +0000
+++ src/plugin/Evernote/jobs/evernotejob.cpp	2013-12-12 22:46:16 +0000
@@ -55,7 +55,6 @@
 
     try {
         startJob();
-
     } catch (const TTransportException & e) {
 
         // The connection broke down. libthrift + evernote servers seem to be quite flaky
@@ -68,19 +67,29 @@
             // Giving up... the connection seems to be down for real.
             qWarning() << "Cannot reestablish connection:" << e.what();
             emitJobDone(EvernoteConnection::ErrorCodeConnectionLost, e.what());
+        } catch (const TApplicationException &e) {
+            qWarning() << "Cannot reestablish connection:" << e.what();
+            emitJobDone(EvernoteConnection::ErrorCodeConnectionLost, e.what());
         } catch (const evernote::edam::EDAMUserException &e) {
+            qWarning() << "EDAMUserException" << e.what();
             emitJobDone(EvernoteConnection::ErrorCodeUserException, e.what());
         } catch (const evernote::edam::EDAMSystemException &e) {
+            qWarning() << "EDAMSystemException" << e.what();
             emitJobDone(EvernoteConnection::ErrorCodeSystemException, e.what());
         } catch (const evernote::edam::EDAMNotFoundException &e) {
+            qWarning() << "EDAMNotFoundException" << e.what();
             emitJobDone(EvernoteConnection::ErrorCodeNotFoundExcpetion, e.what());
         }
 
+
     } catch (const evernote::edam::EDAMUserException &e) {
+        qWarning() << "EDAMUserException" << e.what();
         emitJobDone(EvernoteConnection::ErrorCodeUserException, e.what());
     } catch (const evernote::edam::EDAMSystemException &e) {
+        qWarning() << "EDAMSystemException" << e.what();
         emitJobDone(EvernoteConnection::ErrorCodeSystemException, e.what());
     } catch (const evernote::edam::EDAMNotFoundException &e) {
+        qWarning() << "EDAMNotFoundException" << e.what();
         emitJobDone(EvernoteConnection::ErrorCodeNotFoundExcpetion, e.what());
     }
 

=== added file 'src/plugin/Evernote/jobs/expungenotebookjob.cpp'
--- src/plugin/Evernote/jobs/expungenotebookjob.cpp	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/expungenotebookjob.cpp	2013-12-12 22:46:16 +0000
@@ -0,0 +1,39 @@
+/*
+ * 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/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#include "expungenotebookjob.h"
+
+#include <QDebug>
+
+ExpungeNotebookJob::ExpungeNotebookJob(const QString &guid, QObject *parent) :
+    NotesStoreJob(parent),
+    m_guid(guid)
+{
+}
+
+void ExpungeNotebookJob::startJob()
+{
+    client()->expungeNotebook(token().toStdString(), m_guid.toStdString());
+}
+
+void ExpungeNotebookJob::emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage)
+{
+    emit jobDone(errorCode, errorMessage, m_guid);
+}

=== added file 'src/plugin/Evernote/jobs/expungenotebookjob.h'
--- src/plugin/Evernote/jobs/expungenotebookjob.h	1970-01-01 00:00:00 +0000
+++ src/plugin/Evernote/jobs/expungenotebookjob.h	2013-12-12 22:46:16 +0000
@@ -0,0 +1,43 @@
+/*
+ * 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/>.
+ *
+ * Authors: Michael Zanetti <[e-mail]>
+ */
+
+#ifndef DELETENOTEBOOKJOB_H
+#define DELETENOTEBOOKJOB_H
+
+#include "notesstorejob.h"
+
+class ExpungeNotebookJob : public NotesStoreJob
+{
+    Q_OBJECT
+public:
+    explicit ExpungeNotebookJob(const QString &guid, QObject *parent = 0);
+
+signals:
+    void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid);
+
+private slots:
+    void startJob();
+    void emitJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage);
+
+private:
+    QString m_guid;
+};
+
+#endif // DELETENOTEBOOKJOB_H

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2013-12-12 22:46:16 +0000
+++ src/plugin/Evernote/notesstore.cpp	2013-12-12 22:46:16 +0000
@@ -31,6 +31,8 @@
 #include "jobs/createnotejob.h"
 #include "jobs/savenotejob.h"
 #include "jobs/deletenotejob.h"
+#include "jobs/createnotebookjob.h"
+#include "jobs/expungenotebookjob.h"
 
 #include <QDebug>
 
@@ -46,6 +48,7 @@
     qRegisterMetaType<evernote::edam::NotesMetadataList>("evernote::edam::NotesMetadataList");
     qRegisterMetaType<evernote::edam::Note>("evernote::edam::Note");
     qRegisterMetaType<std::vector<evernote::edam::Notebook> >("std::vector<evernote::edam::Notebook>");
+    qRegisterMetaType<evernote::edam::Notebook>("evernote::edam::Notebook");
 
 }
 
@@ -124,6 +127,20 @@
     return m_notebooksHash.value(guid);
 }
 
+void NotesStore::createNotebook(const QString &name)
+{
+    CreateNotebookJob *job = new CreateNotebookJob(name);
+    connect(job, &CreateNotebookJob::jobDone, this, &NotesStore::createNotebookJobDone);
+    EvernoteConnection::instance()->enqueue(job);
+}
+
+void NotesStore::expungeNotebook(const QString &guid)
+{
+    ExpungeNotebookJob *job = new ExpungeNotebookJob(guid);
+    connect(job, &ExpungeNotebookJob::jobDone, this, &NotesStore::expungeNotebookJobDone);
+    EvernoteConnection::instance()->enqueue(job);
+}
+
 void NotesStore::refreshNotes(const QString &filterNotebookGuid)
 {
     FetchNotesJob *job = new FetchNotesJob(filterNotebookGuid);
@@ -316,3 +333,28 @@
     m_notesHash.take(guid)->deleteLater();
     endRemoveRows();
 }
+
+void NotesStore::createNotebookJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::Notebook &result)
+{
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
+        qWarning() << "Error creating notebook:" << errorMessage;
+        return;
+    }
+    Notebook *notebook = new Notebook(QString::fromStdString(result.guid));
+    notebook->setName(QString::fromStdString(result.name));
+    m_notebooks.append(notebook);
+    m_notebooksHash.insert(notebook->guid(), notebook);
+    emit notebookAdded(notebook->guid());
+}
+
+void NotesStore::expungeNotebookJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid)
+{
+    if (errorCode != EvernoteConnection::ErrorCodeNoError) {
+        qWarning() << "Error expunging notebook:" << errorMessage;
+        return;
+    }
+    emit notebookRemoved(guid);
+    Notebook *notebook = m_notebooksHash.take(guid);
+    m_notebooks.removeAll(notebook);
+    notebook->deleteLater();
+}

=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h	2013-12-12 22:46:16 +0000
+++ src/plugin/Evernote/notesstore.h	2013-12-12 22:46:16 +0000
@@ -56,6 +56,8 @@
 
     QList<Notebook*> notebooks() const;
     Notebook* notebook(const QString &guid);
+    Q_INVOKABLE void createNotebook(const QString &name);
+    Q_INVOKABLE void expungeNotebook(const QString &guid);
 
 public slots:
     void refreshNotes(const QString &filterNotebookGuid = QString());
@@ -71,6 +73,7 @@
 
     void notebookAdded(const QString &guid);
     void notebookChanged(const QString &guid);
+    void notebookRemoved(const QString &guid);
 
 private slots:
     void fetchNotesJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::NotesMetadataList &results);
@@ -79,6 +82,8 @@
     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 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);
 
 private:
     explicit NotesStore(QObject *parent = 0);