bruno/remotely-save
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix too large operation

Browse Source
This commit is contained in:
fyears 2024-03-27 00:44:16 +08:00
parent 02e03681f7
commit bed28d9f0b
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/baseTypes.ts
View File

@ -165,6 +165,8 @@ export type DecisionTypeForMixedEntity =
| "remote_is_modified_then_pull" | "remote_is_modified_then_pull"
| "local_is_created_then_push" | "local_is_created_then_push"
| "remote_is_created_then_pull" | "remote_is_created_then_pull"
| "local_is_created_too_large_then_do_nothing"
| "remote_is_created_too_large_then_do_nothing"
| "local_is_deleted_thus_also_delete_remote" | "local_is_deleted_thus_also_delete_remote"
| "remote_is_deleted_thus_also_delete_local" | "remote_is_deleted_thus_also_delete_local"
| "conflict_created_then_keep_local" | "conflict_created_then_keep_local"

20
src/sync.ts
View File

@ -738,11 +738,9 @@ export const getSyncPlanInplace = async (
keptFolder.add(getParentFolder(key)); keptFolder.add(getParentFolder(key));
} }
} else { } else {
throw Error( mixedEntry.decisionBranch = 36;
`remote is created (branch 3) but size larger than ${skipSizeLargerThan}, don't know what to do: ${JSON.stringify( mixedEntry.decision = "remote_is_created_too_large_then_do_nothing";
mixedEntry keptFolder.add(getParentFolder(key));
)}`
);
} }
} else if ( } else if (
(prevSync.mtimeSvr === remote.mtimeCli || (prevSync.mtimeSvr === remote.mtimeCli ||
@ -801,11 +799,9 @@ export const getSyncPlanInplace = async (
keptFolder.add(getParentFolder(key)); keptFolder.add(getParentFolder(key));
} }
} else { } else {
throw Error( mixedEntry.decisionBranch = 37;
`local is created (branch 6) but size larger than ${skipSizeLargerThan}, don't know what to do: ${JSON.stringify( mixedEntry.decision = "local_is_created_too_large_then_do_nothing";
mixedEntry keptFolder.add(getParentFolder(key));
)}`
);
} }
} else if ( } else if (
(prevSync.mtimeSvr === local.mtimeCli || (prevSync.mtimeSvr === local.mtimeCli ||
@ -899,6 +895,8 @@ const splitThreeStepsOnEntityMappings = (
val.decision === "equal" || val.decision === "equal" ||
val.decision === "conflict_created_then_do_nothing" || val.decision === "conflict_created_then_do_nothing" ||
val.decision === "folder_existed_both_then_do_nothing" || val.decision === "folder_existed_both_then_do_nothing" ||
val.decision === "local_is_created_too_large_then_do_nothing" ||
val.decision === "remote_is_created_too_large_then_do_nothing" ||
val.decision === "folder_to_skip" val.decision === "folder_to_skip"
) { ) {
// pass // pass
@ -1013,6 +1011,8 @@ const dispatchOperationToActualV3 = async (
} else if ( } else if (
r.decision === "equal" || r.decision === "equal" ||
r.decision === "conflict_created_then_do_nothing" || r.decision === "conflict_created_then_do_nothing" ||
r.decision === "local_is_created_too_large_then_do_nothing" ||
r.decision === "remote_is_created_too_large_then_do_nothing" ||
r.decision === "folder_to_skip" || r.decision === "folder_to_skip" ||
r.decision === "folder_existed_both_then_do_nothing" r.decision === "folder_existed_both_then_do_nothing"
) { ) {