optimize sync status bar

2024-06-17 00:15:33 +08:00
parent 57493f57cf
commit 35f5355c8e
7 changed files with 179 additions and 71 deletions
@@ -1417,6 +1417,7 @@ export const doActualSync = async (
  db: InternalDBs,
  profiler: Profiler | undefined,
  conflictAction: ConflictActionType,
+  triggerSource: SyncTriggerSourceType,
  callbackSyncProcess?: any
 ) => {
  profiler?.addIndent();
@@ -1524,13 +1525,16 @@ export const doActualSync = async (
          // );

          await callbackSyncProcess?.(
+            triggerSource,
            realCounter,
            realTotalCount,
            key,
            val.decision
          );

-          realCounter += 1;
+          if (val.change === undefined || val.change) {
+            realCounter += 1;
+          }

          await dispatchOperationToActualV3(
            key,
@@ -1743,6 +1747,7 @@ export async function syncer(
        db,
        profiler,
        settings.conflictAction ?? "keep_newer",
+        triggerSource,
        callbackSyncProcess
      );
      profiler?.insert(`finish step${step} (actual sync)`);