starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-10 03:03:37 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Fix Windows paths for new plugin runtime

Browse Source
This commit is contained in:
Gregory Schier
2024-08-09 12:43:56 -07:00
parent 331f1eb9b9
commit 48c239b7dc
3 changed files with 1952 additions and 1932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugin-runtime/src/index.worker.ts
View File

@@ -8,9 +8,11 @@ import { parentPort, workerData } from 'node:worker_threads';
new Promise<void>(async (resolve, reject) => { new Promise<void>(async (resolve, reject) => {
const { pluginDir /*, pluginRefId*/ } = workerData; const { pluginDir /*, pluginRefId*/ } = workerData;
const pathMod = path.join(pluginDir, 'build/index.js');
const pathPkg = path.join(pluginDir, 'package.json'); const pathPkg = path.join(pluginDir, 'package.json');
// NOTE: Use POSIX join because require() needs forward slash
const pathMod = path.posix.join(pluginDir, 'build', 'index.js');
let pkg: { [x: string]: any }; let pkg: { [x: string]: any };
try { try {
pkg = JSON.parse(readFileSync(pathPkg, 'utf8')); pkg = JSON.parse(readFileSync(pathPkg, 'utf8'));

3875
src-tauri/gen/schemas/windows-schema.json
View File

File diff suppressed because it is too large Load Diff

3
src-tauri/yaak_plugin_runtime/src/plugin.rs
View File

@@ -112,12 +112,11 @@ async fn read_plugins_dir(dir: &PathBuf) -> Result<Vec<String>> {
Ok(dirs) Ok(dirs)
} }
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
fn fix_windows_paths(p: &PathBuf) -> String { fn fix_windows_paths(p: &PathBuf) -> String {
use dunce; use dunce;
use regex::Regex;
use path_slash::PathBufExt; use path_slash::PathBufExt;
use regex::Regex;
// 1. Remove UNC prefix for Windows paths to pass to sidecar // 1. Remove UNC prefix for Windows paths to pass to sidecar
let safe_path = dunce::simplified(p.as_path()).to_string_lossy().to_string(); let safe_path = dunce::simplified(p.as_path()).to_string_lossy().to_string();