fix(windows): Fix windows path compatibility issues.

Author: walkthunder

src/html-generation/asset-handler.ts

@@ -30,10 +30,11 @@ export class AssetHandler
 	private static vaultPluginsPath: Path;
 	private static thisPluginPath: Path;
 
+	
 	// this path is used to generate the relative path to the images folder, likewise for the other paths
-	public static readonly mediaFolderName: Path = new Path("lib/media");
-	public static readonly jsFolderName: Path = new Path("lib/scripts");
-	public static readonly cssFolderName: Path = new Path("lib/styles");
+	public static readonly mediaFolderName: Path = Path.getAssetsPath('media');
+	public static readonly jsFolderName: Path = Path.getAssetsPath('scripts');
+	public static readonly cssFolderName: Path = Path.getAssetsPath('styles');
 
 	public static appStyles: string = "";
 	public static mathStyles: string = "";

src/html-generation/html-generator.ts

@@ -110,7 +110,9 @@ export class HTMLGenerator {
 		// inject file tree
 		if (InvioSettingTab.settings.includeFileTree) {
 			let tree = GlobalDataGenerator.getFileTree();
-			const rootDir = new Path(file.exportPath.asString.split('/')[0])
+			const rootDir = file.exportPath.getRootDirFromString(); 
+			console.log('file.exportPath: ', file.exportPath, file.exportPath.asString, rootDir);
+
 			if (rootDir !== rootPath) {
 				const remoteRoot = rootPath.asString;
 				const prefix = remoteRoot.startsWith('/') ? '' : '/';
@@ -243,9 +245,9 @@ export class HTMLGenerator {
 		if (addSelfToDownloads) file.downloads.push(file.getSelfDownloadable());
 		file.downloads.push(...outlinedImages);
 
-		const downloadDir = new Path(file.exportPath.asString.split('/')[0]);
+		const downloadDir = file.exportPath.getRootDirFromString();
 		await AssetHandler.reparseAppStyles(downloadDir, rootPath.asString, remoteDomain);
-		log.info('assets download root path: ', rootPath, downloadDir)
+		log.info('assets download root path and dir: ', rootPath, downloadDir)
 		file.downloads.push(...await AssetHandler.getDownloads(downloadDir));
 
 		if (InvioSettingTab.settings.makeNamesWebStyle) {
@@ -881,7 +883,7 @@ export class HTMLGenerator {
 	}
 
 	private static generateRootDirNode(file: ExportFile, rootPath: string, usingDocument: Document) {
-		const rootDir = rootPath || file.exportPath.directory.asString?.split('/')[0];
+		const rootDir = rootPath || file.exportPath.directory.getRootDirFromString().asString;
 		const container = usingDocument.createElement('div');
 		container.id = 'invio-hidden-data-node'
 		container.style.display = 'none';

src/html-generation/markdown-renderer.ts

@@ -8,7 +8,7 @@ import { AssetHandler } from "./asset-handler";
 import { RenderLog } from "./render-log";
 import { StatsView } from "src/statsView";
 import type InvioPlugin from "../main"; // unavoidable
-import { Path } from "src/utils/path.js";
+import { Path, parseOSFromUA } from "src/utils/path.js";
 export namespace MarkdownRenderer
 {
 	export let problemLog = "";
@@ -193,13 +193,16 @@ export namespace MarkdownRenderer
 		// @ts-ignore
 		// renderLeaf.view.containerEl.win.resizeTo(1, 1);
 		// @ts-ignore
-		// renderLeaf.view.containerEl.win.moveTo(window.screen.width + 450, window.screen.height + 450);
+		renderLeaf.view.containerEl.win.moveTo(window.screen.width + 450, window.screen.height + 450);
 
 		// @ts-ignore
 		const renderBrowserWindow = window.electron.remote.BrowserWindow.getFocusedWindow();
 		if (renderBrowserWindow) {
-			renderBrowserWindow.hide();
-			// renderBrowserWindow.setAlwaysOnTop(false, "floating", 1);
+			if (parseOSFromUA(navigator.userAgent) !== 'win32') {
+				console.log('is windows platform');
+				renderBrowserWindow.hide();
+				renderBrowserWindow.setAlwaysOnTop(false, "floating", 1);
+			}
 			renderBrowserWindow.webContents.setFrameRate(120);
 			renderBrowserWindow.on("close", () =>
 			{

src/main.ts

@@ -283,7 +283,8 @@ 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 => 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'))
       log.info('local file path list: ', local);
       // const local = this.app.vault.getAllLoadedFiles();
       const localHistory = await loadFileHistoryTableByVault(
@@ -378,9 +379,8 @@ export default class InvioPlugin extends Plugin {
         //   })
         // );
         let allFiles = this.app.vault.getMarkdownFiles();
-        const basePath = new Path(this.settings.localWatchDir);
         // 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).directory.asString.startsWith(basePath.asString) && (file.extension === "md") && (!file.name.endsWith('.conflict.md')));
+        allFiles = allFiles.filter((file: TFile) => new Path(file.path).isInsideDir(this.settings.localWatchDir) && (file.extension === "md") && (!file.name.endsWith('.conflict.md')));
         // Make functions of StatsView static
         view = await HTMLGenerator.beginBatch(this, allFiles);
         log.info('init stats view: ', view);

src/remoteForS3.ts

@@ -420,7 +420,7 @@ export const listFromRemote = async (
     Bucket: s3Config.s3BucketName,
   } as ListObjectsV2CommandInput;
   if (prefix !== undefined) {
-    confCmd.Prefix = prefix;
+    confCmd.Prefix = prefix + (prefix.endsWith('/') ? '' : '/');
   }
 
   const contents = [] as _Object[];

src/utils/path.ts

@@ -1,10 +1,43 @@
 const pathTools = require('upath');
 import {  existsSync } from 'fs';
 import { FileSystemAdapter, Notice } from 'obsidian';
-import { Utils } from './utils';
+import { Utils, NodeJSPlatform } from './utils';
 import { promises as fs } from 'fs';
 import internal from 'stream';
 
+export function parseOSFromUA(userAgent: string): NodeJSPlatform | undefined {
+	const osRegex = /(Windows NT|Mac OS X|Linux|Android|iOS|CrOS)[/ ]([\d._]+)/;
+	const match = userAgent.match(osRegex);
+
+	if (match && match.length >= 3) {
+	  const osName = match[1].toLowerCase();
+	  switch (osName) {
+		case 'windows nt':
+		  return 'win32';
+		case 'mac os x':
+		  return 'darwin';
+		case 'linux':
+		  return 'linux';
+		case 'android':
+		  return 'linux';
+		case 'ios':
+		  return 'darwin';
+		case 'cros':
+		  return 'linux';
+		default:
+		  return undefined;
+	  }
+	}
+  
+	return undefined;
+}
+
+const isWindows: boolean = (typeof process.platform === 'string' ?
+	process.platform :
+	parseOSFromUA(navigator.userAgent)) === "win32";
+
+const PATH_SPLITER = isWindows ? '\\' : '/';
+
 export class Path
 {
 	private static logQueue: { title: string, message: string, type: "info" | "warn" | "error" | "fatal" }[] = [];
@@ -30,8 +63,9 @@ export class Path
 	private _isFile: boolean = false;
 	private _exists: boolean | undefined = undefined;
 	private _workingDirectory: string;
+	private _spliter: string = PATH_SPLITER;
 
-	private _isWindows: boolean = process.platform === "win32";
+	private _isWindows: boolean = isWindows;
 
 	constructor(path: string, workingDirectory: string = Path.vaultPath.asString)
 	{
@@ -42,6 +76,12 @@ export class Path
 		if (this.isAbsolute) this._workingDirectory = "";
 	}
 
+	// @params
+	// type - media | scripts | styles
+	static getAssetsPath(type: string) {
+		return new Path(['lib', type].join(PATH_SPLITER));
+	}
+
 	reparse(path: string): Path
 	{
 		let parsed = Path.parsePath(path);
@@ -189,6 +229,15 @@ export class Path
 		return new Path("/", "");
 	}
 
+	getRootDirFromString() {
+		return new Path(this.asString.split(this._spliter)[0]);
+	}
+
+	isInsideDir(dirname: string) {
+		const withSpliter = dirname?.endsWith(this._spliter);
+		return this.asString.startsWith(dirname + (withSpliter ? '' : this._spliter));
+	}
+
 	static toWebStyle(path: string): string
 	{
 		return path.replaceAll(" ", "-").replaceAll(/-{2,}/g, "-").replace(".-", "-").toLowerCase();

src/utils/utils.ts

@@ -8,7 +8,7 @@ import { StatsView } from 'src/statsView';
 
 /* @ts-ignore */
 const dialog: Electron.Dialog = require('electron').remote.dialog;
-
+export type NodeJSPlatform = 'aix' | 'darwin' | 'freebsd' | 'linux' | 'openbsd' | 'sunos' | 'win32';
 export class Utils
 {
 	static padStringBeggining(str: string, length: number, char: string)