Merge lp:~mzanetti/reminders-app/find-notes into lp:reminders-app

[Michael Zanetti]

added means to search for notes by content to plugin API

Added NotesStore.findNotes(searchstring) for searching notes (content search). The search follows the grammar defined in here:

http://dev.evernote.com/doc/articles/search_grammar.php

This means, that if you want to search partial words, you need to type "foo*" in order to find the word "foobar". Just "foo" would not match it. I think we want to automatically append the * in the UI code, depending on how we want to expose the capabilities of the search grammar.

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

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

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

review: Approve (continuous-integration)

[lp:~mzanetti/reminders-app/find-notes]

23. By Michael Zanetti on 2013-12-13

move searching to a new page as per design

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

FAILED: Continuous integration, rev:23
http://91.189.93.70:8080/job/reminders-app-ci/37/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-trusty/437
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-saucy-amd64-ci/37
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-trusty-amd64-ci/37

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

review: Needs Fixing (continuous-integration)

[lp:~mzanetti/reminders-app/find-notes]

24. By Michael Zanetti on 2013-12-14

add missing file

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

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

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

review: Needs Fixing (continuous-integration)

[Jordan Keyes (jkeyes0)]

On most of your newer branches, I'm getting an error on my system (Ubuntu 13.10 64-bit) complaining about the "iconName" in the ToolbarItems. Going back through the prerequisite branches, it seems that this one is the first to have the commits with iconName. Are there additional components that I need to install to make this work? I saw something mentioned about a missing "ubuntu.components.extras.browser" in a later branch of code. Are those related?

review: Needs Fixing

[Michael Zanetti (mzanetti)]

> On most of your newer branches, I'm getting an error on my system (Ubuntu
> 13.10 64-bit) complaining about the "iconName" in the ToolbarItems. Going back
> through the prerequisite branches, it seems that this one is the first to have
> the commits with iconName. Are there additional components that I need to
> install to make this work? I saw something mentioned about a missing
> "ubuntu.components.extras.browser" in a later branch of code. Are those
> related?

Hmm... There's nothing additional to be installed, but you gotta have a recent version of the ubuntu-ui-toolkit. Which version do you have?

I've this one: 0.1.46+14.04.20131129-0ubuntu1

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

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

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

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

> On most of your newer branches, I'm getting an error on my system (Ubuntu
> 13.10 64-bit) complaining about the "iconName" in the ToolbarItems. Going back
> through the prerequisite branches, it seems that this one is the first to have
> the commits with iconName. Are there additional components that I need to
> install to make this work? I saw something mentioned about a missing
> "ubuntu.components.extras.browser" in a later branch of code. Are those
> related?

Ok. Seems saucy doesn't ship the lastest ui toolkit packages indeed. Here's a ppa with the latest versions:

https://launchpad.net/~ubuntu-sdk-team/+archive/ppa/+packages?batch=75&memo=75&start=75

We need a decision from David or Alan on whether we need to keep compatibility with saucy or not.

[David Planella (dpm)]

I think we should strive to keep compatibility with 13.10, but in any case I think this particular issue can easily be solved by making sure the SDK PPA is installed (and that it is up-to-date)

[Jordan Keyes (jkeyes0)]

After adding the ubuntu-sdk-team PPA to my system, this MP looks good.

review: Approve

=== modified file 'src/app/app.pro'
--- src/app/app.pro	2013-11-22 21:35:34 +0000
+++ src/app/app.pro	2013-12-14 00:04:27 +0000
@@ -10,7 +10,9 @@
     qml/ui/RemindersPage.qml \
     qml/ui/NotesPage.qml \
     qml/ui/AccountSelectorPage.qml \
-    qml/ui/NotePage.qml
+    qml/ui/NotePage.qml \
+    qml/ui/SearchNotesPage.qml \
+    qml/components/ToolbarSpacer.qml \
 
 # Copy qml to build dir for running with qtcreator
 qmlfolder.source = src/app/qml

