EZPPFarm/EZPPLauncher
1
0 Fork 0
Code Issues Pull Requests Actions Releases 37 Activity

fix: cleanup type defs

Browse Source
This commit is contained in:
HorizonCode committed 2026-05-21 10:41:22 +02:00
1 parent 2532ab0059
commit 09487e945e
2 files changed
+24 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/lib/osuUtil.ts
+23 -38
View File
@@ -17,20 +17,14 @@ export function normalizeOsuName(name: string): string {
); );
} }
export const getHWID = async () => { export const getHWID = async (): Promise<string | undefined> =>
const hwid = await invoke('get_hwid'); await invoke<string | undefined>('get_hwid');
return typeof hwid === 'string' ? hwid : undefined;
};
export const isValidOsuFolder = async (folder: string): Promise<boolean> => { export const isValidOsuFolder = async (folder: string): Promise<boolean | undefined> =>
const result = await invoke('valid_osu_folder', { folder }); await invoke<boolean | undefined>('valid_osu_folder', { folder });
return typeof result === 'boolean' ? result : false;
};
export const autoDetectOsuInstallFolder = async () => { export const autoDetectOsuInstallFolder = async () =>
const result = await invoke('find_osu_installation'); await invoke<string | undefined>('find_osu_installation');
return typeof result === 'string' ? result : undefined;
};
export const setUserConfigValues = async ( export const setUserConfigValues = async (
osuFolderPath: string, osuFolderPath: string,
@@ -50,29 +44,23 @@ export const setConfigValues = async (
entries, entries,
}); });
export const getReleaseStream = async (folder: string) => { export const getReleaseStream = async (folder: string): Promise<string | undefined> =>
const result = await invoke('get_osu_release_stream', { folder }); await invoke<string | undefined>('get_osu_release_stream', { folder });
return typeof result === 'string' ? result : undefined;
};
export const getVersion = async (folder: string) => { export const getVersion = async (folder: string): Promise<string | undefined> =>
const result = await invoke('get_osu_version', { folder }); await invoke<string | undefined>('get_osu_version', { folder });
return typeof result === 'string' ? result : undefined;
};
export const getBeatmapSetsCount = async (folder: string) => { export const getBeatmapSetsCount = async (folder: string): Promise<number | undefined> =>
const result = await invoke('get_beatmapsets_count', { await invoke<number | undefined>('get_beatmapsets_count', {
folder, folder,
}); });
return typeof result === 'number' ? result : 0;
};
export const getSkin = async (folder: string) => { export const getSkin = async (folder: string) => {
const result = await invoke('get_osu_skin', { const result = await invoke<string | undefined>('get_osu_skin', {
folder, folder,
}); });
return typeof result === 'string' ? result : 'Default'; return result || 'Default';
}; };
export const runUpdater = async (folder: string) => await invoke('run_osu_updater', { folder }); export const runUpdater = async (folder: string) => await invoke('run_osu_updater', { folder });
@@ -113,8 +101,8 @@ export const downloadEZPPLauncherUpdateFiles = async (
allFiles: UpdateFile[], allFiles: UpdateFile[],
progressCallback: (file: UpdateStatus) => void progressCallback: (file: UpdateStatus) => void
) => { ) => {
const downloadStatusListen = await listen('download-progress', (event) => const downloadStatusListen = await listen<UpdateStatus>('download-progress', (event) =>
progressCallback(event.payload as UpdateStatus) progressCallback(event.payload)
); );
try { try {
await invoke('download_ezpp_launcher_update_files', { folder, updateFiles, allFiles }); await invoke('download_ezpp_launcher_update_files', { folder, updateFiles, allFiles });
@@ -127,20 +115,17 @@ export const replaceUIFiles = async (folder: string, revert: boolean) => {
await invoke('replace_ui_files', { folder, revert }); await invoke('replace_ui_files', { folder, revert });
}; };
export const isOsuRunning = async () => { export const isOsuRunning = async (): Promise<boolean> => await invoke<boolean>('is_osu_running');
const result = await invoke('is_osu_running');
return typeof result === 'boolean' ? result : false;
};
export const getLauncherVersion = async () => await invoke<string>('get_launcher_version'); export const getLauncherVersion = async () => await invoke<string>('get_launcher_version');
export const exit = async () => await invoke('exit'); export const exit = async () => await invoke('exit');
export const getPlatform = async () => await invoke<string>('get_platform'); export const getPlatform = async (): Promise<string> => await invoke<string>('get_platform');
export const isOsuCorrupted = async (folder: string) => export const isOsuCorrupted = async (folder: string): Promise<boolean> =>
await invoke<boolean>('check_for_corruption', { folder }); await invoke<boolean>('check_for_corruption', { folder });
export const hasWMCTRL = async () => await invoke<boolean>('has_wmctrl'); export const hasWMCTRL = async (): Promise<boolean> => await invoke<boolean>('has_wmctrl');
export const hasOsuWinello = async () => await invoke<boolean>('has_osuwinello'); export const hasOsuWinello = async (): Promise<boolean> => await invoke<boolean>('has_osuwinello');
export const hasNet8 = async () => await invoke<boolean>('has_net8'); export const hasNet8 = async (): Promise<boolean> => await invoke<boolean>('has_net8');
export const encryptString = async (str: string, entropy: string) => export const encryptString = async (str: string, entropy: string): Promise<string> =>
await invoke<string>('encrypt_string', { string: str, entropy }); await invoke<string>('encrypt_string', { string: str, entropy });
export const downloadUpdate = async ( export const downloadUpdate = async (
url: string, url: string,
src/screens/Launch.svelte
+1 -1
View File
@@ -728,7 +728,7 @@
console.log(initialUrls); console.log(initialUrls);
} }
await listen('opened', (event) => { await listen<string[]>('opened', (event) => {
console.log(event.payload); console.log(event.payload);
}); });
}; };