Updated synchronization progress implementation.

Wino.Core/Synchronizers/BaseSynchronizer.cs

@@ -27,6 +27,7 @@ public abstract partial class BaseSynchronizer<TBaseRequest> : ObservableObject,
     private readonly ConcurrentDictionary<Guid, byte> _pendingCalendarOperationIds = new();
     private readonly ConcurrentQueue<SynchronizationIssue> _capturedSynchronizationIssues = new();
     protected readonly IMessenger Messenger;
+    protected SynchronizationProgressCategory CurrentSynchronizationProgressCategory { get; set; } = SynchronizationProgressCategory.Mail;
     
     public MailAccount Account { get; }
 
@@ -44,7 +45,8 @@ public abstract partial class BaseSynchronizer<TBaseRequest> : ObservableObject,
                 value, 
                 TotalItemsToSync, 
                 RemainingItemsToSync, 
-                SynchronizationStatus));
+                SynchronizationStatus,
+                CurrentSynchronizationProgressCategory));
         }
     }
 
@@ -75,8 +77,8 @@ public abstract partial class BaseSynchronizer<TBaseRequest> : ObservableObject,
     {
         get
         {
-            if (TotalItemsToSync == 0 || RemainingItemsToSync == 0)
-                return -1; // Indeterminate
+            if (TotalItemsToSync <= 0)
+                return 0;
 
             return ((double)(TotalItemsToSync - RemainingItemsToSync) / TotalItemsToSync) * 100;
         }
@@ -118,7 +120,8 @@ public abstract partial class BaseSynchronizer<TBaseRequest> : ObservableObject,
             State, 
             TotalItemsToSync, 
             RemainingItemsToSync, 
-            SynchronizationStatus));
+            SynchronizationStatus,
+            CurrentSynchronizationProgressCategory));
     }
 
     /// <summary>

Wino.Core/Synchronizers/GmailSynchronizer.cs

@@ -22,6 +22,7 @@ using Microsoft.IdentityModel.Tokens;
 using MimeKit;
 using MoreLinq;
 using Serilog;
+using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
@@ -388,7 +389,7 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
                 } while (!string.IsNullOrEmpty(pageToken));
 
                 _logger.Information("Folder {FolderName}: Downloaded {Count} messages", folder.FolderName, folderDownloaded);
-                UpdateSyncProgress(0, 0, $"Downloaded {totalMessagesDownloaded} messages");
+                UpdateSyncProgress(totalFolders, 0, Translator.SyncAction_SynchronizingAccount);
             }
 
             _logger.Information("Initial sync completed. Downloaded {Count} unique messages for {Name}", downloadedMessageIds.Count, Account.Name);
@@ -521,8 +522,16 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
             .Where(c => c.IsSynchronizationEnabled)
             .ToList();
 
-        foreach (var calendar in localCalendars)
+        var totalCalendars = localCalendars.Count;
+        if (totalCalendars > 0)
         {
+            UpdateSyncProgress(totalCalendars, totalCalendars, Translator.SyncAction_SynchronizingCalendarEvents);
+        }
+
+        for (int i = 0; i < totalCalendars; i++)
+        {
+            var calendar = localCalendars[i];
+
             try
             {
                 var request = _calendarService.Events.List(calendar.RemoteCalendarId);
@@ -602,6 +611,7 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
                 }
 
                 await _gmailChangeProcessor.UpdateAccountCalendarAsync(calendar).ConfigureAwait(false);
+                UpdateSyncProgress(totalCalendars, totalCalendars - (i + 1), Translator.SyncAction_SynchronizingCalendarEvents);
             }
             catch (OperationCanceledException)
             {
@@ -624,6 +634,8 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
 
                 if (!errorContext.CanContinueSync)
                     throw;
+
+                UpdateSyncProgress(totalCalendars, totalCalendars - (i + 1), Translator.SyncAction_SynchronizingCalendarEvents);
             }
         }
 

Wino.Core/Synchronizers/ImapSynchronizer.cs

@@ -11,6 +11,7 @@ using MailKit.Net.Imap;
 using MailKit.Search;
 using MimeKit;
 using Serilog;
+using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Mail;
 using Wino.Core.Domain.Entities.Shared;
