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

correctly remove empty folders

Browse Source
This commit is contained in:
fyears 2024-03-26 23:57:00 +08:00
parent bff2f6a642
commit 62452341a3
2 changed files with 63 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/baseTypes.ts
View File

@ -179,7 +179,9 @@ export type DecisionTypeForMixedEntity =
| "folder_existed_remote_then_also_create_local" | "folder_existed_remote_then_also_create_local"
| "folder_to_be_created" | "folder_to_be_created"
| "folder_to_skip" | "folder_to_skip"
| "folder_to_be_deleted"; | "folder_to_be_deleted_on_both"
| "folder_to_be_deleted_on_remote"
| "folder_to_be_deleted_on_local";
/** /**
* uniform representation * uniform representation

68
src/sync.ts
View File

@ -494,9 +494,41 @@ export const getSyncPlanInplace = async (
mixedEntry.decisionBranch = 105; mixedEntry.decisionBranch = 105;
mixedEntry.decision = "folder_to_skip"; mixedEntry.decision = "folder_to_skip";
} else if (howToCleanEmptyFolder === "clean_both") { } else if (howToCleanEmptyFolder === "clean_both") {
mixedEntry.decisionBranch = 106; if (local !== undefined && remote !== undefined) {
mixedEntry.decision = "folder_to_be_deleted"; if (syncDirection === "bidirectional") {
// TODO: what to do in different sync direction? mixedEntry.decisionBranch = 106;
mixedEntry.decision = "folder_to_be_deleted_on_both";
} else {
// right now it does nothing because of "incremental"
// TODO: should we delete??
mixedEntry.decisionBranch = 109;
mixedEntry.decision = "folder_to_skip";
}
} else if (local !== undefined && remote === undefined) {
if (syncDirection === "bidirectional") {
mixedEntry.decisionBranch = 110;
mixedEntry.decision = "folder_to_be_deleted_on_local";
} else {
// right now it does nothing because of "incremental"
// TODO: should we delete??
mixedEntry.decisionBranch = 111;
mixedEntry.decision = "folder_to_skip";
}
} else if (local === undefined && remote !== undefined) {
if (syncDirection === "bidirectional") {
mixedEntry.decisionBranch = 112;
mixedEntry.decision = "folder_to_be_deleted_on_remote";
} else {
// right now it does nothing because of "incremental"
// TODO: should we delete??
mixedEntry.decisionBranch = 113;
mixedEntry.decision = "folder_to_skip";
}
} else {
// no folder to delete, do nothing
mixedEntry.decisionBranch = 114;
mixedEntry.decision = "folder_to_skip";
}
} else { } else {
throw Error( throw Error(
`do not know how to deal with empty folder ${mixedEntry.key}` `do not know how to deal with empty folder ${mixedEntry.key}`
@ -877,7 +909,9 @@ const splitThreeStepsOnEntityMappings = (
val.decision === "only_history" || val.decision === "only_history" ||
val.decision === "local_is_deleted_thus_also_delete_remote" || val.decision === "local_is_deleted_thus_also_delete_remote" ||
val.decision === "remote_is_deleted_thus_also_delete_local" || val.decision === "remote_is_deleted_thus_also_delete_local" ||
val.decision === "folder_to_be_deleted" val.decision === "folder_to_be_deleted_on_both" ||
val.decision === "folder_to_be_deleted_on_local" ||
val.decision === "folder_to_be_deleted_on_remote"
) { ) {
const level = atWhichLevel(key); const level = atWhichLevel(key);
const k = deletionOps[level - 1]; const k = deletionOps[level - 1];
@ -888,7 +922,11 @@ const splitThreeStepsOnEntityMappings = (
} }
realTotalCount += 1; realTotalCount += 1;
if (val.decision.includes("deleted")) { if (
val.decision.includes("deleted") &&
!val.decision.includes("folder")
) {
// only count files here, skip folder
realModifyDeleteCount += 1; realModifyDeleteCount += 1;
} }
} else if ( } else if (
@ -1063,9 +1101,23 @@ const dispatchOperationToActualV3 = async (
profileID, profileID,
entity entity
); );
} else if (r.decision === "folder_to_be_deleted") { } else if (
await localDeleteFunc(r.key); r.decision === "folder_to_be_deleted_on_both" ||
await client.deleteFromRemote(r.key, cipher, r.remote!.keyEnc); r.decision === "folder_to_be_deleted_on_local" ||
r.decision === "folder_to_be_deleted_on_remote"
) {
if (
r.decision === "folder_to_be_deleted_on_both" ||
r.decision === "folder_to_be_deleted_on_local"
) {
await localDeleteFunc(r.key);
}
if (
r.decision === "folder_to_be_deleted_on_both" ||
r.decision === "folder_to_be_deleted_on_remote"
) {
await client.deleteFromRemote(r.key, cipher, r.remote!.keyEnc);
}
await clearPrevSyncRecordByVaultAndProfile( await clearPrevSyncRecordByVaultAndProfile(
db, db,
vaultRandomID, vaultRandomID,