Merge pull request #223 from boo-yee/develop

Comment out the tedious resource synchronization code.
robert7 · May 7, 2024 · 4e62724 · 4e62724
2 parents e7ed12b + a7c4ee4
commit 4e62724
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/src/communication/communicationmanager.cpp b/src/communication/communicationmanager.cpp
@@ -1037,25 +1037,25 @@ void CommunicationManager::processSyncChunk(SyncChunk &chunk, QString token) {
     if (chunk.notes.isSet())
         chunk.notes = notes;
 
-    QList<Resource> resourceData;
-    QLOG_DEBUG() << "All notes retrieved.  Getting resources";
-    QList<Resource> resources;
-    if (chunk.resources.isSet())
-        resources = chunk.resources;
-    for (int i = 0; i < resources.size(); i++) {
-        QLOG_TRACE() << "Fetching chunk resource item: " << i << ": " << resources[i].guid;
-        Resource r;
-        r = noteStore->getResource(resources[i].guid, true, true, true, true, requestContext);
-        QLOG_TRACE() << "Resource retrieved";
-        resourceData.append(r);
-    }
-    if (chunk.resources.isSet())
-        chunk.resources = resourceData;
-    QLOG_DEBUG() << "Getting ink notes";
-    if (resources.size() > 0) {
-        QLOG_TRACE() << "Checking for ink notes";
-        checkForInkNotes(resources, "", token);
-    }
+//    QList<Resource> resourceData;
+//    QLOG_DEBUG() << "All notes retrieved.  Getting resources";
+//    QList<Resource> resources;
+//    if (chunk.resources.isSet())
+//        resources = chunk.resources;
+//    for (int i = 0; i < resources.size(); i++) {
+//        QLOG_TRACE() << "Fetching chunk resource item: " << i << ": " << resources[i].guid;
+//        Resource r;
+//        r = noteStore->getResource(resources[i].guid, true, true, true, true, requestContext);
+//        QLOG_TRACE() << "Resource retrieved";
+//        resourceData.append(r);
+//    }
+//    if (chunk.resources.isSet())
+//        chunk.resources = resourceData;
+//    QLOG_DEBUG() << "Getting ink notes";
+//    if (resources.size() > 0) {
+//        QLOG_TRACE() << "Checking for ink notes";
+//        checkForInkNotes(resources, "", token);
+//    }
 }
 
 

diff --git a/src/threads/syncrunner.cpp b/src/threads/syncrunner.cpp
@@ -265,7 +265,7 @@ bool SyncRunner::syncRemoteToLocal(qint32 updateCount) {
 
     comm->loadTagGuidMap();
     more = true;
-    chunkSize = 50;
+    chunkSize = 200;
     updateSequenceNumber = startingSequenceNumber;
     UserTable userTable(db);