Merge lp:~renatofilho/qtorganizer5-eds/fix-1373945 into lp:qtorganizer5-eds

[Renato Araujo Oliveira Filho]

Implemented support to change the default collection using 'collection-default' meta data.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:89
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/248/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/55/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/55

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/248/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/qtorganizer5-eds/fix-1373945]

90. By Renato Araujo Oliveira Filho on 2016-03-14

Trunk merged.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:90
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/249/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/56

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/249/rebuild

review: Approve (continuous-integration)

[Arthur Mello (artmello)]

lgtm, just added a single diff inline comment.

review: Needs Information

[lp:~renatofilho/qtorganizer5-eds/fix-1373945]

91. By Renato Araujo Oliveira Filho on 2016-03-15

Re-use 'registry' variable instead of declare a new one.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:91
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/250/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-vivid-i386-ci/57

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/250/rebuild

review: Approve (continuous-integration)

[Arthur Mello (artmello)]

lgtm

review: Approve

=== modified file 'organizer/qorganizer-eds-savecollectionrequestdata.cpp'
--- organizer/qorganizer-eds-savecollectionrequestdata.cpp	2014-10-06 14:07:54 +0000
+++ organizer/qorganizer-eds-savecollectionrequestdata.cpp	2016-03-15 13:05:25 +0000
@@ -72,7 +72,13 @@
 
     for(; i != 0; i = i->next) {
         ESource *source = E_SOURCE(i->data);
-        QOrganizerCollection collection = parent()->d->m_sourceRegistry->insert(source);
+        SourceRegistry *registry = parent()->d->m_sourceRegistry;
+        Q_ASSERT(registry);
+        QOrganizerCollection collection = registry->insert(source);
+        bool isDefault = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(source), "is-default"));
+        if (isDefault) {
+            registry->setDefaultCollection(collection);
+        }
         m_results.insert(m_sources.key(source), collection);
         m_changeSet.insertAddedCollection(collection.id());
     }
@@ -86,8 +92,16 @@
 
     if (error == QOrganizerManager::NoError) {
         QOrganizerEDSCollectionEngineId *id;
-        QOrganizerCollection collection = SourceRegistry::parseSource(source, &id);
+        bool isDefault = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(source), "is-default"));
+        QOrganizerCollection collection = SourceRegistry::parseSource(source, isDefault, &id);
         m_results.insert(index, collection);
