diff --git a/src/components/openFolder.ts b/src/components/openFolder.ts new file mode 100644 index 0000000..dc76c38 --- /dev/null +++ b/src/components/openFolder.ts @@ -0,0 +1,18 @@ +import {spawn} from 'child_process'; +import logger from './logger'; + +export default function openFolder(path:string) { + if (process.platform === 'darwin') { + spawn('open', [path]).on('error', (err) => { + logger.errorMSG(err.message); + }); + } else if (process.platform === 'win32') { + spawn('explorer', [path]).on('error', (err) => { + logger.errorMSG(err.message); + }); + } else if (process.platform === 'linux') { + spawn('xdg-open', [path]).on('error', (err) => { + logger.errorMSG(err.message); + }); + } +} \ No newline at end of file diff --git a/src/components/ui/mainSide.tsx b/src/components/ui/mainSide.tsx index 90ec300..c8d38f0 100644 --- a/src/components/ui/mainSide.tsx +++ b/src/components/ui/mainSide.tsx @@ -2,8 +2,8 @@ import React, {useState, useEffect} from "react"; import { dialog } from "@electron/remote"; import { settingList, updateSettings } from "../settings"; import logger from "../logger"; -import {exec} from "child_process"; import {blender, blenderCmd} from "../blender-controller"; +import openFolder from "../openFolder"; function MainSide() { const [logs, setLogs] = useState(settingList.log); @@ -112,15 +112,4 @@ function openVid(updateHook:React.Dispatch>) { }); } -function openFolder(folder:string) { - if(settingList.output == "None") { - logger.warningMSG("No output folder set!"); - } else { - exec('start "" "' + folder + '"'); - } -} - -export default MainSide; -export { - openFolder -} \ No newline at end of file +export default MainSide; \ No newline at end of file diff --git a/src/components/ui/renderingSide.tsx b/src/components/ui/renderingSide.tsx index 6b4f8b1..727f043 100644 --- a/src/components/ui/renderingSide.tsx +++ b/src/components/ui/renderingSide.tsx @@ -1,6 +1,6 @@ import React, {useState} from "react"; import { settingList } from "../settings"; -import {openFolder} from "./mainSide"; +import openFolder from "../openFolder"; let setLogNumber:React.Dispatch>; let setStatus:React.Dispatch>;