Merge lp:~renatofilho/sync-monitor/calendar-start-date into lp:sync-monitor

[Renato Araujo Oliveira Filho]

Use the new "syncInterval" filter to limit the number of events retrieved on the first calendar sync.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:41
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/93/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/93/rebuild

review: Approve (continuous-integration)

[lp:~renatofilho/sync-monitor/calendar-start-date]

42. By Renato Araujo Oliveira Filho on 2014-11-20

Used "syncInterval" instead of "startDate" for calendar sync filter.

Use 90 days as interval.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/sync-monitor-ci/95/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-armhf-ci/6/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/sync-monitor-vivid-i386-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/sync-monitor-ci/95/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'src/sync-configure.cpp'
--- src/sync-configure.cpp	2014-04-15 22:20:40 +0000
+++ src/sync-configure.cpp	2014-11-20 19:03:27 +0000
@@ -162,14 +162,22 @@
     config[""]["maxlogdirs"] = "2";
 
     QString expectedSource;
+    bool isCalendar = false;
     if (serviceName == CONTACTS_SERVICE_NAME) {
         expectedSource = QString("source/addressbook");
     } else if (serviceName == CALENDAR_SERVICE_NAME) {
+        isCalendar = true;
         expectedSource = QString("source/calendar");
     } else {
         expectedSource = QString("source/%1").arg(serviceName);
     }
 
+    if (isCalendar) {
+        // limit the number of retrieve events to optimize the initial query
+        // 3 months before
+        config[expectedSource]["syncInterval"] = "90";
+    }
+
     bool result = session->saveConfig(targetName, config);
     if (!result) {
         qWarning() << "Fail to save account client config";
@@ -238,6 +246,7 @@
 
     config[sourceFullName]["sync"] = syncMode;
 
+
     bool result = session->saveConfig(targetName, config);
     if (!result) {
         qWarning() << "Fail to save account client config";