bump to 0.5.13

* Update zh_cn.json

* Update zh_cn.json

* Update zh_tw.json

docs/encryption/rclone.md

@@ -42,5 +42,5 @@ filename_encoding = base64 # don't forget this!!!
 You can use the `mount` command to view and see the files in file explorer! On Windows, the command should like this (the remote vault is mounted to drive `X:`):
 
 ```bash
-rclone mount webdav1crypt: X: --network-mode
+rclone mount webdav1crypt: X: --network-mode --vfs-cache-mode writes
 ```

manifest-beta.json

@@ -1,7 +1,7 @@
 {
   "id": "remotely-save",
   "name": "Remotely Save",
-  "version": "0.5.11",
+  "version": "0.5.13",
   "minAppVersion": "0.13.21",
   "description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
   "author": "fyears",

manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "remotely-save",
   "name": "Remotely Save",
-  "version": "0.5.11",
+  "version": "0.5.13",
   "minAppVersion": "0.13.21",
   "description": "Yet another unofficial plugin allowing users to synchronize notes between local device and the cloud service.",
   "author": "fyears",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "remotely-save",
-  "version": "0.5.11",
+  "version": "0.5.13",
   "description": "This is yet another sync plugin for Obsidian app.",
   "scripts": {
     "dev2": "node esbuild.config.mjs --watch",

pro/src/clearDupFiles.ts

@@ -0,0 +1,34 @@
+import type { FakeFsLocal } from "../../src/fsLocal";
+import { getFileRenameForDup } from "./conflictLogic";
+
+export const getDupFiles = async (fsLocal: FakeFsLocal) => {
+  const allFilesAndFolders = await fsLocal.walk();
+
+  allFilesAndFolders.sort((a, b) => -(a.keyRaw.length - b.keyRaw.length)); // descending
+
+  const filenameSet: Set<string> = new Set();
+  const filesToBeRemoved: Set<string> = new Set();
+
+  for (const { keyRaw } of allFilesAndFolders) {
+    if (keyRaw.endsWith("/")) {
+      continue;
+    }
+    if (keyRaw.includes("dup")) {
+      filenameSet.add(keyRaw);
+    }
+
+    const dup = getFileRenameForDup(keyRaw);
+    if (filenameSet.has(dup)) {
+      filesToBeRemoved.add(dup);
+    }
+  }
+
+  return [...filesToBeRemoved];
+};
+
+export const clearDupFiles = async (
+  filesToBeRemoved: string[],
+  fsLocal: FakeFsLocal
+) => {
+  await Promise.all(filesToBeRemoved.map(async (f) => await fsLocal.rm(f)));
+};

pro/src/conflictLogic.ts

@@ -20,14 +20,14 @@ import type { FakeFs } from "../../src/fsAll";
 import { MERGABLE_SIZE } from "./baseTypesPro";
 
 export function isMergable(a: Entity, b?: Entity) {
-  if (b !== undefined && a.keyRaw !== b.keyRaw) {
+  if (b !== undefined && a.key !== b.key) {
     return false;
   }
 
   return (
-    !a.keyRaw.endsWith("/") &&
+    !a.key!.endsWith("/") &&
     a.sizeRaw <= MERGABLE_SIZE &&
-    (a.keyRaw.endsWith(".md") || a.keyRaw.endsWith(".markdown"))
+    (a.key!.endsWith(".md") || a.key!.endsWith(".markdown"))
   );
 }
 
@@ -73,6 +73,18 @@ function getLCSText(a: string, b: string) {
  * @returns
  */
 function twoWayMerge(a: string, b: string): string {
+  const aa = a.trim();
+  const bb = b.trim();
+  if (aa === "" && bb === "") {
+    return aa.length >= bb.length ? a : b;
+  }
+  if (bb === "") {
+    return a;
+  }
+  if (aa === "") {
+    return b;
+  }
+
   // const c = getLCSText(a, b);
   // const patches = makePatches(c, a);
   // const [d] = applyPatches(patches, b);
@@ -159,7 +171,7 @@ export async function mergeFile(
   };
 }
 
-export function getFileRename(key: string) {
+export function getFileRenameForDup(key: string) {
   if (
     key === "" ||
     key === "." ||
@@ -200,41 +212,108 @@ export function getFileRename(key: string) {
   return res;
 }
 
+function arraysAreEqual(arr1: ArrayBuffer, arr2: ArrayBuffer) {
+  if (arr1.byteLength !== arr2.byteLength) {
+    return false;
+  }
+  const u1 = new Uint8Array(arr1);
+  const u2 = new Uint8Array(arr2);
+
+  for (let i = 0; i < u1.byteLength; ++i) {
+    if (u1[i] !== u2[i]) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+/**
+ * 1. download remote
+ * 2. compare
+ * 3. if the same, update local but not upload
+ * 4. if not the same, rename local and save remote
+ */
+async function tryDuplicateFileForSameSizes(
+  key: string,
+  key2: string,
+  fsLocal: FakeFs,
+  fsRemote: FakeFs,
+  uploadCallback: (entity: Entity | undefined) => Promise<any>,
+  downloadCallback: (entity: Entity | undefined) => Promise<any>
+) {
+  console.debug(`tryDuplicateFileForSameSizes: ${key}`);
+
+  // 1. download
+  const remoteContent = await fsRemote.readFile(key);
+
+  // 2. compare
+  const localContent = await fsLocal.readFile(key);
+  const eq = arraysAreEqual(localContent, remoteContent);
+
+  if (eq) {
+    // 3. if the same, update local but not upload
+    // read meta of remote, as if we have downloaded the file
+    console.debug(`tryDuplicateFileForSameSizes: ${key} content equal`);
+    const entityRemote = await fsRemote.stat(key);
+
+    // write
+    const downloadResultEntity = await fsLocal.writeFile(
+      key,
+      remoteContent,
+      entityRemote.mtimeCli ?? Date.now(),
+      entityRemote.mtimeCli ?? Date.now()
+    );
+    await downloadCallback(downloadResultEntity);
+
+    // no uploadCallback here
+  } else {
+    // 4. if not the same, rename local and save remote
+    console.debug(`tryDuplicateFileForSameSizes: ${key} content not equal`);
+
+    await fsLocal.rename(key, key2);
+
+    const entityRemote = await fsRemote.stat(key);
+    const downloadResultEntity = await fsLocal.writeFile(
+      key,
+      remoteContent,
+      entityRemote.mtimeCli ?? Date.now(),
+      entityRemote.mtimeCli ?? Date.now()
+    );
+    await downloadCallback(downloadResultEntity);
+
+    const entityLocal = await fsLocal.stat(key2); // key2 here!
+    const uploadResultEntity = await fsRemote.writeFile(
+      key2, // key2 here!
+      localContent,
+      entityLocal.mtimeCli ?? Date.now(),
+      entityLocal.mtimeCli ?? Date.now()
+    );
+    await uploadCallback(uploadResultEntity);
+  }
+}
+
 /**
  * local: x.md -> x.dup.md -> upload to remote
  * remote: x.md -> download to local -> using original name x.md
  */
-export async function duplicateFile(
+async function tryDuplicateFileForDiffSizes(
   key: string,
-  left: FakeFs,
-  right: FakeFs,
-  uploadCallback: (entity: Entity) => Promise<any>,
-  downloadCallback: (entity: Entity) => Promise<any>
+  key2: string,
+  fsLocal: FakeFs,
+  fsRemote: FakeFs,
+  uploadCallback: (entity: Entity | undefined) => Promise<any>,
+  downloadCallback: (entity: Entity | undefined) => Promise<any>
 ) {
-  let key2 = getFileRename(key);
-  let usable = false;
-  do {
-    try {
-      const s = await left.stat(key2);
-      if (s === null || s === undefined) {
-        throw Error(`not exist $${key2}`);
-      }
-      console.debug(`key2=${key2} exists, cannot use for new file`);
-      key2 = getFileRename(key2);
-      console.debug(`key2=${key2} is prepared for next try`);
-    } catch (e) {
-      // not exists, exactly what we want
-      console.debug(`key2=${key2} doesn't exist, usable for new file`);
-      usable = true;
-    }
-  } while (!usable);
-  await left.rename(key, key2);
+  console.debug(`tryDuplicateFileForDiffSizes: ${key}`);
+
+  await fsLocal.rename(key, key2);
 
   /**
    * x.dup.md -> upload to remote
    */
   async function f1() {
-    const k = await copyFile(key2, left, right);
+    const k = await copyFile(key2, fsLocal, fsRemote);
     await uploadCallback(k.entity);
     return k.entity;
   }
@@ -243,7 +322,7 @@ export async function duplicateFile(
    * x.md -> download to local
    */
   async function f2() {
-    const k = await copyFile(key, right, left);
+    const k = await copyFile(key, fsRemote, fsLocal);
     await downloadCallback(k.entity);
     return k.entity;
   }
@@ -255,3 +334,56 @@ export async function duplicateFile(
     download: resDownload,
   };
 }
+
+export async function tryDuplicateFile(
+  key: string,
+  fsLocal: FakeFs,
+  fsRemote: FakeFs,
+  uploadCallback: (entity: Entity | undefined) => Promise<any>,
+  downloadCallback: (entity: Entity | undefined) => Promise<any>
+) {
+  let key2 = getFileRenameForDup(key);
+  let usable = false;
+  do {
+    try {
+      const s = await fsLocal.stat(key2);
+      if (s === null || s === undefined) {
+        throw Error(`not exist $${key2}`);
+      }
+      console.debug(`key2=${key2} exists, cannot use for new file`);
+      key2 = getFileRenameForDup(key2);
+      console.debug(`key2=${key2} is prepared for next try`);
+    } catch (e) {
+      // not exists, exactly what we want
+      console.debug(`key2=${key2} doesn't exist, usable for new file`);
+      usable = true;
+    }
+  } while (!usable);
+
+  const localSize = await fsLocal.stat(key);
+  const remoteSize = await fsRemote.stat(key);
+
+  if (
+    localSize !== undefined &&
+    remoteSize !== undefined &&
+    localSize.sizeRaw === remoteSize.sizeRaw
+  ) {
+    return await tryDuplicateFileForSameSizes(
+      key,
+      key2,
+      fsLocal,
+      fsRemote,
+      uploadCallback,
+      downloadCallback
+    );
+  } else {
+    return await tryDuplicateFileForDiffSizes(
+      key,
+      key2,
+      fsLocal,
+      fsRemote,
+      uploadCallback,
+      downloadCallback
+    );
+  }
+}

pro/src/langs/en.json

@@ -129,6 +129,10 @@
   "modal_proauth_maualinput_notice": "Trying to connect, wait...",
   "modal_proauth_maualinput_conn_fail": "Failed to connect",
 
+  "modal_cleardupfiles_warning": "Warning: The plugin just stupidly finds all the file names that looks like duplicated files (.dup in file names). Also, this only deletes local files, so you need to trigger a sync to delete remote files.",
+  "modal_cleardupfiles_warning_confirm": "Confirm to delete",
+  "modal_cleardupfiles_warning_finished": "All the detected duplicated files are removed!",
+
   "settings_onedrivefull": "Remote For Onedrive (for personal) (Full)",
   "settings_chooseservice_onedrivefull": "OneDrive for personal (Full) (PRO)",
   "settings_onedrivefull_disclaimer1": "Disclaimer: This app is NOT an official Microsoft / OneDrive product.",
@@ -278,6 +282,10 @@
   "settings_export_koofr_button": "Export Koofr Part",
   "settings_export_azureblobstorage_button": "Export Azure Blob Storage Part",
 
+  "settings_cleardupfiles": "Clear Duplicated Files By Smart Conflict",
+  "settings_cleardupfiles_desc": "If you have ever used Smart Conflict (PRO) feature, the plugin may generate duplicated files. <strong>IF YOU ARE SURE THE DUPLICATED FILES ARE NO LONGER NEEDED</strong>, you can clear <strong>ALL</strong> of them locally here.",
+  "settings_cleardupfiles_button": "Start Scanning",
+
   "settings_pro": "Account (for PRO features)",
   "settings_pro_tutorial": "<p>Using <stong>basic</strong> features of Remotely Save is <strong>FREE</strong> and do <strong>NOT</strong> need an account.</p><p>However, you will <strong>need</strong> an online account and <strong>PAY</strong> for the <strong>PRO</strong> features such as smart conflict.</p><p>Firstly please click the button to sign up and sign in to the website: <a href=\"https://remotelysave.com\">https://remotelysave.com</a>. Notice: It's different from, and NOT affiliated with Obsidian account.</p><p>Secondly please \"connect\" your local device to your online account.",
   "settings_pro_features": "Features",

pro/src/langs/zh_cn.json

@@ -140,8 +140,12 @@
   "modal_proauth_maualinput_notice": "正在连接，请稍候......",
   "modal_proauth_maualinput_conn_fail": "连接失败",
 
+  "modal_cleardupfiles_warning": "警告：插件只是简单地扫描所有文件名含有 .dup 的作为重复文件。另外，本操作只删除本地文件，因此您需要触发同步来删除远端文件。",
+  "modal_cleardupfiles_warning_confirm": "确认删除",
+  "modal_cleardupfiles_warning_finished": "所有检测到的重复文件已被删除！",
+
   "settings_onedrivefull": "Onedrive（个人版）（Full）设置",
-  "settings_chooseservice_onedrivefull": "OneDrive（个人版）（Full）",
+  "settings_chooseservice_onedrivefull": "OneDrive（个人版）（Full）（PRO）",
   "settings_onedrivefull_disclaimer1": "声明：此插件不是微软或 OneDrive 的官方产品。",
   "settings_onedrivefull_disclaimer2": "声明：您所输入的信息存储于本地。其它有害的或者出错的插件，是有可能读取到这些信息的。如果您发现了 OneDrive 有不符合预期的访问，请立刻从 https://microsoft.com/consent 删除记录于此插件的连接鉴权。",
   "settings_onedrivefull_folder": "我们会在您的 OneDrive 上创建此文件夹并在里面同步：/{{remoteBaseDir}}。",
@@ -285,6 +289,10 @@
   "settings_export_koofr_button": "导出 Koofr 部分",
   "settings_export_azureblobstorage_button": "导出 Azure Blob Storage 部分",
 
+  "settings_cleardupfiles": "删除智能处理冲突生成的重复文件",
+  "settings_cleardupfiles_desc": "如果用过智能处理冲突 (PRO) 功能，插件可能会生成重复文件。<strong>如果您真的确认了所有重复文件都不需要了，</strong>那么可以删除本地的<strong>所有</strong>这些文件。",
+  "settings_cleardupfiles_button": "开始扫描",
+
   "settings_pro": "账号（PRO 付费功能）",
   "settings_pro_tutorial": "<p>使用 Remotely Save 的<stong>基本</strong>功能是<strong>免费的</strong>，而且<strong>不</strong>需要注册对应账号。</p><p>但是，您<strong>需要</strong>注册账号和对<strong>PRO</strong>功能<strong>付费</strong>使用，如智能处理冲突功能。</p><p>第一步：点击按钮从而注册和登录网站：<a href=\"https://remotelysave.com\">https://remotelysave.com</a>。注意：这和 Obsidian 官方账号无关，是不同的账号。</p><p>第二部：点击“连接”按钮，从而连接本设备和在线账号。",
   "settings_pro_features": "功能",

pro/src/langs/zh_tw.json

@@ -140,8 +140,12 @@
   "modal_proauth_maualinput_notice": "正在連線，請稍候......",
   "modal_proauth_maualinput_conn_fail": "連線失敗",
 
+  "modal_cleardupfiles_warning": "警告：外掛只是簡單地掃描所有檔名含有 .dup 的作為重複檔案。另外，本操作只刪除本地檔案，因此您需要觸發同步來刪除遠端檔案。",
+  "modal_cleardupfiles_warning_confirm": "確認刪除",
+  "modal_cleardupfiles_warning_finished": "所有檢測到的重複檔案已被刪除！",
+
   "settings_onedrivefull": "Onedrive（個人版）（Full）設定",
-  "settings_chooseservice_onedrivefull": "OneDrive（個人版）（Full）",
+  "settings_chooseservice_onedrivefull": "OneDrive（個人版）（Full）（PRO）",
   "settings_onedrivefull_disclaimer1": "宣告：此外掛不是微軟或 OneDrive 的官方產品。",
   "settings_onedrivefull_disclaimer2": "宣告：您所輸入的資訊儲存於本地。其它有害的或者出錯的外掛，是有可能讀取到這些資訊的。如果您發現了 OneDrive 有不符合預期的訪問，請立刻從 https://microsoft.com/consent 刪除記錄於此外掛的連線鑑權。",
   "settings_onedrivefull_folder": "我們會在您的 OneDrive 上建立此資料夾並在裡面同步：/{{remoteBaseDir}}。",
@@ -285,6 +289,10 @@
   "settings_export_koofr_button": "匯出 Koofr 部分",
   "settings_export_azureblobstorage_button": "匯出 Azure Blob Storage 部分",
 
+  "settings_cleardupfiles": "刪除智慧處理衝突生成的重複檔案",
+  "settings_cleardupfiles_desc": "如果用過智慧處理衝突 (PRO) 功能，外掛可能會生成重複檔案。<strong>如果您真的確認了所有重複檔案都不需要了，</strong>那麼可以刪除本地的<strong>所有</strong>這些檔案。",
+  "settings_cleardupfiles_button": "開始掃描",
+
   "settings_pro": "賬號（PRO 付費功能）",
   "settings_pro_tutorial": "<p>使用 Remotely Save 的<stong>基本</strong>功能是<strong>免費的</strong>，而且<strong>不</strong>需要註冊對應賬號。</p><p>但是，您<strong>需要</strong>註冊賬號和對<strong>PRO</strong>功能<strong>付費</strong>使用，如智慧處理衝突功能。</p><p>第一步：點選按鈕從而註冊和登入網站：<a href=\"https://remotelysave.com\">https://remotelysave.com</a>。注意：這和 Obsidian 官方賬號無關，是不同的賬號。</p><p>第二部：點選“連線”按鈕，從而連線本裝置和線上賬號。",
   "settings_pro_features": "功能",

pro/src/settingsClearDupFiles.ts

@@ -0,0 +1,89 @@
+import { type App, Modal, Notice, Setting } from "obsidian";
+import { FakeFsLocal } from "../../src/fsLocal";
+import type { TransItemType } from "../../src/i18n";
+import type RemotelySavePlugin from "../../src/main";
+import { stringToFragment } from "../../src/misc";
+import { clearDupFiles, getDupFiles } from "./clearDupFiles";
+
+class ClearDupFilesModal extends Modal {
+  readonly plugin: RemotelySavePlugin;
+  readonly t: (x: TransItemType, vars?: any) => string;
+  readonly files: string[];
+  readonly fsLocal: FakeFsLocal;
+  constructor(
+    app: App,
+    plugin: RemotelySavePlugin,
+    t: (x: TransItemType, vars?: any) => string,
+    files: string[],
+    fsLocal: FakeFsLocal
+  ) {
+    super(app);
+    this.plugin = plugin;
+    this.t = t;
+    this.files = files;
+    this.fsLocal = fsLocal;
+  }
+
+  async onOpen() {
+    const t = this.t;
+    const { contentEl } = this;
+
+    contentEl.createEl("p", {
+      text: t("modal_cleardupfiles_warning"),
+    });
+
+    contentEl.createEl("pre").createEl("code", {
+      text: this.files.join("\n"),
+    });
+
+    new Setting(contentEl)
+      .addButton((button) => {
+        button.setButtonText(t("modal_cleardupfiles_warning_confirm"));
+        button.onClick(async () => {
+          await clearDupFiles(this.files, this.fsLocal);
+          new Notice(t("modal_cleardupfiles_warning_finished"));
+          this.close();
+        });
+      })
+      .addButton((button) => {
+        button.setButtonText(t("goback"));
+        button.onClick(() => {
+          this.close();
+        });
+      });
+  }
+
+  onClose() {
+    const { contentEl } = this;
+    contentEl.empty();
+  }
+}
+
+export const generateClearDupFilesSettingsPart = (
+  containerEl: HTMLElement,
+  t: (x: TransItemType, vars?: any) => string,
+  app: App,
+  plugin: RemotelySavePlugin
+) => {
+  new Setting(containerEl)
+    .setName(t("settings_cleardupfiles"))
+    .setDesc(stringToFragment(t("settings_cleardupfiles_desc")))
+    .addButton(async (button) => {
+      button.setButtonText(t("settings_cleardupfiles_button"));
+      button.onClick(async () => {
+        const fsLocal = new FakeFsLocal(
+          app.vault,
+          plugin.settings.syncConfigDir ?? false,
+          app.vault.configDir,
+          plugin.manifest.id,
+          undefined,
+          plugin.settings.deleteToWhere ?? "system"
+        );
+
+        const files = await getDupFiles(fsLocal);
+
+        const modal = new ClearDupFilesModal(app, plugin, t, files, fsLocal);
+        modal.open();
+      });
+    });
+};

pro/src/settingsPro.ts

@@ -310,7 +310,7 @@ export const generateProSettingsPart = (
 
       const allowOnedriveFull =
         plugin.settings.pro?.enabledProFeatures.filter(
-          (x) => x.featureName === "feature-box"
+          (x) => x.featureName === "feature-onedrive_full"
         ).length === 1;
       console.debug(
         `allow to show up OnedriveFull settings? ${allowOnedriveFull}`

pro/src/sync.ts

@@ -36,7 +36,7 @@ import {
 } from "../../src/misc";
 import type { Profiler } from "../../src/profiler";
 import { checkProRunnableAndFixInplace } from "./account";
-import { duplicateFile, isMergable, mergeFile } from "./conflictLogic";
+import { isMergable, mergeFile, tryDuplicateFile } from "./conflictLogic";
 import {
   clearFileContentHistoryByVaultAndProfile,
   getFileContentHistoryByVaultAndProfile,
@@ -296,7 +296,8 @@ const getSyncPlanInplace = async (
   syncDirection: SyncDirectionType,
   profiler: Profiler | undefined,
   settings: RemotelySavePluginSettings,
-  triggerSource: SyncTriggerSourceType
+  triggerSource: SyncTriggerSourceType,
+  configDir: string
 ) => {
   profiler?.addIndent();
   profiler?.insert("getSyncPlanInplace: enter");
@@ -582,7 +583,11 @@ const getSyncPlanInplace = async (
             if (prevSync === undefined) {
               // Didn't exist means both are new
               if (syncDirection === "bidirectional") {
-                if (conflictAction === "keep_newer") {
+                if (
+                  conflictAction === "keep_newer" ||
+                  (conflictAction === "smart_conflict" &&
+                    key.startsWith(`${configDir}/`))
+                ) {
                   if (
                     (local.mtimeCli ?? local.mtimeSvr ?? 0) >=
                     (remote.mtimeCli ?? remote.mtimeSvr ?? 0)
@@ -640,7 +645,11 @@ const getSyncPlanInplace = async (
             } else {
               // Both exist but don't compare means both are modified
               if (syncDirection === "bidirectional") {
-                if (conflictAction === "keep_newer") {
+                if (
+                  conflictAction === "keep_newer" ||
+                  (conflictAction === "smart_conflict" &&
+                    key.startsWith(`${configDir}/`))
+                ) {
                   if (
                     (local.mtimeCli ?? local.mtimeSvr ?? 0) >=
                     (remote.mtimeCli ?? remote.mtimeSvr ?? 0)
@@ -1342,11 +1351,12 @@ const dispatchOperationToActualV3 = async (
         r.key
       );
       const mtimeCli = (await fsLocal.stat(r.key)).mtimeCli!;
-      const { upload, download } = await duplicateFile(
+      await tryDuplicateFile(
         r.key,
         fsLocal,
         fsEncrypt,
         async (upload) => {
+          if (upload !== undefined) {
             // TODO: abstract away the dirty hack
             fullfillMTimeOfRemoteEntityInplace(upload, mtimeCli);
             await upsertPrevSyncRecordByVaultAndProfile(
@@ -1355,8 +1365,10 @@ const dispatchOperationToActualV3 = async (
               profileID,
               upload
             );
+          }
         },
         async (download) => {
+          if (download !== undefined) {
             await upsertPrevSyncRecordByVaultAndProfile(
               db,
               vaultRandomID,
@@ -1364,6 +1376,7 @@ const dispatchOperationToActualV3 = async (
               download
             );
           }
+        }
       );
     }
   } else if (r.decision === "folder_to_be_created") {
@@ -1712,7 +1725,8 @@ export async function syncer(
       settings.syncDirection ?? "bidirectional",
       profiler,
       settings,
-      triggerSource
+      triggerSource,
+      configDir
     );
     console.debug(`mixedEntityMappings:`);
     console.debug(mixedEntityMappings); // for debugging

pro/tests/conflictLogic.test.ts

@@ -1,67 +1,70 @@
 import { deepStrictEqual, rejects, throws } from "assert";
-import { getFileRename } from "../src/conflictLogic";
+import { getFileRenameForDup } from "../src/conflictLogic";
 
 describe("New name is generated", () => {
   it("should throw for empty file", async () => {
     for (const key of ["", "/", ".", ".."]) {
-      throws(() => getFileRename(key));
+      throws(() => getFileRenameForDup(key));
     }
   });
 
   it("should throw for folder", async () => {
     for (const key of ["sss/", "ssss/yyy/"]) {
-      throws(() => getFileRename(key));
+      throws(() => getFileRenameForDup(key));
     }
   });
 
   it("should correctly get no ext files renamed", async () => {
-    deepStrictEqual(getFileRename("abc"), "abc.dup");
+    deepStrictEqual(getFileRenameForDup("abc"), "abc.dup");
 
-    deepStrictEqual(getFileRename("xxxx/yyyy/abc"), "xxxx/yyyy/abc.dup");
+    deepStrictEqual(getFileRenameForDup("xxxx/yyyy/abc"), "xxxx/yyyy/abc.dup");
   });
 
   it("should correctly get dot files renamed", async () => {
-    deepStrictEqual(getFileRename(".abc"), ".abc.dup");
+    deepStrictEqual(getFileRenameForDup(".abc"), ".abc.dup");
 
-    deepStrictEqual(getFileRename("xxxx/yyyy/.efg"), "xxxx/yyyy/.efg.dup");
+    deepStrictEqual(
+      getFileRenameForDup("xxxx/yyyy/.efg"),
+      "xxxx/yyyy/.efg.dup"
+    );
 
-    deepStrictEqual(getFileRename("xxxx/yyyy/hij."), "xxxx/yyyy/hij.dup");
+    deepStrictEqual(getFileRenameForDup("xxxx/yyyy/hij."), "xxxx/yyyy/hij.dup");
   });
 
   it("should correctly get normal files renamed", async () => {
-    deepStrictEqual(getFileRename("abc.efg"), "abc.dup.efg");
+    deepStrictEqual(getFileRenameForDup("abc.efg"), "abc.dup.efg");
 
     deepStrictEqual(
-      getFileRename("xxxx/yyyy/abc.efg"),
+      getFileRenameForDup("xxxx/yyyy/abc.efg"),
       "xxxx/yyyy/abc.dup.efg"
     );
 
     deepStrictEqual(
-      getFileRename("xxxx/yyyy/abc.tar.gz"),
+      getFileRenameForDup("xxxx/yyyy/abc.tar.gz"),
       "xxxx/yyyy/abc.tar.dup.gz"
     );
 
     deepStrictEqual(
-      getFileRename("xxxx/yyyy/.abc.efg"),
+      getFileRenameForDup("xxxx/yyyy/.abc.efg"),
       "xxxx/yyyy/.abc.dup.efg"
     );
   });
 
   it("should correctly get duplicated files renamed again", async () => {
-    deepStrictEqual(getFileRename("abc.dup"), "abc.dup.dup");
+    deepStrictEqual(getFileRenameForDup("abc.dup"), "abc.dup.dup");
 
     deepStrictEqual(
-      getFileRename("xxxx/yyyy/.abc.dup"),
+      getFileRenameForDup("xxxx/yyyy/.abc.dup"),
       "xxxx/yyyy/.abc.dup.dup"
     );
 
     deepStrictEqual(
-      getFileRename("xxxx/yyyy/abc.dup.md"),
+      getFileRenameForDup("xxxx/yyyy/abc.dup.md"),
       "xxxx/yyyy/abc.dup.dup.md"
     );
 
     deepStrictEqual(
-      getFileRename("xxxx/yyyy/.abc.dup.md"),
+      getFileRenameForDup("xxxx/yyyy/.abc.dup.md"),
       "xxxx/yyyy/.abc.dup.dup.md"
     );
   });

src/baseTypes.ts

@@ -98,6 +98,8 @@ export interface WebdavConfig {
   depth?: WebdavDepthType;
   remoteBaseDir?: string;
 
+  customHeaders?: string;
+
   /**
    * @deprecated
    */

src/encryptRClone.ts

@@ -200,7 +200,10 @@ export class CipherRclone {
           action: "encryptContent",
           inputContent: input,
         },
-        [channel.port1, input]
+        [
+          channel.port1,
+          // input // the array buffer might be re-used later, so we CANNOT transform here
+        ]
       );
     });
   }
@@ -244,6 +247,7 @@ export class CipherRclone {
           action: "decryptContent",
           inputContent: input,
         },
+        // the decrypted result is not used later in worker, so it's save to transfer
         [channel.port1, input]
       );
     });

src/fsEncrypt.ts

@@ -91,7 +91,8 @@ export class FakeFsEncrypt extends FakeFs {
       this.password !== "" ? method : "no password"
     })`;
 
-    if (method === "rclone-base64") {
+    if (this.password !== "" && method === "rclone-base64") {
+      // no need to init if no password or not rclone
       this.cipherRClone = new rclone.CipherRclone(password, 5);
     }
   }
@@ -137,6 +138,8 @@ export class FakeFsEncrypt extends FakeFs {
         };
       }
     } else {
+      // the config has a password
+
       if (this.method === "unknown") {
         return {
           ok: false,

src/fsOnedrive.ts

@@ -264,6 +264,9 @@ const fromDriveItemToEntity = (x: DriveItem, remoteBaseDir: string): Entity => {
   // another possibile prefix
   const FOURTH_COMMON_PREFIX_RAW = `/drive/items/`;
 
+  // when to use decode?
+  const remoteBaseDirEncoded = encodeURIComponent(remoteBaseDir);
+
   if (
     x.parentReference === undefined ||
     x.parentReference === null ||
@@ -279,6 +282,8 @@ const fromDriveItemToEntity = (x: DriveItem, remoteBaseDir: string): Entity => {
     SECOND_COMMON_PREFIX_REGEX
   );
   const matchThirdPrefixRes = fullPathOriginal.match(THIRD_COMMON_PREFIX_REGEX);
+
+  // first
   if (
     matchFirstPrefixRes !== null &&
     fullPathOriginal.startsWith(`${matchFirstPrefixRes[0]}${remoteBaseDir}`)
@@ -286,24 +291,68 @@ const fromDriveItemToEntity = (x: DriveItem, remoteBaseDir: string): Entity => {
     const foundPrefix = `${matchFirstPrefixRes[0]}${remoteBaseDir}`;
     key = fullPathOriginal.substring(foundPrefix.length + 1);
   } else if (
+    matchFirstPrefixRes !== null &&
+    fullPathOriginal.startsWith(
+      `${matchFirstPrefixRes[0]}${remoteBaseDirEncoded}`
+    )
+  ) {
+    const foundPrefix = `${matchFirstPrefixRes[0]}${remoteBaseDirEncoded}`;
+    key = fullPathOriginal.substring(foundPrefix.length + 1);
+  }
+
+  // fifth
+  else if (
     matchFifthPrefixRes !== null &&
     fullPathOriginal.startsWith(`${matchFifthPrefixRes[0]}${remoteBaseDir}`)
   ) {
     const foundPrefix = `${matchFifthPrefixRes[0]}${remoteBaseDir}`;
     key = fullPathOriginal.substring(foundPrefix.length + 1);
   } else if (
+    matchFifthPrefixRes !== null &&
+    fullPathOriginal.startsWith(
+      `${matchFifthPrefixRes[0]}${remoteBaseDirEncoded}`
+    )
+  ) {
+    const foundPrefix = `${matchFifthPrefixRes[0]}${remoteBaseDirEncoded}`;
+    key = fullPathOriginal.substring(foundPrefix.length + 1);
+  }
+
+  // second
+  else if (
     matchSecondPrefixRes !== null &&
     fullPathOriginal.startsWith(`${matchSecondPrefixRes[0]}${remoteBaseDir}`)
   ) {
     const foundPrefix = `${matchSecondPrefixRes[0]}${remoteBaseDir}`;
     key = fullPathOriginal.substring(foundPrefix.length + 1);
   } else if (
+    matchSecondPrefixRes !== null &&
+    fullPathOriginal.startsWith(
+      `${matchSecondPrefixRes[0]}${remoteBaseDirEncoded}`
+    )
+  ) {
+    const foundPrefix = `${matchSecondPrefixRes[0]}${remoteBaseDirEncoded}`;
+    key = fullPathOriginal.substring(foundPrefix.length + 1);
+  }
+
+  // third
+  else if (
     matchThirdPrefixRes !== null &&
     fullPathOriginal.startsWith(`${matchThirdPrefixRes[0]}${remoteBaseDir}`)
   ) {
     const foundPrefix = `${matchThirdPrefixRes[0]}${remoteBaseDir}`;
     key = fullPathOriginal.substring(foundPrefix.length + 1);
-  } else if (x.parentReference.path.startsWith(FOURTH_COMMON_PREFIX_RAW)) {
+  } else if (
+    matchThirdPrefixRes !== null &&
+    fullPathOriginal.startsWith(
+      `${matchThirdPrefixRes[0]}${remoteBaseDirEncoded}`
+    )
+  ) {
+    const foundPrefix = `${matchThirdPrefixRes[0]}${remoteBaseDirEncoded}`;
+    key = fullPathOriginal.substring(foundPrefix.length + 1);
+  }
+
+  // fourth
+  else if (x.parentReference.path.startsWith(FOURTH_COMMON_PREFIX_RAW)) {
     // it's something like
     // /drive/items/<some_id>!<another_id>:/${remoteBaseDir}/<subfolder>
     // with uri encoded!
@@ -321,16 +370,27 @@ const fromDriveItemToEntity = (x: DriveItem, remoteBaseDir: string): Entity => {
       key = x.name;
     } else {
       throw Error(
-        `we meet file/folder and do not know how to deal with it:\n${constructFromDriveItemToEntityError(
-          x
-        )}`
+        `file/folder with /drive/items/, no idea how to deal with it:
+fullPathOriginal=${fullPathOriginal}
+matchFirstPrefixRes=${matchFirstPrefixRes}
+matchFifthPrefixRes=${matchFifthPrefixRes}
+matchSecondPrefixRes=${matchSecondPrefixRes}
+matchThirdPrefixRes=${matchThirdPrefixRes}
+${constructFromDriveItemToEntityError(x)}`
       );
     }
-  } else {
+  }
+
+  // others
+  else {
     throw Error(
-      `we meet file/folder and do not know how to deal with it:\n${constructFromDriveItemToEntityError(
-        x
-      )}`
+      `file/folder, no idea how to deal with it without known prefix:
+fullPathOriginal=${fullPathOriginal}
+matchFirstPrefixRes=${matchFirstPrefixRes}
+matchFifthPrefixRes=${matchFifthPrefixRes}
+matchSecondPrefixRes=${matchSecondPrefixRes}
+matchThirdPrefixRes=${matchThirdPrefixRes}
+${constructFromDriveItemToEntityError(x)}`
     );
   }
 
@@ -926,11 +986,24 @@ export class FakeFsOnedrive extends FakeFs {
       ).arrayBuffer;
       return content;
     } else {
+      // so strange, sometimes (!!!)
+      // we cannot download the file because of CORS
+      try {
         // cannot set no-cache here, will have cors error
         const content = await (
           await fetch(downloadUrl, { cache: "no-store" })
         ).arrayBuffer();
         return content;
+      } catch (e) {
+        // let's try again to bypass the CORS
+        const content = (
+          await requestUrl({
+            url: downloadUrl,
+            headers: { "Cache-Control": "no-cache" },
+          })
+        ).arrayBuffer;
+        return content;
+      }
     }
   }
 

src/fsWebdav.ts

@@ -209,6 +209,29 @@ const tryEncodeURI = (x: string) => {
   return encodeURI(x);
 };
 
+const parseCustomHeaders = (x: string): Record<string, string> => {
+  const y = x.trim();
+  if (y === "") {
+    return {};
+  }
+  const z = y.split("\n");
+
+  const res: Record<string, string> = {};
+
+  for (const kv of z) {
+    if (!kv.includes(":")) {
+      continue;
+    }
+
+    const [keyRaw, ...valueArr] = kv.split(":");
+    const key = keyRaw.trim();
+    const value = valueArr.join(":").trim();
+    res[key] = value;
+  }
+
+  return res;
+};
+
 export class FakeFsWebdav extends FakeFs {
   kind: "webdav";
 
@@ -246,9 +269,14 @@ export class FakeFsWebdav extends FakeFs {
       return;
     }
 
-    const headers = {
+    const cacheHeader = {
       "Cache-Control": "no-cache",
     };
+    const customHeaders = parseCustomHeaders(
+      this.webdavConfig.customHeaders ?? ""
+    );
+    const headers = { ...cacheHeader, ...customHeaders };
+
     if (
       this.webdavConfig.username !== "" &&
       this.webdavConfig.password !== ""
@@ -371,7 +399,9 @@ export class FakeFsWebdav extends FakeFs {
       compliance.compliance.includes("sabredav-partialupdate")
     ) {
       this.supportNativePartial = true;
-      console.debug(`supportNativePartial=true`);
+      console.debug(
+        `supportNativePartial=true, compliance=${JSON.stringify(compliance)}`
+      );
       return true;
     }
 

src/langs/en.json

@@ -232,6 +232,7 @@
   "settings_onedrive_emptyfile_desc": "OneDrive doesn't allow uploading empty file (even in its official website). Do you want to show up errors or silently skip the empty files?",
   "settings_onedrive_emptyfile_skip": "Skip",
   "settings_onedrive_emptyfile_error": "Error and abort",
+
   "settings_webdav": "Remote For Webdav",
   "settings_webdav_disclaimer1": "Disclaimer: The information is stored locally. Other malicious/harmful/faulty plugins may read the info. If you see any unintentional access to your webdav server, please immediately change the username and password.",
   "settings_webdav_cors_os": "Obsidian desktop>=0.13.25 or iOS>=1.1.1 or Android>=1.2.1 supports bypassing CORS locally. But you are using an old version, and you're suggested to upgrade Obsidian.",
@@ -249,9 +250,12 @@
   "settings_webdav_depth_desc": "Webdav servers should be configured to allow requests with header Depth being '1' or 'Infinity'. If you are not sure what's this, choose \"depth='1'\". If you are sure your server supports depth='infinity', please choose that to get way better performance.",
   "settings_webdav_depth_1": "only supports depth='1'",
   "settings_webdav_depth_inf": "supports depth='infinity'",
+  "settings_webdav_customheaders": "Custom Headers Sent To Servers",
+  "settings_webdav_customheaders_desc": "Some users may want to set custom headers. If you don't know what it is, just leave it empty. Input them like: <code>X-Header1:value1</code> in each line. All spaces around header keys and values will be removed.",
   "settings_webdav_connect_succ": "Great! The webdav server can be accessed.",
   "settings_webdav_connect_fail": "The webdav server cannot be reached (possible to be any of address/username/password/authtype errors).",
   "settings_webdav_connect_fail_withcors": "The webdav server cannot be reached (possible to be any of address/username/password/authtype/CORS errors).",
+
   "settings_webdis": "Remote For Webdis",
   "settings_webdis_disclaimer1": "Disclaimer: This app is NOT an official Redis® Ltd / Redis® OSS / Webdis product. Redis is a registered trademark of Redis Ltd.",
   "settings_webdis_disclaimer2": "Disclaimer: The information is stored locally. Other malicious/harmful/faulty plugins may read the info. If you see any unintentional access to your Webdis server, please immediately change the username and password.",
@@ -269,7 +273,7 @@
   "settings_chooseservice_s3": "S3 or compatible",
   "settings_chooseservice_dropbox": "Dropbox",
   "settings_chooseservice_webdav": "Webdav",
-  "settings_chooseservice_onedrive": "OneDrive for personal (App Folder)",
+  "settings_chooseservice_onedrive": "OneDrive for personal",
   "settings_chooseservice_webdis": "Webdis (HTTP for Redis®)",
   "settings_adv": "Advanced Settings",
   "settings_concurrency": "Concurrency",
@@ -336,6 +340,7 @@
   "settings_syncplans": "Export Sync Plans",
   "settings_syncplans_desc": "Sync plans are created every time after you trigger sync and before the actual sync. Useful to know what would actually happen in those sync. Click the button to export sync plans.",
   "settings_syncplans_button_1_only_change": "Export latest 1 (change part)",
+  "settings_syncplans_button_5_only_change": "Export latest 5 (change part)",
   "settings_syncplans_button_1": "Export latest 1",
   "settings_syncplans_button_5": "Export latest 5",
   "settings_syncplans_button_all": "Export All",

src/langs/zh_cn.json

@@ -58,7 +58,7 @@
   "statusbar_time_days": "{{time}} 天前",
   "statusbar_time_hours": "{{time}} 小时前",
   "statusbar_time_minutes": "{{time}} 分钟前",
-  "statusbar_time_lessminute": "1 分钟之内",
+  "statusbar_time_lessminute": "1 分钟内",
   "statusbar_time_now": "刚刚",
   "statusbar_syncing": "正在同步",
   "statusbar_lastsync_label": "日期：{{date}}",
@@ -231,6 +231,7 @@
   "settings_onedrive_emptyfile_desc": "OneDrive 不允许上传空文件（即使官网也是不允许的）。那么你想跳过空文件还是返回错误？",
   "settings_onedrive_emptyfile_skip": "跳过",
   "settings_onedrive_emptyfile_error": "返回错误和中断",
+
   "settings_webdav": "Webdav 设置",
   "settings_webdav_disclaimer1": "声明：您所输入的信息存储于本地。其它有害的或者出错的插件，是有可能读取到这些信息的。如果您发现了 Webdav 服务器有不符合预期的访问，请立刻修改用户名和密码。",
   "settings_webdav_cors_os": "Obsidian 桌面版>=0.13.25 或 iOS>=1.1.1 或 Android>=1.2.1 支持跳过 CORS 设置。但您正在使用旧版，建议升级。",
@@ -248,9 +249,12 @@
   "settings_webdav_depth_desc": "Webdav 服务器会被设为接收 Depth header 为“1”或“Infinity”请求。如果您不清楚如何设置，可以选择 depth='1'。如果那你确认服务器支持 depth='infinity'，请选择它，会获得更加好的性能。",
   "settings_webdav_depth_1": "只支持 depth='1'",
   "settings_webdav_depth_inf": "支持 depth='infinity'",
+  "settings_webdav_customheaders": "发送到服务器的自定义 Header",
+  "settings_webdav_customheaders_desc": "有些用户需要设置自定义 header。如果您不知道是什么，可以直接留空不填。输入格式：每行形如 <code>X-Header1:value1</code>。header 的 key 和 value 之间的空格会被删除。",
   "settings_webdav_connect_succ": "很好！可以连接上 Webdav 服务器。",
   "settings_webdav_connect_fail": "无法连接上 Webdav 服务器。（可能是地址/账号/密码/鉴权类型等错误。）",
   "settings_webdav_connect_fail_withcors": "无法连接上 Webdav 服务器。（可能是地址/账号/密码/鉴权类型/CORS 等错误。）",
+
   "settings_webdis": "Webdis 设置",
   "settings_webdis_disclaimer1": "声明：此插件不是 Redis® Ltd 或 Redis® 软件或 Wedis 的官方产品。Redis 是 Redis Ltd 的注册商标。",
   "settings_webdis_disclaimer2": "声明：您所输入的信息存储于本地。其它有害的或者出错的插件，是有可能读取到这些信息的。如果您发现了 Webdis 服务器有不符合预期的访问，请立刻修改用户名和密码。",
@@ -268,7 +272,7 @@
   "settings_chooseservice_s3": "S3 或兼容 S3 的服务",
   "settings_chooseservice_dropbox": "Dropbox",
   "settings_chooseservice_webdav": "Webdav",
-  "settings_chooseservice_onedrive": "OneDrive（个人版）（App Folder）",
+  "settings_chooseservice_onedrive": "OneDrive（个人版）",
   "settings_chooseservice_webdis": "Webdis (an HTTP interface for Redis)",
   "settings_adv": "进阶设置",
   "settings_concurrency": "并行度",
@@ -335,6 +339,7 @@
   "settings_syncplans": "导出同步计划",
   "settings_syncplans_desc": "每次您启动同步，并在实际上传下载前，插件会生成同步计划。它可以使您知道每次同步发生了什么。点击按钮可以导出同步计划。",
   "settings_syncplans_button_1_only_change": "导出最近 1 次（仅修改部分）",
+  "settings_syncplans_button_5_only_change": "导出最近 5 次（仅修改部分）",
   "settings_syncplans_button_1": "导出最近 1 次",
   "settings_syncplans_button_5": "导出最近 5 次",
   "settings_syncplans_button_all": "导出所有",

src/langs/zh_tw.json

@@ -57,7 +57,7 @@
   "statusbar_time_days": "{{time}} 天前",
   "statusbar_time_hours": "{{time}} 小時前",
   "statusbar_time_minutes": "{{time}} 分鐘前",
-  "statusbar_time_lessminute": "1 分鐘之內",
+  "statusbar_time_lessminute": "1 分鐘內",
   "statusbar_time_now": "剛剛",
   "statusbar_syncing": "正在同步",
   "statusbar_lastsync_label": "日期：{{date}}",
@@ -230,6 +230,7 @@
   "settings_onedrive_emptyfile_desc": "OneDrive 不允許上傳空檔案（即使官網也是不允許的）。那麼你想跳過空檔案還是返回錯誤？",
   "settings_onedrive_emptyfile_skip": "跳過",
   "settings_onedrive_emptyfile_error": "返回錯誤和中斷",
+
   "settings_webdav": "Webdav 設定",
   "settings_webdav_disclaimer1": "宣告：您所輸入的資訊儲存於本地。其它有害的或者出錯的外掛，是有可能讀取到這些資訊的。如果您發現了 Webdav 伺服器有不符合預期的訪問，請立刻修改使用者名稱和密碼。",
   "settings_webdav_cors_os": "Obsidian 桌面版>=0.13.25 或 iOS>=1.1.1 或 Android>=1.1.1 支援跳過 CORS 設定。但您正在使用舊版，建議升級。",
@@ -247,9 +248,12 @@
   "settings_webdav_depth_desc": "Webdav 伺服器會被設為接收 Depth header 為“1”或“Infinity”請求。如果您不清楚如何設定，可以選擇 depth='1'。如果那你確認伺服器支援 depth='infinity'，請選擇它，會獲得更加好的效能。",
   "settings_webdav_depth_1": "只支援 depth='1'",
   "settings_webdav_depth_inf": "支援 depth='infinity'",
+  "settings_webdav_customheaders": "傳送到伺服器的自定義 Header",
+  "settings_webdav_customheaders_desc": "有些使用者需要設定自定義 header。如果您不知道是什麼，可以直接留空不填。輸入格式：每行形如 <code>X-Header1:value1</code>。header 的 key 和 value 之間的空格會被刪除。",
   "settings_webdav_connect_succ": "很好！可以連線上 Webdav 伺服器。",
   "settings_webdav_connect_fail": "無法連線上 Webdav 伺服器。（可能是地址/賬號/密碼/鑑權型別等錯誤。）",
   "settings_webdav_connect_fail_withcors": "無法連線上 Webdav 伺服器。（可能是地址/賬號/密碼/鑑權型別/CORS 等錯誤。）",
+
   "settings_webdis": "Webdis 設置",
   "settings_webdis_disclaimer1": "聲明：此插件不是 Redis® Ltd 或 Redis® 軟件或 Wedis 的官方產品。Redis 是 Redis Ltd 的註冊商標。",
   "settings_webdis_disclaimer2": "聲明：您所輸入的信息存儲於本地。其它有害的或者出錯的插件，是有可能讀取到這些信息的。如果您發現了 Webdis 服務器有不符合預期的訪問，請立刻修改用戶名和密碼。",
@@ -267,7 +271,7 @@
   "settings_chooseservice_s3": "S3 或相容 S3 的服務",
   "settings_chooseservice_dropbox": "Dropbox",
   "settings_chooseservice_webdav": "Webdav",
-  "settings_chooseservice_onedrive": "OneDrive（個人版）（App Folder）",
+  "settings_chooseservice_onedrive": "OneDrive（個人版）",
   "settings_chooseservice_webdis": "Webdis (an HTTP interface for Redis®)",
   "settings_adv": "進階設定",
   "settings_concurrency": "並行度",
@@ -334,6 +338,7 @@
   "settings_syncplans": "匯出同步計劃",
   "settings_syncplans_desc": "每次您啟動同步，並在實際上傳下載前，外掛會生成同步計劃。它可以使您知道每次同步發生了什麼。點選按鈕可以匯出同步計劃。",
   "settings_syncplans_button_1_only_change": "匯出最近 1 次（僅修改部分）",
+  "settings_syncplans_button_5_only_change": "匯出最近 5 次（僅修改部分）",
   "settings_syncplans_button_1": "匯出最近 1 次",
   "settings_syncplans_button_5": "匯出最近 5 次",
   "settings_syncplans_button_all": "匯出所有",

src/main.ts

@@ -1381,6 +1381,9 @@ export default class RemotelySavePlugin extends Plugin {
     if (this.settings.webdav.remoteBaseDir === undefined) {
       this.settings.webdav.remoteBaseDir = "";
     }
+    if (this.settings.webdav.customHeaders === undefined) {
+      this.settings.webdav.customHeaders = "";
+    }
     if (this.settings.s3.partsConcurrency === undefined) {
       this.settings.s3.partsConcurrency = 20;
     }

src/misc.ts

@@ -467,6 +467,21 @@ export const isSpecialFolderNameToSkip = (
       return true;
     }
   }
+
+  // microsoft tmp files...
+  const p = x.split("/");
+  if (p.length > 0) {
+    const f = p[p.length - 1]; // file name
+    if (f.startsWith("~$")) {
+      const suffixList = ["doc", "docx", "ppt", "pptx", "xls", "xlsx"];
+      for (const suffix of suffixList) {
+        if (f.endsWith(`.${suffix}`)) {
+          return true;
+        }
+      }
+    }
+  }
+
   return false;
 };
 

src/settings.ts

@@ -23,6 +23,7 @@ import type {
 import cloneDeep from "lodash/cloneDeep";
 import { generateAzureBlobStorageSettingsPart } from "../pro/src/settingsAzureBlobStorage";
 import { generateBoxSettingsPart } from "../pro/src/settingsBox";
+import { generateClearDupFilesSettingsPart } from "../pro/src/settingsClearDupFiles";
 import { generateGoogleDriveSettingsPart } from "../pro/src/settingsGoogleDrive";
 import { generateKoofrSettingsPart } from "../pro/src/settingsKoofr";
 import { generateOnedriveFullSettingsPart } from "../pro/src/settingsOnedriveFull";
@@ -1637,6 +1638,27 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
           });
       });
 
+    new Setting(webdavDiv)
+      .setName(t("settings_webdav_customheaders"))
+      .setDesc(stringToFragment(t("settings_webdav_customheaders_desc")))
+      .addTextArea((textArea) => {
+        textArea
+          .setPlaceholder(`X-Header1: Value1\nX-Header2: Value2`)
+          .setValue(`${this.plugin.settings.webdav.customHeaders ?? ""}`)
+          .onChange(async (value) => {
+            this.plugin.settings.webdav.customHeaders = value
+              .trim()
+              .split("\n")
+              .filter((x) => x.trim() !== "")
+              .join("\n");
+            await this.plugin.saveSettings();
+          });
+        textArea.inputEl.rows = 10;
+        textArea.inputEl.cols = 30;
+
+        textArea.inputEl.addClass("webdav-customheaders-textarea");
+      });
+
     let newWebdavRemoteBaseDir =
       this.plugin.settings.webdav.remoteBaseDir || "";
     new Setting(webdavDiv)
@@ -1921,15 +1943,22 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
         dropdown.addOption("dropbox", t("settings_chooseservice_dropbox"));
         dropdown.addOption("webdav", t("settings_chooseservice_webdav"));
         dropdown.addOption("onedrive", t("settings_chooseservice_onedrive"));
-        dropdown.addOption(
-          "onedrivefull",
-          t("settings_chooseservice_onedrivefull")
-        );
         dropdown.addOption("webdis", t("settings_chooseservice_webdis"));
+
+        dropdown.addOption("separator line", "-----");
+        (dropdown.selectEl.lastChild as HTMLElement).setAttribute(
+          "disabled",
+          "disabled"
+        );
+
         dropdown.addOption(
           "googledrive",
           t("settings_chooseservice_googledrive")
         );
+        dropdown.addOption(
+          "onedrivefull",
+          t("settings_chooseservice_onedrivefull")
+        );
         dropdown.addOption("box", t("settings_chooseservice_box"));
         dropdown.addOption("pcloud", t("settings_chooseservice_pcloud"));
         dropdown.addOption(
@@ -2352,6 +2381,8 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
         });
     });
 
+    generateClearDupFilesSettingsPart(advDiv, t, this.app, this.plugin);
+
     const percentage1 = new Setting(advDiv)
       .setName(t("settings_protectmodifypercentage"))
       .setDesc(t("settings_protectmodifypercentage_desc"));
@@ -2774,6 +2805,19 @@ export class RemotelySaveSettingTab extends PluginSettingTab {
           new Notice(t("settings_syncplans_notice"));
         });
       })
+      .addButton(async (button) => {
+        button.setButtonText(t("settings_syncplans_button_5_only_change"));
+        button.onClick(async () => {
+          await exportVaultSyncPlansToFiles(
+            this.plugin.db,
+            this.app.vault,
+            this.plugin.vaultRandomID,
+            5,
+            true
+          );
+          new Notice(t("settings_syncplans_notice"));
+        });
+      })
       .addButton(async (button) => {
         button.setButtonText(t("settings_syncplans_button_1"));
         button.onClick(async () => {

styles.css

@@ -88,6 +88,10 @@
   display: none;
 }
 
+.webdav-customheaders-textarea {
+  font-family: monospace;
+}
+
 .webdis-disclaimer {
   font-weight: bold;
 }