javier/Wino-Mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gmail calendar actions fix.

Browse Source
This commit is contained in:
Burak Kaan Köse
2026-04-08 13:09:04 +02:00
parent 1567d9fa5e
commit a855d8c8a8
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Wino.Core/Synchronizers/GmailSynchronizer.cs
+12 -16
View File
@@ -10,7 +10,6 @@ using System.Web;
using CommunityToolkit.Mvvm.Messaging; using CommunityToolkit.Mvvm.Messaging;
using Google; using Google;
using Google.Apis.Calendar.v3.Data; using Google.Apis.Calendar.v3.Data;
using Google.Apis.Drive.v3;
using Google.Apis.Gmail.v1; using Google.Apis.Gmail.v1;
using Google.Apis.Gmail.v1.Data; using Google.Apis.Gmail.v1.Data;
using Google.Apis.Http; using Google.Apis.Http;
@@ -60,7 +59,7 @@ public partial class GmailSynchronizerJsonContext : JsonSerializerContext;
/// Gmail synchronizer implementation using Gmail History API for efficient incremental sync. /// Gmail synchronizer implementation using Gmail History API for efficient incremental sync.
/// ///
/// SYNCHRONIZATION STRATEGY: /// SYNCHRONIZATION STRATEGY:
/// - Initial sync: Downloads up to 1500 messages PER FOLDER with metadata only. /// - Initial sync: Downloads up to 15c00 messages PER FOLDER with metadata only.
/// Uses a global HashSet to track downloaded message IDs, avoiding duplicate downloads /// Uses a global HashSet to track downloaded message IDs, avoiding duplicate downloads
/// when messages have multiple labels. Each folder gets its full quota of messages. /// when messages have multiple labels. Each folder gets its full quota of messages.
/// - Incremental sync: Uses ONLY History API to get changes since last sync. /// - Incremental sync: Uses ONLY History API to get changes since last sync.
@@ -1668,32 +1667,29 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
bundle.UIChangeRequest?.ApplyUIChanges(); bundle.UIChangeRequest?.ApplyUIChanges();
} }
// Now batch and execute the network requests. // Batch requests per Google service instance. Calendar requests must be queued against
var batchedBundles = batchedRequests.Batch((int)MaximumAllowedBatchRequestSize); // CalendarService, otherwise Gmail's batch endpoint will reject Calendar REST paths.
var bundleCount = batchedBundles.Count(); var requestGroups = batchedRequests.GroupBy(bundle => bundle.NativeRequest.Service);
for (int i = 0; i < bundleCount; i++) foreach (var requestGroup in requestGroups)
{ {
var bundle = batchedBundles.ElementAt(i); var batchedBundles = requestGroup.Batch((int)MaximumAllowedBatchRequestSize);
var nativeBatchRequest = new BatchRequest(_gmailService);
var bundleRequestCount = bundle.Count();
foreach (var bundle in batchedBundles)
{
var nativeBatchRequest = new BatchRequest(requestGroup.Key);
var bundleTasks = new List<Task>(); var bundleTasks = new List<Task>();
for (int k = 0; k < bundleRequestCount; k++) foreach (var requestBundle in bundle)
{ {
var requestBundle = bundle.ElementAt(k);
// UI changes are already applied above before batching. // UI changes are already applied above before batching.
nativeBatchRequest.Queue<object>(requestBundle.NativeRequest, (content, error, index, message) nativeBatchRequest.Queue<object>(requestBundle.NativeRequest, (content, error, index, message)
=> bundleTasks.Add(ProcessSingleNativeRequestResponseAsync(requestBundle, error, message, cancellationToken))); => bundleTasks.Add(ProcessSingleNativeRequestResponseAsync(requestBundle, error, message, cancellationToken)));
} }
await nativeBatchRequest.ExecuteAsync(cancellationToken).ConfigureAwait(false); await nativeBatchRequest.ExecuteAsync(cancellationToken).ConfigureAwait(false);
await Task.WhenAll(bundleTasks).ConfigureAwait(false);
await Task.WhenAll(bundleTasks); }
} }
} }