@@ -1192,8 +1193,16 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
         var periodStartUtc = DateTimeOffset.UtcNow.AddYears(-1);
         var periodEndUtc = DateTimeOffset.UtcNow.AddYears(2);
 
-        foreach (var localCalendar in localCalendars)
+        var totalCalendars = localCalendars.Count;
+        if (totalCalendars > 0)
         {
+            UpdateSyncProgress(totalCalendars, totalCalendars, Translator.SyncAction_SynchronizingCalendarEvents);
+        }
+
+        for (int i = 0; i < totalCalendars; i++)
+        {
+            var localCalendar = localCalendars[i];
+
             cancellationToken.ThrowIfCancellationRequested();
 
             if (!remoteCalendarsById.TryGetValue(localCalendar.RemoteCalendarId, out var remoteCalendar))
@@ -1265,6 +1274,7 @@ public class ImapSynchronizer : WinoSynchronizer<ImapRequest, ImapMessageCreatio
 
             localCalendar.SynchronizationDeltaToken = remoteToken;
             await _imapChangeProcessor.UpdateAccountCalendarAsync(localCalendar).ConfigureAwait(false);
+            UpdateSyncProgress(totalCalendars, totalCalendars - (i + 1), Translator.SyncAction_SynchronizingCalendarEvents);
         }
 
         return CalendarSynchronizationResult.Empty;

Wino.Core/Synchronizers/OutlookSynchronizer.cs

@@ -2320,8 +2320,16 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
 
         // TODO: Maybe we can batch each calendar?
 
-        foreach (var calendar in localCalendars)
+        var totalCalendars = localCalendars.Count;
+        if (totalCalendars > 0)
         {
+            UpdateSyncProgress(totalCalendars, totalCalendars, Translator.SyncAction_SynchronizingCalendarEvents);
+        }
+
+        for (int i = 0; i < totalCalendars; i++)
+        {
+            var calendar = localCalendars[i];
+
             try
             {
                 bool isInitialSync = string.IsNullOrEmpty(calendar.SynchronizationDeltaToken);
@@ -2440,6 +2448,8 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
 
                     await _outlookChangeProcessor.UpdateCalendarDeltaSynchronizationToken(calendar.Id, deltaToken).ConfigureAwait(false);
                 }
+
+                UpdateSyncProgress(totalCalendars, totalCalendars - (i + 1), Translator.SyncAction_SynchronizingCalendarEvents);
             }
             catch (OperationCanceledException)
             {
@@ -2462,6 +2472,8 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
 
                 if (!errorContext.CanContinueSync)
                     throw;
+
+                UpdateSyncProgress(totalCalendars, totalCalendars - (i + 1), Translator.SyncAction_SynchronizingCalendarEvents);
             }
         }
 

Wino.Core/Synchronizers/WinoSynchronizer.cs

@@ -147,6 +147,7 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
 
             if (shouldExecuteRequests && changeRequestQueue.Any())
             {
+                CurrentSynchronizationProgressCategory = SynchronizationProgressCategory.Mail;
                 State = AccountSynchronizerState.ExecutingRequests;
 
                 List<IRequestBundle<TBaseRequest>> nativeRequests = new();
@@ -264,6 +265,7 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
             await synchronizationSemaphore.WaitAsync(activeSynchronizationCancellationToken);
 
             // Set indeterminate progress for initial state
+            CurrentSynchronizationProgressCategory = SynchronizationProgressCategory.Mail;
             UpdateSyncProgress(0, 0, "Synchronizing...");
 
             State = AccountSynchronizerState.Synchronizing;
@@ -388,6 +390,7 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
             if (shouldExecuteRequests)
             {
                 calendarRequestsWereExecuting = true;
+                CurrentSynchronizationProgressCategory = SynchronizationProgressCategory.Calendar;
                 State = AccountSynchronizerState.ExecutingRequests;
 
                 List<IRequestBundle<TBaseRequest>> nativeRequests = new();
@@ -482,6 +485,7 @@ public abstract class WinoSynchronizer<TBaseRequest, TMessageType, TCalendarEven
                 await Task.Delay(maxExecutionDelay, cancellationToken);
             }
 
+            CurrentSynchronizationProgressCategory = SynchronizationProgressCategory.Calendar;
             var synchronizationResult = await SynchronizeCalendarEventsInternalAsync(options, cancellationToken);
             return FinalizeCalendarResult(synchronizationResult);
         }