+
+        if (isDefault) {
+            SourceRegistry *registry = parent()->d->m_sourceRegistry;
+            Q_ASSERT(registry);
+            registry->setDefaultCollection(collection);
+        }
+
         m_changeSet.insertChangedCollection(collection.id());
     } else {
         m_errorMap.insert(index, error);
@@ -195,6 +209,10 @@
             bool selected = collection.extendedMetaData(COLLECTION_SELECTED_METADATA).toBool();
             e_source_selectable_set_selected(E_SOURCE_SELECTABLE(extCalendar), selected);
 
+            // default collection
+            bool isDefault = collection.extendedMetaData(COLLECTION_DEFAULT_METADATA).toBool();
+            g_object_set_data(G_OBJECT(source), "is-default", GINT_TO_POINTER(isDefault));
+
             m_sources.insert(index, source);
             if (isNew) {
                 m_sourcesToCreate.insert(index, source);

=== modified file 'organizer/qorganizer-eds-source-registry.cpp'
--- organizer/qorganizer-eds-source-registry.cpp	2016-01-11 21:15:32 +0000
+++ organizer/qorganizer-eds-source-registry.cpp	2016-03-15 13:05:25 +0000
@@ -12,7 +12,8 @@
       m_sourceRemovedId(0),
       m_sourceChangedId(0),
       m_sourceEnabledId(0),
-      m_sourceDisabledId(0)
+      m_sourceDisabledId(0),
+      m_defaultSourceChangedId(0)
 {
 }
 
@@ -26,6 +27,7 @@
         g_signal_handler_disconnect(m_sourceRegistry, m_sourceChangedId);
         g_signal_handler_disconnect(m_sourceRegistry, m_sourceEnabledId);
         g_signal_handler_disconnect(m_sourceRegistry, m_sourceDisabledId);
+        g_signal_handler_disconnect(m_sourceRegistry, m_defaultSourceChangedId);
 
         g_clear_object(&m_sourceRegistry);
 
@@ -73,7 +75,10 @@
                      "source-removed",
                      (GCallback) SourceRegistry::onSourceRemoved,
                      this);
-
+    m_defaultSourceChangedId =  g_signal_connect(m_sourceRegistry,
+                     "notify::default-calendar",
+                      G_CALLBACK(SourceRegistry::onDefaultCalendarChanged),
+                      this);
 
     // We use calendar as default source, if you are trying to use other source type
     // you need to set the item source id manually
@@ -82,9 +87,10 @@
     GList *sources = e_source_registry_list_sources(m_sourceRegistry, 0);
     for(int i = 0, iMax = g_list_length(sources); i < iMax; i++) {
         ESource *source = E_SOURCE(g_list_nth_data(sources, i));
+        bool isDefault = e_source_equal(defaultCalendarSource, source);
 
-        QOrganizerCollection collection = registerSource(source);
-        if (e_source_equal(defaultCalendarSource, source)) {
+        QOrganizerCollection collection = registerSource(source, isDefault);
+        if (isDefault) {
             m_defaultCollection = collection;
         }
     }
@@ -102,6 +108,19 @@
     return m_defaultCollection;
 }
 
+void SourceRegistry::setDefaultCollection(QtOrganizer::QOrganizerCollection &collection)
+{
+    if (m_defaultCollection.id() == collection.id())
+        return;
+
+    QOrganizerEDSCollectionEngineId *eid = m_collectionsMap.value(collection.id().toString(), 0);
+    if (eid && eid->m_esource) {
+        e_source_registry_set_default_calendar(m_sourceRegistry, eid->m_esource);
+    } else {
+        qWarning() << "Fail to set default collection" << collection.id();
+    }
+}
+
 QOrganizerCollection SourceRegistry::collection(const QString &collectionId) const
 {
     return m_collections.value(collectionId);
@@ -228,7 +247,7 @@
     return QString();
 }
 
-QOrganizerCollection SourceRegistry::registerSource(ESource *source)
+QOrganizerCollection SourceRegistry::registerSource(ESource *source, bool isDefault)
 {
     QString collectionId = findCollection(source);
     if (collectionId.isEmpty()) {
@@ -240,7 +259,7 @@
 
         if ( isEnabled && (isCalendar || isTaskList || isMemoList || isAlarms)) {
             QOrganizerEDSCollectionEngineId *edsId = 0;
-            QOrganizerCollection collection = parseSource(source, &edsId);
+            QOrganizerCollection collection = parseSource(source, isDefault, &edsId);
             QString collectionId = collection.id().toString();
 
             if (!m_collectionsMap.contains(collectionId)) {
@@ -262,7 +281,23 @@
 
 }
 
+void SourceRegistry::updateDefaultCollection(QOrganizerCollection *collection)
+{
+    if (m_defaultCollection.id() != collection->id()) {
+        QString oldDefaultCollectionId = m_defaultCollection.id().toString();
+
+        collection->setExtendedMetaData(COLLECTION_DEFAULT_METADATA, true);
+        m_defaultCollection = *collection;
+        Q_EMIT sourceUpdated(m_defaultCollection.id().toString());
+
+        QOrganizerCollection &old = m_collections[oldDefaultCollectionId];
+        old.setExtendedMetaData(COLLECTION_DEFAULT_METADATA, false);
+        Q_EMIT sourceUpdated(oldDefaultCollectionId);
+    }
+}
+
 QOrganizerCollection SourceRegistry::parseSource(ESource *source,
+                                                 bool isDefault,
                                                  QOrganizerEDSCollectionEngineId **edsId)
 {
     *edsId = new QOrganizerEDSCollectionEngineId(source);
@@ -270,7 +305,7 @@
     QOrganizerCollection collection;
 
     collection.setId(id);
-    updateCollection(&collection, source);
+    updateCollection(&collection, isDefault, source);
     return collection;
 }
 
@@ -290,7 +325,9 @@
     QString collectionId = self->findCollection(source);
     if (!collectionId.isEmpty() && self->m_collections.contains(collectionId)) {
         QOrganizerCollection &collection = self->m_collections[collectionId];
-        self->updateCollection(&collection, source, self->m_clients.value(collectionId));
+        self->updateCollection(&collection,
+                               self->m_defaultCollection.id() == collection.id(),
+                               source, self->m_clients.value(collectionId));
         Q_EMIT self->sourceUpdated(collectionId);
     } else {
         qWarning() << "Source changed not found";
@@ -305,7 +342,27 @@
     self->remove(source);
 }
 
+void SourceRegistry::onDefaultCalendarChanged(ESourceRegistry *registry,
+                                              GParamSpec *pspec,
+                                              SourceRegistry *self)
+{
+    Q_UNUSED(registry);
+    Q_UNUSED(pspec);
+
+    ESource *defaultCalendar = e_source_registry_ref_default_calendar(self->m_sourceRegistry);
+    if (!defaultCalendar)
+        return;
+
+    QString collectionId = self->findCollection(defaultCalendar);
+    if (!collectionId.isEmpty()) {
+        QOrganizerCollection &collection = self->m_collections[collectionId];
+        self->updateDefaultCollection(&collection);
+    }
+    g_object_unref(defaultCalendar);
+}
+
 void SourceRegistry::updateCollection(QOrganizerCollection *collection,
+                                      bool isDefault,
                                       ESource *source,
                                       EClient *client)
 {
@@ -341,4 +398,7 @@
         writable = writable && !e_client_is_readonly(client);
     }
     collection->setExtendedMetaData(COLLECTION_READONLY_METADATA, !writable);
+
+    // default
+    collection->setExtendedMetaData(COLLECTION_DEFAULT_METADATA, isDefault);
 }

=== modified file 'organizer/qorganizer-eds-source-registry.h'
--- organizer/qorganizer-eds-source-registry.h	2016-01-11 21:15:32 +0000
+++ organizer/qorganizer-eds-source-registry.h	2016-03-15 13:05:25 +0000
@@ -31,6 +31,7 @@
 #define COLLECTION_CALLENDAR_TYPE_METADATA  "collection-type"
 #define COLLECTION_SELECTED_METADATA        "collection-selected"
 #define COLLECTION_READONLY_METADATA        "collection-readonly"
+#define COLLECTION_DEFAULT_METADATA         "collection-default"
 
 class SourceRegistry : public QObject
 {
@@ -42,6 +43,7 @@
     ESourceRegistry *object() const;
     void load();
     QtOrganizer::QOrganizerCollection defaultCollection() const;
+    void setDefaultCollection(QtOrganizer::QOrganizerCollection &collection);
     QtOrganizer::QOrganizerCollection collection(const QString &collectionId) const;
     QList<QtOrganizer::QOrganizerCollection> collections() const;
     QStringList collectionsIds() const;
@@ -56,6 +58,7 @@
     void clear();
 
     static QtOrganizer::QOrganizerCollection parseSource(ESource *source,
+                                                         bool isDefault,
                                                          QOrganizerEDSCollectionEngineId **edsId);
 
 Q_SIGNALS:
@@ -77,10 +80,13 @@
     int m_sourceChangedId;
     int m_sourceEnabledId;
     int m_sourceDisabledId;
+    int m_defaultSourceChangedId;
 
     QString findCollection(ESource *source) const;
-    QtOrganizer::QOrganizerCollection registerSource(ESource *source);
+    QtOrganizer::QOrganizerCollection registerSource(ESource *source, bool isDefault = false);
+    void updateDefaultCollection(QtOrganizer::QOrganizerCollection *collection);
     static void updateCollection(QtOrganizer::QOrganizerCollection *collection,
+                                 bool isDefault,
                                  ESource *source,
                                  EClient *client = 0);
 
@@ -95,6 +101,9 @@
     static void onSourceRemoved(ESourceRegistry *registry,
                                 ESource *source,
                                 SourceRegistry *self);
+    static void onDefaultCalendarChanged(ESourceRegistry *registry,
+                                         GParamSpec *pspec,
+                                         SourceRegistry *self);
 };
 
 #endif

=== modified file 'tests/unittest/collections-test.cpp'
--- tests/unittest/collections-test.cpp	2016-01-11 21:15:32 +0000
+++ tests/unittest/collections-test.cpp	2016-03-15 13:05:25 +0000
@@ -297,6 +297,60 @@
             }
         }
     }
