summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/listener.cpp2
-rw-r--r--examples/dummyresource/resourcefactory.cpp5
-rw-r--r--examples/maildirresource/maildirresource.cpp6
-rw-r--r--tests/dummyresourcetest.cpp15
4 files changed, 22 insertions, 6 deletions
diff --git a/common/listener.cpp b/common/listener.cpp
index d2fa266..ed6f305 100644
--- a/common/listener.cpp
+++ b/common/listener.cpp
@@ -237,7 +237,7 @@ void Listener::processCommand(int commandId, uint messageId, const QByteArray &c
237 job = job.then<void>(loadResource()->processAllMessages()); 237 job = job.then<void>(loadResource()->processAllMessages());
238 } 238 }
239 job.then<void>([callback, timer]() { 239 job.then<void>([callback, timer]() {
240 Trace() << "Sync took " << timer->elapsed(); 240 Trace() << "Sync took " << Sink::Log::TraceTime(timer->elapsed());
241 callback(true); 241 callback(true);
242 }).exec(); 242 }).exec();
243 return; 243 return;
diff --git a/examples/dummyresource/resourcefactory.cpp b/examples/dummyresource/resourcefactory.cpp
index 36866ec..48858da 100644
--- a/examples/dummyresource/resourcefactory.cpp
+++ b/examples/dummyresource/resourcefactory.cpp
@@ -95,12 +95,17 @@ Sink::ApplicationDomain::Folder::Ptr DummyResource::createFolder(const QByteArra
95 95
96void DummyResource::synchronize(const QByteArray &bufferType, const QMap<QString, QMap<QString, QVariant> > &data, Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, DomainTypeAdaptorFactoryInterface &adaptorFactory, std::function<Sink::ApplicationDomain::ApplicationDomainType::Ptr(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &)> createEntity) 96void DummyResource::synchronize(const QByteArray &bufferType, const QMap<QString, QMap<QString, QVariant> > &data, Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, DomainTypeAdaptorFactoryInterface &adaptorFactory, std::function<Sink::ApplicationDomain::ApplicationDomainType::Ptr(const QByteArray &ridBuffer, const QMap<QString, QVariant> &data, Sink::Storage::Transaction &)> createEntity)
97{ 97{
98 auto time = QSharedPointer<QTime>::create();
99 time->start();
98 //TODO find items to remove 100 //TODO find items to remove
101 int count = 0;
99 for (auto it = data.constBegin(); it != data.constEnd(); it++) { 102 for (auto it = data.constBegin(); it != data.constEnd(); it++) {
103 count++;
100 const auto remoteId = it.key().toUtf8(); 104 const auto remoteId = it.key().toUtf8();
101 auto entity = createEntity(remoteId, it.value(), synchronizationTransaction); 105 auto entity = createEntity(remoteId, it.value(), synchronizationTransaction);
102 createOrModify(transaction, synchronizationTransaction, adaptorFactory, bufferType, remoteId, *entity); 106 createOrModify(transaction, synchronizationTransaction, adaptorFactory, bufferType, remoteId, *entity);
103 } 107 }
108 Trace() << "Sync of " << count << " entities of type " << bufferType << " done." << Sink::Log::TraceTime(time->elapsed());
104} 109}
105 110
106KAsync::Job<void> DummyResource::synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore) 111KAsync::Job<void> DummyResource::synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore)
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index d5cc24b..6fd70a0 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -135,6 +135,8 @@ void MaildirResource::synchronizeFolders(Sink::Storage::Transaction &transaction
135void MaildirResource::synchronizeMails(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, const QString &path) 135void MaildirResource::synchronizeMails(Sink::Storage::Transaction &transaction, Sink::Storage::Transaction &synchronizationTransaction, const QString &path)
136{ 136{
137 Trace() << "Synchronizing mails" << path; 137 Trace() << "Synchronizing mails" << path;
138 auto time = QSharedPointer<QTime>::create();
139 time->start();
138 const QByteArray bufferType = ENTITY_TYPE_MAIL; 140 const QByteArray bufferType = ENTITY_TYPE_MAIL;
139 141
140 KPIM::Maildir maildir(path, true); 142 KPIM::Maildir maildir(path, true);
@@ -165,7 +167,9 @@ void MaildirResource::synchronizeMails(Sink::Storage::Transaction &transaction,
165 } 167 }
166 ); 168 );
167 169
170 int count = 0;
168 while (entryIterator->hasNext()) { 171 while (entryIterator->hasNext()) {
172 count++;
169 const QString filePath = QDir::fromNativeSeparators(entryIterator->next()); 173 const QString filePath = QDir::fromNativeSeparators(entryIterator->next());
170 const QString fileName = entryIterator->fileName(); 174 const QString fileName = entryIterator->fileName();
171 const auto remoteId = filePath.toUtf8(); 175 const auto remoteId = filePath.toUtf8();
@@ -192,6 +196,8 @@ void MaildirResource::synchronizeMails(Sink::Storage::Transaction &transaction,
192 196
193 createOrModify(transaction, synchronizationTransaction, *mMailAdaptorFactory, bufferType, remoteId, mail); 197 createOrModify(transaction, synchronizationTransaction, *mMailAdaptorFactory, bufferType, remoteId, mail);
194 } 198 }
199 Trace() << "Synchronized " << count << " mails in " << listingPath << Sink::Log::TraceTime(time->elapsed());
200
195} 201}
196 202
197KAsync::Job<void> MaildirResource::synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore) 203KAsync::Job<void> MaildirResource::synchronizeWithSource(Sink::Storage &mainStore, Sink::Storage &synchronizationStore)
diff --git a/tests/dummyresourcetest.cpp b/tests/dummyresourcetest.cpp
index c5b2f30..bfa4885 100644
--- a/tests/dummyresourcetest.cpp
+++ b/tests/dummyresourcetest.cpp
@@ -19,6 +19,9 @@
19class DummyResourceTest : public QObject 19class DummyResourceTest : public QObject
20{ 20{
21 Q_OBJECT 21 Q_OBJECT
22
23 QTime time;
24
22private Q_SLOTS: 25private Q_SLOTS:
23 void initTestCase() 26 void initTestCase()
24 { 27 {
@@ -29,16 +32,18 @@ private Q_SLOTS:
29 ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy"); 32 ResourceConfig::addResource("org.kde.dummy.instance1", "org.kde.dummy");
30 } 33 }
31 34
32 void cleanup()
33 {
34 Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
35 }
36
37 void init() 35 void init()
38 { 36 {
39 qDebug(); 37 qDebug();
40 qDebug() << "-----------------------------------------"; 38 qDebug() << "-----------------------------------------";
41 qDebug(); 39 qDebug();
40 time.start();
41 }
42
43 void cleanup()
44 {
45 qDebug() << "Test took " << time.elapsed();
46 Sink::Store::removeDataFromDisk(QByteArray("org.kde.dummy.instance1")).exec().waitForFinished();
42 } 47 }
43 48
44 void testProperty() 49 void testProperty()