feat(path)：use uniformed path handler for windows.

Author: walkthunder

src/exporter.ts

@@ -116,9 +116,10 @@ export const publishFiles = async (
 
         const exportedFile = await exportFile(file, new Path(path), htmlFilePath, new Path(client.getUseHostSlug()), view, client);
         if (exportedFile) {
+            log.info('exported file downloads: ', exportedFile.downloads);
             externalFiles.push(...exportedFile.downloads.map((d: Downloadable) => {
                 const afterPath = exportedFile.exportToFolder.join(d.relativeDownloadPath);
-                const fileKey = Path.localToWebPath((d.relativeDownloadPath.asString + '/' + d.filename).replace(/^\.\//, ''));
+                const fileKey = (d.relativeDownloadPath.asString + '/' + d.filename).replace(/^\.\//, '');
 
                 const mdName = (file.path.endsWith('.md') && (fileKey?.replace(/\.html$/ig, '') === file.path.replace(/\.md$/igm, ''))) ? file.path : undefined
                 Object.assign(d, {

src/main.ts

@@ -36,7 +36,7 @@ import {
 } from "./localdb";
 import { RemoteClient, ServerDomain } from "./remote";
 import { InvioSettingTab, DEFAULT_SETTINGS } from "./settings";
-import { fetchMetadataFile, parseRemoteItems, SyncStatusType, RemoteSrcPrefix, syncAttachment } from "./sync";
+import { fetchMetadataFile, parseRemoteItems, SyncStatusType, RemoteSrcPrefix, syncAttachment, LocalConflictPrefix, RemoteConflictPrefix } from "./sync";
 import { doActualSync, getSyncPlan, isPasswordOk } from "./sync";
 import { messyConfigToNormal, normalConfigToMessy } from "./configPersist";
 import { ObsConfigDirFileType, listFilesInObsFolder } from "./obsFolderLister";
@@ -282,8 +282,13 @@ export default class InvioPlugin extends Plugin {
       // this.app.vault.getAllLoadedFiles
       // TODO: List only concerned files, only source of truth
       // *.conflict.md files is for data backup when conflicts happened
-      // const local = this.app.vault.getMarkdownFiles().filter(file => file.path.startsWith(this.settings.localWatchDir + '/') && !file.path.endsWith('.conflict.md'))
-      const local = this.app.vault.getMarkdownFiles().filter(file => new Path(file.path).isInsideDir(this.settings.localWatchDir) && !file.path.endsWith('.conflict.md'))
+      const local = this.app.vault.getMarkdownFiles().filter(file => {
+        const p = new Path(file.path);
+        return p.isInsideDir(this.settings.localWatchDir) &&
+          !p.isInsideDir(RemoteConflictPrefix) &&
+          !p.isInsideDir(LocalConflictPrefix) &&
+          !file.path.endsWith('.conflict.md')
+      });
       log.info('local file path list: ', local);
       // const local = this.app.vault.getAllLoadedFiles();
       const localHistory = await loadFileHistoryTableByVault(
@@ -372,11 +377,6 @@ export default class InvioPlugin extends Plugin {
       await insertSyncPlanRecordByVault(this.db, plan, this.vaultRandomID);
       let view: StatsView;
       if (triggerSource !== "dry") {
-        // getNotice(
-        //   t("syncrun_step7", {
-        //     maxSteps: `${MAX_STEPS}`,
-        //   })
-        // );
         let allFiles = this.app.vault.getMarkdownFiles();
         // if we are at the root path export all files, otherwise only export files in the folder we are exporting
         allFiles = allFiles.filter((file: TFile) => new Path(file.path).isInsideDir(this.settings.localWatchDir) && (file.extension === "md") && (!file.name.endsWith('.conflict.md')));

src/misc.ts

@@ -13,12 +13,18 @@ declare global {
   }
 }
 
+function removePathDelimiters(filePath: string) {
+  return filePath.replace(/^[/\\]+|[/\\]+$/g, '');
+}
+
 export const trimPrefix = (key: string, prefix: string) => {
   if (!key) return key;
-  if (key.startsWith(prefix)) {
-    return key.slice(prefix.length)
+  const prefixWithoutDel = removePathDelimiters(prefix);
+  if (key.startsWith(prefixWithoutDel + '\\') || key.startsWith(prefixWithoutDel + '/')) {
+    return key.slice(prefixWithoutDel.length + 1)
   }
-  return key;
+  const reg = new RegExp(`^${prefix}`);
+  return key.replace(reg, '');
 }
 
 /**

src/remote.ts

@@ -99,7 +99,7 @@ export class RemoteClient {
       }
     }
 
-    return Path.localToWebPath(localPath);
+    return localPath;
   }
 
   getUseHostLocalPath(slug: string) {
@@ -130,7 +130,7 @@ export class RemoteClient {
       }
     }
 
-    return Path.webToLocalPath(webPath)
+    return webPath
   }
 
   uploadToRemote = async (

src/remoteForS3.ts

@@ -340,9 +340,9 @@ export const uploadToRemote = async (
   rawContent: string | ArrayBuffer = "",
   remoteKey?: string
 ) => {
-  let uploadFileKey = Path.localToWebPath(prefix + fileOrFolderPath);
+  let uploadFileKey = prefix + fileOrFolderPath;
   if (password !== "") {
-    uploadFileKey = Path.localToWebPath(prefix + remoteEncryptedKey);
+    uploadFileKey = prefix + remoteEncryptedKey;
   }
   const isFolder = Path.isFolderOrDir(fileOrFolderPath);
 
@@ -537,9 +537,9 @@ export const downloadFromRemote = async (
       localContent = await decryptArrayBuffer(remoteContent, password);
     }
     if (!skipSaving) {
-      await vault.adapter.writeBinary(Path.webToLocalPath(renamedTo || fileOrFolderPath), localContent, {
-        mtime: mtime,
-      });
+      log.info('creating file: ', renamedTo || fileOrFolderPath);
+      const option = mtime ? { mtime } : null;
+      await vault.adapter.writeBinary(renamedTo || fileOrFolderPath, localContent, option);
     }
     return localContent;
   }

src/sync.ts

@@ -54,10 +54,14 @@ import {
 } from "./metadataOnRemote";
 import { isInsideObsFolder, ObsConfigDirFileType } from "./obsFolderLister";
 import { Utils } from './utils/utils';
+import { Path } from './utils/path';
 import { log } from "./moreOnLog";
+import { settings } from "assets/webworker.txt";
 
 export const RemoteSrcPrefix = 'op-remote-source-raw/'
 export const RemoteAttPrefix = 'op-remote-attach-p/'
+export const LocalConflictPrefix = 'local.conflict'
+export const RemoteConflictPrefix = 'remote.conflict'
 // 影响到pub产物变动的decision
 const RemoteFileTouchedDecisions = ['uploadLocalDelHistToRemote', 'uploadLocalToRemote'];
 const LocalFileTouchedDecisions = ['downloadRemoteToLocal', 'keepRemoteDelHist'];
@@ -1254,7 +1258,10 @@ const dispatchOperationToActual = async (
     if (r.remoteUnsync) {
       // TODO: Add a hook to alert users the risk of data lost on the remote
       log.info('download last changed version from remote for backup: ', r.key)
-      const renamed = r.key.replace(/\.md$/ig, '.conflict.md');
+      const conflictKey = () => '.' + Math.random().toFixed(4).slice(2) + '.conflict.md'
+      let renamed = r.key.replace(/\.md$/ig, conflictKey());
+      renamed = Path.insertSubPath(renamed, RemoteConflictPrefix)
+      await mkdirpInVault(renamed, vault);
       await client.downloadFromRemote(
         r.key,
         RemoteSrcPrefix,
@@ -1295,10 +1302,8 @@ const dispatchOperationToActual = async (
       log.info('rename last changed version from local for backup: ', r.key)
       const conflictKey = () => '.' + Math.random().toFixed(4).slice(2) + '.conflict.md'
       let renamed = r.key.replace(/\.md$/ig, conflictKey());
-
-      if (vault.adapter.exists(renamed)) {
-        renamed = renamed.replace('.conflict.md', conflictKey())
-      }
+      renamed = Path.insertSubPath(renamed, LocalConflictPrefix)
+      await mkdirpInVault(renamed, vault);
       await vault.adapter.rename(r.key, renamed);
       await Utils.appendFile(vault, renamed, ConflictDescriptionTxt);
     }
@@ -1716,7 +1721,7 @@ export const syncAttachment = async (vault: Vault, client: RemoteClient, embeds:
         link,
         RemoteAttPrefix,
         vault,
-        0,
+        Date.now(),
         '',
         '',
         false,

src/utils/path.ts

@@ -36,7 +36,7 @@ const isWindows: boolean = (typeof process.platform === 'string' ?
 	process.platform :
 	parseOSFromUA(navigator.userAgent)) === "win32";
 
-export const PATH_SPLITER = isWindows ? '\\' : '/';
+export const PATH_SPLITER = '/';
 export const WEB_PATH_SPLITER = '/';
 
 export class Path
@@ -244,16 +244,6 @@ export class Path
 		return path.replaceAll(" ", "-").replaceAll(/-{2,}/g, "-").replace(".-", "-").toLowerCase();
 	}
 
-	static localToWebPath(path: string): string {
-		return path.replaceAll(PATH_SPLITER, '/')
-	}
-
-	static webToLocalPath(path: string): string {
-		if (isWindows) {
-			return path.replaceAll('/', PATH_SPLITER);
-		}
-		return path;
-	}
 	static splitString(path: string): string[] {
 		if (!path) return [];
 		return path.split(PATH_SPLITER);
@@ -265,6 +255,19 @@ export class Path
 		return path.endsWith(PATH_SPLITER) || path.endsWith(WEB_PATH_SPLITER);
 	}
 
+	static getPathSpliter() {
+		return PATH_SPLITER;
+	}
+	static removePathDelimiters(filePath: string) {
+		return filePath.replace(/^[/\\]+|[/\\]+$/g, '');
+	}
+	static insertSubPath(path: string, subPath: string): string {
+		if (!path || !subPath) return path;
+		const pList = path.split(PATH_SPLITER);
+		pList.splice(1, 0, Path.removePathDelimiters(subPath));
+		return pList.filter(p => !!p).join('/');
+	}
+
 	joinString(...paths: string[]): Path
 	{
 		return this.copy.reparse(Path.joinStringPaths(this.asString, ...paths));