fix: correct file opener
This commit is contained in:
parent
48373d193b
commit
5b9ff10564
2 changed files with 10 additions and 14 deletions
|
|
@ -232,8 +232,10 @@ export type VersionType =
|
||||||
*/
|
*/
|
||||||
"old_beta"
|
"old_beta"
|
||||||
|
|
||||||
const ARGS_MAP = { 'core':'{"writeSettings":["setting"],"getWorlds":["id"],"getRunningProcessesByClusterId":["cluster_id"],"updateClusterProfile":["name","profile"],"getClusterById":["id"],"openMsaLogin":[],"getScreenshots":["id"],"getUsers":[],"getProfileOrDefault":["name"],"updateClusterById":["id","request"],"getDefaultUser":["fallback"],"removeCluster":["id"],"createCluster":["options"],"getPackage":["provider","slug"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"getUsersFromAuthor":["provider","author"],"open":["input"],"getMultiplePackages":["provider","slugs"],"getLogByName":["id","name"],"getLoadersForVersion":["mc_version"],"isClusterRunning":["cluster_id"],"searchPackages":["provider","query"],"setDefaultUser":["uuid"],"getUser":["uuid"],"killProcess":["pid"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"launchCluster":["id","uuid"],"getClusters":[],"getRunningProcesses":[],"getGameVersions":[],"getGlobalProfile":[],"getPackageBody":["provider","body"],"removeUser":["uuid"],"fetchMinecraftProfile":["uuid"],"readSettings":[],"getLogs":["id"]}', 'oneclient':'{"getClustersGroupedByMajor":[],"openDevTools":[]}', 'events':'{"message":["event"],"ingress":["event"],"process":["event"]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}' }
|
const ARGS_MAP = { 'oneclient':'{"getClustersGroupedByMajor":[],"openDevTools":[]}', 'core':'{"writeSettings":["setting"],"getWorlds":["id"],"getRunningProcessesByClusterId":["cluster_id"],"updateClusterProfile":["name","profile"],"getClusterById":["id"],"openMsaLogin":[],"getScreenshots":["id"],"getUsers":[],"getProfileOrDefault":["name"],"updateClusterById":["id","request"],"getDefaultUser":["fallback"],"removeCluster":["id"],"createCluster":["options"],"getPackage":["provider","slug"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"getUsersFromAuthor":["provider","author"],"open":["input"],"getMultiplePackages":["provider","slugs"],"getLogByName":["id","name"],"getLoadersForVersion":["mc_version"],"isClusterRunning":["cluster_id"],"searchPackages":["provider","query"],"setDefaultUser":["uuid"],"getUser":["uuid"],"killProcess":["pid"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"launchCluster":["id","uuid"],"getClusters":[],"getRunningProcesses":[],"getGameVersions":[],"getGlobalProfile":[],"getPackageBody":["provider","body"],"removeUser":["uuid"],"fetchMinecraftProfile":["uuid"],"readSettings":[],"getLogs":["id"]}', 'events':'{"message":["event"],"ingress":["event"],"process":["event"]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}' }
|
||||||
export type Router = { 'events': { ingress: (event: IngressPayload) => Promise<void>,
|
export type Router = { 'folders': { fromCluster: (folderName: string) => Promise<string>,
|
||||||
|
openCluster: (folderName: string) => Promise<null> },
|
||||||
|
'events': { ingress: (event: IngressPayload) => Promise<void>,
|
||||||
message: (event: MessagePayload) => Promise<void>,
|
message: (event: MessagePayload) => Promise<void>,
|
||||||
process: (event: ProcessPayload) => Promise<void> },
|
process: (event: ProcessPayload) => Promise<void> },
|
||||||
'core': { getClusters: () => Promise<ClusterModel[]>,
|
'core': { getClusters: () => Promise<ClusterModel[]>,
|
||||||
|
|
@ -273,9 +275,7 @@ getUsersFromAuthor: (provider: Provider, author: PackageAuthor) => Promise<Manag
|
||||||
fetchMinecraftProfile: (uuid: string) => Promise<MojangPlayerProfile>,
|
fetchMinecraftProfile: (uuid: string) => Promise<MojangPlayerProfile>,
|
||||||
open: (input: string) => Promise<null> },
|
open: (input: string) => Promise<null> },
|
||||||
'oneclient': { openDevTools: () => Promise<void>,
|
'oneclient': { openDevTools: () => Promise<void>,
|
||||||
getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>> },
|
getClustersGroupedByMajor: () => Promise<Partial<{ [key in number]: ClusterModel[] }>> } };
|
||||||
'folders': { fromCluster: (folderName: string) => Promise<string>,
|
|
||||||
openCluster: (folderName: string) => Promise<null> } };
|
|
||||||
|
|
||||||
|
|
||||||
export type { InferCommandOutput }
|
export type { InferCommandOutput }
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,12 @@
|
||||||
// import DiscordIcon from '@/assets/logos/discord.svg';
|
// import DiscordIcon from '@/assets/logos/discord.svg';
|
||||||
import SettingsRow from '@/components/SettingsRow';
|
import SettingsRow from '@/components/SettingsRow';
|
||||||
|
import SettingsSwitch from '@/components/SettingSwitch';
|
||||||
import { useSettings } from '@/hooks/useSettings';
|
import { useSettings } from '@/hooks/useSettings';
|
||||||
|
import { bindings } from '@/main';
|
||||||
// import useSettings from '@/hooks/useSettings';
|
// import useSettings from '@/hooks/useSettings';
|
||||||
import { Button, Switch } from '@onelauncher/common/components';
|
import { Button, Switch } from '@onelauncher/common/components';
|
||||||
import { createFileRoute } from '@tanstack/react-router';
|
import { createFileRoute } from '@tanstack/react-router';
|
||||||
import { dataDir, join } from '@tauri-apps/api/path';
|
import { dataDir, join } from '@tauri-apps/api/path';
|
||||||
import { openPath } from '@tauri-apps/plugin-opener';
|
|
||||||
import { FolderIcon, Link03Icon, LinkExternal01Icon } from '@untitled-theme/icons-react';
|
import { FolderIcon, Link03Icon, LinkExternal01Icon } from '@untitled-theme/icons-react';
|
||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import Sidebar from './route';
|
import Sidebar from './route';
|
||||||
|
|
@ -15,7 +16,7 @@ export const Route = createFileRoute('/app/settings/')({
|
||||||
});
|
});
|
||||||
|
|
||||||
function RouteComponent() {
|
function RouteComponent() {
|
||||||
const { setting, setSetting } = useSettings();
|
const { setting, setSetting, createSetting } = useSettings();
|
||||||
const [launcherDir, setLauncherDir] = useState('');
|
const [launcherDir, setLauncherDir] = useState('');
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|
@ -24,9 +25,7 @@ function RouteComponent() {
|
||||||
})();
|
})();
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const openLauncherDir = () => openPath(launcherDir);
|
const openLauncherDir = () => bindings.core.open(launcherDir);
|
||||||
|
|
||||||
// const [discordRpc, setDiscordRpc] = createSetting('discord_enabled', settings?.discord_enabled);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Sidebar.Page>
|
<Sidebar.Page>
|
||||||
|
|
@ -38,10 +37,7 @@ function RouteComponent() {
|
||||||
icon={<Link03Icon />}
|
icon={<Link03Icon />}
|
||||||
title="Discord RPC"
|
title="Discord RPC"
|
||||||
>
|
>
|
||||||
<Switch
|
<SettingsSwitch setting={createSetting('discord_enabled')} />
|
||||||
isSelected={setting('discord_enabled')}
|
|
||||||
onChange={val => setSetting('discord_enabled', val)}
|
|
||||||
/>
|
|
||||||
</SettingsRow>
|
</SettingsRow>
|
||||||
|
|
||||||
{/* <SettingsRow
|
{/* <SettingsRow
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue