clean both folder if empty

This commit is contained in:
fyears 2024-04-27 12:03:36 +08:00
parent df7b6e1848
commit 9fe1b1d5e6
3 changed files with 4 additions and 4 deletions

View File

@ -86,7 +86,7 @@ const DEFAULT_SETTINGS: RemotelySavePluginSettings = {
deleteToWhere: "system", deleteToWhere: "system",
agreeToUseSyncV3: false, agreeToUseSyncV3: false,
conflictAction: "keep_newer", conflictAction: "keep_newer",
howToCleanEmptyFolder: "skip", howToCleanEmptyFolder: "clean_both",
protectModifyPercentage: 50, protectModifyPercentage: 50,
syncDirection: "bidirectional", syncDirection: "bidirectional",
obfuscateSettingFile: true, obfuscateSettingFile: true,
@ -896,7 +896,7 @@ export default class RemotelySavePlugin extends Plugin {
this.settings.conflictAction = "keep_newer"; this.settings.conflictAction = "keep_newer";
} }
if (this.settings.howToCleanEmptyFolder === undefined) { if (this.settings.howToCleanEmptyFolder === undefined) {
this.settings.howToCleanEmptyFolder = "skip"; this.settings.howToCleanEmptyFolder = "clean_both";
} }
if (this.settings.protectModifyPercentage === undefined) { if (this.settings.protectModifyPercentage === undefined) {
this.settings.protectModifyPercentage = 50; this.settings.protectModifyPercentage = 50;

View File

@ -2018,7 +2018,7 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
t("settings_cleanemptyfolder_clean_both") t("settings_cleanemptyfolder_clean_both")
); );
dropdown dropdown
.setValue(this.plugin.settings.howToCleanEmptyFolder ?? "skip") .setValue(this.plugin.settings.howToCleanEmptyFolder ?? "clean_both")
.onChange(async (val) => { .onChange(async (val) => {
this.plugin.settings.howToCleanEmptyFolder = this.plugin.settings.howToCleanEmptyFolder =
val as EmptyFolderCleanType; val as EmptyFolderCleanType;

View File

@ -1364,7 +1364,7 @@ export async function syncer(
step = 6; step = 6;
mixedEntityMappings = await getSyncPlanInplace( mixedEntityMappings = await getSyncPlanInplace(
mixedEntityMappings, mixedEntityMappings,
settings.howToCleanEmptyFolder ?? "skip", settings.howToCleanEmptyFolder ?? "clean_both",
settings.skipSizeLargerThan ?? -1, settings.skipSizeLargerThan ?? -1,
settings.conflictAction ?? "keep_newer", settings.conflictAction ?? "keep_newer",
settings.syncDirection ?? "bidirectional", settings.syncDirection ?? "bidirectional",