=== added directory 'src/app/qml/components'
=== added file 'src/app/qml/components/ToolbarSpacer.qml'
--- src/app/qml/components/ToolbarSpacer.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/components/ToolbarSpacer.qml	2013-12-14 00:04:27 +0000
@@ -0,0 +1,45 @@
+/*
+ * 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 Ubuntu.Components.Popups 0.1
+
+Item {
+    id: spacerItem
+    objectName: "__ToolBarItems.SpacerItem"
+    height: parent.height
+    width: {
+        var othersWidth = 0;
+
+        // Hack: the autogenerated back button
+        if (pageStack != null && pageStack.depth > 1) {
+            othersWidth = units.gu(6)
+        }
+
+        for (var i = 0; i < parent.children.length; ++i) {
+            var otherItem = parent.children[i];
+            if (otherItem.objectName !== "__ToolBarItems.SpacerItem") {
+                if (otherItem.visible) {
+                    othersWidth += otherItem.width + parent.spacing;
+                }
+            }
+        }
+        return parent.parent.width - othersWidth - units.gu(4);
+    }
+}

=== modified file 'src/app/qml/ui/NotebooksPage.qml'
--- src/app/qml/ui/NotebooksPage.qml	2013-12-14 00:04:26 +0000
+++ src/app/qml/ui/NotebooksPage.qml	2013-12-14 00:04:27 +0000
@@ -33,7 +33,6 @@
     tools: ToolbarItems {
         ToolbarButton {
             text: "add notebook"
-            enabled: notes.filterNotebookGuid.length > 0
             onTriggered: {
                 NotesStore.createNotebook("new notebook");
             }

=== modified file 'src/app/qml/ui/NotesPage.qml'
--- src/app/qml/ui/NotesPage.qml	2013-12-14 00:04:26 +0000
+++ src/app/qml/ui/NotesPage.qml	2013-12-14 00:04:27 +0000
@@ -20,6 +20,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1
 import Evernote 0.1
+import "../components"
 
 Page {
     id: notesPage
@@ -35,6 +36,16 @@
     // Just for testing
     tools: ToolbarItems {
         ToolbarButton {
+            text: "search"
+            iconName: "search"
+            onTriggered: {
+                pagestack.push(Qt.resolvedUrl("SearchNotesPage.qml"))
+            }
+        }
+
+        ToolbarSpacer { }
+
+        ToolbarButton {
             text: "add note"
             enabled: notes.filterNotebookGuid.length > 0
             onTriggered: {
@@ -51,7 +62,8 @@
     }
 
     ListView {
-        anchors.fill: parent
+        anchors { left: parent.left; right: parent.right }
+        height: parent.height - y
         model: notes
 
         delegate: Standard {

=== added file 'src/app/qml/ui/SearchNotesPage.qml'
--- src/app/qml/ui/SearchNotesPage.qml	1970-01-01 00:00:00 +0000
+++ src/app/qml/ui/SearchNotesPage.qml	2013-12-14 00:04:27 +0000
@@ -0,0 +1,73 @@
+/*
+ * 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 Ubuntu.Components.ListItems 0.1
+import Evernote 0.1
+import "../components"
+
+Page {
+    Column {
+        anchors { fill: parent; topMargin: units.gu(2); bottomMargin: units.gu(2) }
+        spacing: units.gu(2)
+
+        Row {
+            anchors { left: parent.left; right: parent.right; margins: units.gu(2) }
+            spacing: units.gu(1)
+
+            TextField {
+                id: searchField
+                width: parent.width - searchButton.width - parent.spacing
+                anchors.verticalCenter: parent.verticalCenter
+
+                primaryItem: Icon {
+                    height: searchField.height - units.gu(1)
+                    width: height
+                    name: "search"
+                }
+
+                onAccepted: {
+                    NotesStore.findNotes(searchField.text + "*")
+                }
+            }
+            Button {
+                id: searchButton
+                height: searchField.height
+                text: "search"
+                onClicked: {
+                    NotesStore.findNotes(searchField.text + "*")
+                }
+            }
+        }
+
+        ListView {
+            anchors { left: parent.left; right: parent.right }
+            height: parent.height - y
+
+            model: Notes {
+                onlySearchResults: true
+            }
+
+            delegate: Standard {
+                text: title
+            }
+        }
+
+    }
+}

=== modified file 'src/plugin/Evernote/jobs/fetchnotesjob.cpp'
--- src/plugin/Evernote/jobs/fetchnotesjob.cpp	2013-12-14 00:04:26 +0000
+++ src/plugin/Evernote/jobs/fetchnotesjob.cpp	2013-12-14 00:04:27 +0000
@@ -27,9 +27,10 @@
 
 #include <QDebug>
 
-FetchNotesJob::FetchNotesJob( const QString &filterNotebookGuid, QObject *parent) :
+FetchNotesJob::FetchNotesJob(const QString &filterNotebookGuid, const QString &searchWords, QObject *parent) :
     NotesStoreJob(parent),
-    m_filterNotebookGuid(filterNotebookGuid)
+    m_filterNotebookGuid(filterNotebookGuid),
+    m_searchWords(searchWords)
 {
 }
 
@@ -45,6 +46,9 @@
     filter.notebookGuid = m_filterNotebookGuid.toStdString();
     filter.__isset.notebookGuid = !m_filterNotebookGuid.isEmpty();
 
+    filter.words = m_searchWords.toStdString();
+    filter.__isset.words = !m_searchWords.isEmpty();
+
     // Prepare ResultSpec
     evernote::edam::NotesMetadataResultSpec resultSpec;
 

=== modified file 'src/plugin/Evernote/jobs/fetchnotesjob.h'
--- src/plugin/Evernote/jobs/fetchnotesjob.h	2013-12-14 00:04:26 +0000
+++ src/plugin/Evernote/jobs/fetchnotesjob.h	2013-12-14 00:04:27 +0000
@@ -7,7 +7,7 @@
 {
     Q_OBJECT
 public:
-    explicit FetchNotesJob(const QString &filterNotebookGuid, QObject *parent = 0);
+    explicit FetchNotesJob(const QString &filterNotebookGuid = QString(), const QString &searchWords = QString(), QObject *parent = 0);
 
 signals:
     void jobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const evernote::edam::NotesMetadataList &results);
@@ -18,6 +18,7 @@
 
 private:
     QString m_filterNotebookGuid;
+    QString m_searchWords;
     evernote::edam::NotesMetadataList m_results;
 };
 

=== modified file 'src/plugin/Evernote/note.cpp'
--- src/plugin/Evernote/note.cpp	2013-12-14 00:04:26 +0000
+++ src/plugin/Evernote/note.cpp	2013-12-14 00:04:27 +0000
@@ -27,7 +27,8 @@
 Note::Note(const QString &guid, const QDateTime &created, QObject *parent) :
     QObject(parent),
     m_guid(guid),
-    m_created(created)
+    m_created(created),
+    m_isSearchResult(false)
 {
 }
 
@@ -148,6 +149,19 @@
     }
 }
 
+bool Note::isSearchResult() const
+{
+    return m_isSearchResult;
+}
+
+void Note::setIsSearchResult(bool isSearchResult)
+{
+    if (m_isSearchResult != isSearchResult) {
+        m_isSearchResult = isSearchResult;
+        emit isSearchResultChanged();
+    }
+}
+
 Note *Note::clone()
 {
     Note *note = new Note(m_guid, m_created);
@@ -157,6 +171,7 @@
     note->setReminderOrder(m_reminderOrder);
     note->setReminderTime(m_reminderTime);
     note->setReminderDoneTime(m_reminderDoneTime);
+    note->setIsSearchResult(m_isSearchResult);
     return note;
 }
 

=== modified file 'src/plugin/Evernote/note.h'
--- src/plugin/Evernote/note.h	2013-12-14 00:04:26 +0000
+++ src/plugin/Evernote/note.h	2013-12-14 00:04:27 +0000
@@ -19,6 +19,7 @@
     Q_PROPERTY(QDateTime reminderTime READ reminderTime WRITE setReminderTime NOTIFY reminderTimeChanged)
     Q_PROPERTY(bool reminderDone READ reminderDone WRITE setReminderDone NOTIFY reminderDoneChanged)
     Q_PROPERTY(QDateTime reminderDoneTime READ reminderDoneTime WRITE setReminderDoneTime NOTIFY reminderDoneChanged)
+    Q_PROPERTY(bool isSearchResult READ isSearchResult NOTIFY isSearchResultChanged)
     // Don't forget to update clone() if you add properties!
 
 public:
@@ -58,6 +59,9 @@
     QDateTime reminderDoneTime() const;
     void setReminderDoneTime(const QDateTime &reminderDoneTime);
 
+    bool isSearchResult() const;
+    void setIsSearchResult(bool isSearchResult);
+
     Note* clone();
 
 public slots:
@@ -71,6 +75,7 @@
     void reminderChanged();
     void reminderTimeChanged();
     void reminderDoneChanged();
+    void isSearchResultChanged();
 
 private:
     QString m_guid;
@@ -81,6 +86,7 @@
     qint64 m_reminderOrder;
     QDateTime m_reminderTime;
     QDateTime m_reminderDoneTime;
+    bool m_isSearchResult;
 };
 
 #endif // NOTE_H

=== modified file 'src/plugin/Evernote/notes.cpp'
--- src/plugin/Evernote/notes.cpp	2013-12-14 00:04:26 +0000
+++ src/plugin/Evernote/notes.cpp	2013-12-14 00:04:27 +0000
@@ -60,6 +60,20 @@
     }
 }
 
+bool Notes::onlySearchResults() const
+{
+    return m_onlySearchResults;
+}
+
+void Notes::setOnlySearchResults(bool onlySearchResults)
+{
+    if (m_onlySearchResults != onlySearchResults) {
+        m_onlySearchResults = onlySearchResults;
+        emit onlySearchResultsChanged();
+        invalidateFilter();
+    }
+}
+
 bool Notes::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
 {
     QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent);
@@ -73,5 +87,11 @@
             return false;
         }
     }
+    if (m_onlySearchResults) {
+        Note *note = NotesStore::instance()->note(sourceModel()->data(sourceIndex, NotesStore::RoleGuid).toString());
+        if (!note->isSearchResult()) {
+            return false;
+        }
+    }
     return true;
 }

=== modified file 'src/plugin/Evernote/notes.h'
--- src/plugin/Evernote/notes.h	2013-12-14 00:04:26 +0000
+++ src/plugin/Evernote/notes.h	2013-12-14 00:04:27 +0000
@@ -10,6 +10,7 @@
     Q_OBJECT
     Q_PROPERTY(QString filterNotebookGuid READ filterNotebookGuid WRITE setFilterNotebookGuid NOTIFY filterNotebookGuidChanged)
     Q_PROPERTY(bool onlyReminders READ onlyReminders WRITE setOnlyReminders NOTIFY onlyRemindersChanged)
+    Q_PROPERTY(bool onlySearchResults READ onlySearchResults WRITE setOnlySearchResults NOTIFY onlySearchResultsChanged)
 
 public:
     explicit Notes(QObject *parent = 0);
@@ -20,17 +21,21 @@
     bool onlyReminders() const;
     void setOnlyReminders(bool onlyReminders);
 
+    bool onlySearchResults() const;
+    void setOnlySearchResults(bool onlySearchResults);
+
 protected:
     bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
 
 signals:
     void filterNotebookGuidChanged();
     void onlyRemindersChanged();
+    void onlySearchResultsChanged();
 
 private:
     QString m_filterNotebookGuid;
     bool m_onlyReminders;
-
+    bool m_onlySearchResults;
 };
 
 #endif // NOTES_H

=== modified file 'src/plugin/Evernote/notesstore.cpp'
--- src/plugin/Evernote/notesstore.cpp	2013-12-14 00:04:26 +0000
+++ src/plugin/Evernote/notesstore.cpp	2013-12-14 00:04:27 +0000
@@ -168,6 +168,11 @@
         note->setTitle(QString::fromStdString(result.title));
         note->setNotebookGuid(QString::fromStdString(result.notebookGuid));
         note->setReminderOrder(result.attributes.reminderOrder);
+
+        if (!results.searchedWords.empty()) {
+            note->setIsSearchResult(true);
+        }
+
         QDateTime reminderDoneTime;
         if (result.attributes.reminderDoneTime > 0) {
             reminderDoneTime = QDateTime::fromMSecsSinceEpoch(result.attributes.reminderDoneTime);
@@ -318,6 +323,18 @@
     EvernoteConnection::instance()->enqueue(job);
 }
 
+void NotesStore::findNotes(const QString &searchWords)
+{
+    foreach (Note *note, m_notes) {
+        note->setIsSearchResult(false);
+    }
+    emit dataChanged(index(0), index(m_notes.count()), QVector<int>() << RoleIsSearchResult);
+
+    FetchNotesJob *job = new FetchNotesJob(QString(), searchWords);
+    connect(job, &FetchNotesJob::jobDone, this, &NotesStore::fetchNotesJobDone);
+    EvernoteConnection::instance()->enqueue(job);
+}
+
 void NotesStore::deleteNoteJobDone(EvernoteConnection::ErrorCode errorCode, const QString &errorMessage, const QString &guid)
 {
     if (errorCode != EvernoteConnection::ErrorCodeNoError) {

=== modified file 'src/plugin/Evernote/notesstore.h'
--- src/plugin/Evernote/notesstore.h	2013-12-14 00:04:26 +0000
+++ src/plugin/Evernote/notesstore.h	2013-12-14 00:04:27 +0000
@@ -36,7 +36,8 @@
         RoleReminder,
         RoleReminderTime,
         RoleReminderDone,
-        RoleReminderDoneTime
+        RoleReminderDoneTime,
+        RoleIsSearchResult
     };
 
     ~NotesStore();
@@ -53,6 +54,7 @@
     Q_INVOKABLE void createNote(const QString &title, const QString &notebookGuid, const QString &content);
     Q_INVOKABLE void saveNote(const QString &guid);
     Q_INVOKABLE void deleteNote(const QString &guid);
+    Q_INVOKABLE void findNotes(const QString &searchWords);
 
     QList<Notebook*> notebooks() const;
     Notebook* notebook(const QString &guid);