Merge lp:~osomon/webbrowser-app/lastVisit into lp:webbrowser-app

[Olivier Tilloy]

Add a 'lastVisit' property to the HistoryDomainModel, update it accordingly, and use it in the HistoryDomainListModel.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:274
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/273/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/1938
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/156
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1943
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/1943/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1657

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webbrowser-app-ci/273/rebuild

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

Looks good and works

review: Approve

=== modified file 'src/Ubuntu/Components/Extras/Browser/history-domain-model.cpp'
--- src/Ubuntu/Components/Extras/Browser/history-domain-model.cpp	2013-08-06 10:18:18 +0000
+++ src/Ubuntu/Components/Extras/Browser/history-domain-model.cpp	2013-08-06 15:52:58 +0000
@@ -40,6 +40,11 @@
 HistoryDomainModel::HistoryDomainModel(QObject* parent)
     : QSortFilterProxyModel(parent)
 {
+    connect(this, SIGNAL(layoutChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint)), SLOT(onModelChanged()));
+    connect(this, SIGNAL(modelReset()), SLOT(onModelChanged()));
+    connect(this, SIGNAL(rowsInserted(QModelIndex, int, int)), SLOT(onModelChanged()));
+    connect(this, SIGNAL(rowsRemoved(QModelIndex, int, int)), SLOT(onModelChanged()));
+    connect(this, SIGNAL(dataChanged(QModelIndex, QModelIndex, QVector<int>)), SLOT(onModelChanged()));
 }
 
 HistoryTimeframeModel* HistoryDomainModel::sourceModel() const
@@ -69,18 +74,28 @@
     }
 }
 
-bool HistoryDomainModel::sourceEntryMatchesDomain(int row, const QModelIndex& parent) const
+const QDateTime& HistoryDomainModel::lastVisit() const
+{
+    return m_lastVisit;
+}
+
+bool HistoryDomainModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
 {
     if (m_domain.isEmpty()) {
         return true;
     }
-    QModelIndex index = sourceModel()->index(row, 0, parent);
+    QModelIndex index = sourceModel()->index(source_row, 0, source_parent);
     QUrl url = sourceModel()->data(index, HistoryModel::Url).toUrl();
     QString domain = DomainUtils::extractTopLevelDomainName(url);
     return (domain.compare(m_domain, Qt::CaseInsensitive) == 0);
 }
 
-bool HistoryDomainModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
+void HistoryDomainModel::onModelChanged()
 {
-    return sourceEntryMatchesDomain(source_row, source_parent);
+    if (rowCount() > 0) {
+        m_lastVisit = data(index(0, 0), HistoryModel::LastVisit).toDateTime();
+    } else {
+        m_lastVisit = QDateTime();
+    }
+    Q_EMIT lastVisitChanged();
 }
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/history-domain-model.h'
--- src/Ubuntu/Components/Extras/Browser/history-domain-model.h	2013-08-06 10:18:18 +0000
+++ src/Ubuntu/Components/Extras/Browser/history-domain-model.h	2013-08-06 15:52:58 +0000
@@ -20,6 +20,7 @@
 #define __HISTORY_DOMAIN_MODEL_H__
 
 // Qt
+#include <QtCore/QDateTime>
 #include <QtCore/QSortFilterProxyModel>
 #include <QtCore/QString>
 
@@ -31,6 +32,7 @@
 
     Q_PROPERTY(HistoryTimeframeModel* sourceModel READ sourceModel WRITE setSourceModel NOTIFY sourceModelChanged)
     Q_PROPERTY(QString domain READ domain WRITE setDomain NOTIFY domainChanged)
+    Q_PROPERTY(QDateTime lastVisit READ lastVisit NOTIFY lastVisitChanged)
 
 public:
     HistoryDomainModel(QObject* parent=0);
@@ -41,11 +43,12 @@
     const QString& domain() const;
     void setDomain(const QString& domain);
 
-    bool sourceEntryMatchesDomain(int row, const QModelIndex& parent) const;
+    const QDateTime& lastVisit() const;
 
 Q_SIGNALS:
     void sourceModelChanged() const;
     void domainChanged() const;
+    void lastVisitChanged() const;
 
 protected:
     // reimplemented from QSortFilterProxyModel
@@ -53,6 +56,10 @@
 
 private:
     QString m_domain;
+    QDateTime m_lastVisit;
+
+private Q_SLOTS:
+    void onModelChanged();
 };
 
 #endif // __HISTORY_DOMAIN_MODEL_H__
 
=== modified file 'src/Ubuntu/Components/Extras/Browser/history-domainlist-model.cpp'
--- src/Ubuntu/Components/Extras/Browser/history-domainlist-model.cpp	2013-08-06 15:25:38 +0000
+++ src/Ubuntu/Components/Extras/Browser/history-domainlist-model.cpp	2013-08-06 15:52:58 +0000
@@ -75,17 +75,7 @@
     case Domain:
         return domain;
     case LastVisit:
-    {
-        // At this point, entries might not have been filtered yet,
-        // so the first entry is not guaranteed to be the one we want.
-        int count = entries->rowCount();
-        for (int i = 0; i < count; ++i) {
-            if (entries->sourceEntryMatchesDomain(i, QModelIndex())) {
-                return entries->data(entries->index(i, 0), HistoryModel::LastVisit).toDateTime();
-            }
-        }
-        return QDateTime();
-    }
+        return entries->lastVisit();
     case Entries:
         return QVariant::fromValue(entries);
     default:
@@ -179,6 +169,7 @@
     connect(model, SIGNAL(layoutChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint)), SLOT(onDomainDataChanged()));
     connect(model, SIGNAL(dataChanged(QModelIndex, QModelIndex)), SLOT(onDomainDataChanged()));
     connect(model, SIGNAL(modelReset()), SLOT(onDomainDataChanged()));
+    connect(model, SIGNAL(lastVisitChanged()), SLOT(onDomainDataChanged()));
     m_domains.insert(domain, model);
 }
 
 
=== modified file 'tests/unittests/history-domainlist-model/tst_HistoryDomainListModelTests.cpp'
--- tests/unittests/history-domainlist-model/tst_HistoryDomainListModelTests.cpp	2013-08-06 10:52:58 +0000
+++ tests/unittests/history-domainlist-model/tst_HistoryDomainListModelTests.cpp	2013-08-06 15:52:58 +0000
@@ -98,7 +98,7 @@
 
         history->add(QUrl("http://example.org/test.html"), "Test page", QUrl());
         QVERIFY(spyRowsInserted.isEmpty());
-        QCOMPARE(spyDataChanged.count(), 1);
+        QVERIFY(!spyDataChanged.isEmpty());
         args = spyDataChanged.takeFirst();
         QCOMPARE(args.at(0).toModelIndex().row(), 1);
         QCOMPARE(args.at(1).toModelIndex().row(), 1);