+
+    void testCreateNewDefaultCollection()
+    {
+        static QString newCollection = uniqueCollectionName();
+
+        // Create a new default collection
+        QOrganizerCollection collection;
+        QtOrganizer::QOrganizerManager::Error error;
+        collection.setMetaData(QOrganizerCollection::KeyName, newCollection);
+        collection.setMetaData(QOrganizerCollection::KeyColor, QStringLiteral("red"));
+        collection.setExtendedMetaData(QStringLiteral("collection-selected"), true);
+        collection.setExtendedMetaData(QStringLiteral("collection-default"), true);
+
+        QSignalSpy createdCollection(m_engineRead, SIGNAL(collectionsAdded(QList<QOrganizerCollectionId>)));
+        QVERIFY(m_engineWrite->saveCollection(&collection, &error));
+        // create collection
+        QTRY_COMPARE(createdCollection.count(), 1);
+
+        // wait collection to became the default one
+        QTRY_COMPARE_WITH_TIMEOUT(m_engineRead->defaultCollection(0).id(), collection.id(), 5000);
+    }
+
+    void testUpdateDefaultCollection()
+    {
+        static QString newCollectionId = uniqueCollectionName();
+
+        // store current default collection
+        QOrganizerCollection defaultCollection = m_engineRead->defaultCollection(0);
+
+        // Create a collection
+        QOrganizerCollection collection;
+        QtOrganizer::QOrganizerManager::Error error;
+        collection.setMetaData(QOrganizerCollection::KeyName, newCollectionId);
+        QSignalSpy createCollection(m_engineRead, SIGNAL(collectionsAdded(QList<QOrganizerCollectionId>)));
+        QVERIFY(m_engineWrite->saveCollection(&collection, &error));
+        QTRY_COMPARE(createCollection.count(), 1);
+        // wait collection to became writable
+        QTRY_VERIFY_WITH_TIMEOUT(!m_engineRead->collection(collection.id(), 0).extendedMetaData("collection-readonly").toBool(), 5000);
+
+        // make sure that the new collection is not default
+        QOrganizerCollection newCollection = m_engineRead->collection(collection.id(), 0);
+        QCOMPARE(newCollection.extendedMetaData(QStringLiteral("collection-default")).toBool(), false);
+        QVERIFY(newCollection.id() != defaultCollection.id());
+
+        // mark new collection as default
+        QSignalSpy changedCollection(m_engineRead, SIGNAL(collectionsChanged(QList<QOrganizerCollectionId>)));
+        newCollection.setExtendedMetaData(QStringLiteral("collection-default"), true);
+        QVERIFY(m_engineWrite->saveCollection(&newCollection, &error));
+        // old default collection will change, and the new one
+        QTRY_COMPARE(changedCollection.count() , 3);
+
+        // wait collection to became the default one
+        QTRY_COMPARE_WITH_TIMEOUT(m_engineRead->defaultCollection(0).id(), newCollection.id(), 5000);
+    }
 };
 
 const QString CollectionTest::collectionTypePropertyName = QStringLiteral("collection-type");