Merge pull request #68 from BakaFT/feat/Folder

Add optional `path` param to `OpenPluginsFolder`
PenguLoader · Aug 5, 2023 · b98f0b8 · b98f0b8
2 parents 751bd63 + df18c9b
commit b98f0b8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/core/src/renderer/renderer.cc b/core/src/renderer/renderer.cc
@@ -72,10 +72,17 @@ static V8Value *native_OpenAssetsFolder(const vec<V8Value *> &args)
 }
 
 static V8Value *native_OpenPluginsFolder(const vec<V8Value *> &args)
-{
-    utils::openLink(config::pluginsDir());
+{   
+    wstr destPath = config::pluginsDir();
+    if (args.size()) {
+        destPath = destPath + L"\\" + args[0]->asString()->str;
+        if (!utils::isDir(destPath)) {
+            return V8Value::boolean(false);
+        }
+    }
+    utils::openLink(destPath);
 
-    return nullptr;
+    return V8Value::boolean(true);
 }
 
 static V8Value *native_ReloadClient(const vec<V8Value *> &args)

diff --git a/plugins/src/preload/api/index.ts b/plugins/src/preload/api/index.ts
@@ -12,8 +12,15 @@ window.openAssetsFolder = function () {
   native.OpenAssetsFolder();
 };
 
-window.openPluginsFolder = function () {
-  native.OpenPluginsFolder();
+window.openPluginsFolder = function (path?: string) {
+  if(arguments.length > 1) return false;
+  if (path === undefined) return native.OpenPluginsFolder();
+  if(typeof path !== 'string') return false;
+
+  if(path.includes('..')) return false;
+  if(path === "") path = ".";
+
+  return native.OpenPluginsFolder(path);
 };
 
 window.reloadClient = function () {

diff --git a/plugins/src/preload/api/native.ts b/plugins/src/preload/api/native.ts
@@ -1,7 +1,7 @@
 interface Native {
   OpenDevTools: (remote: boolean) => void;
   OpenAssetsFolder: () => void;
-  OpenPluginsFolder: () => void;
+  OpenPluginsFolder: (path?: string) => boolean;
   ReloadClient: () => void;
 
   GetWindowEffect: () => string;

diff --git a/plugins/src/types.d.ts b/plugins/src/types.d.ts
@@ -47,7 +47,7 @@ declare const Effect: Effect;
 
 declare const openDevTools: (remote?: boolean) => void;
 declare const openAssetsFolder: () => void;
-declare const openPluginsFolder: () => void;
+declare const openPluginsFolder: (path?: string) => boolean;
 declare const reloadClient: () => void;
 declare const restartClient: () => void;
 declare const getScriptPath: () => string | undefined;