EZPPFarm/EZPPLauncher
2
0
Fork 0
Code Issues Pull Requests Projects Releases 17 Activity

chore: add file downloading for ezpplauncher files, add ui replacement

Browse Source
This commit is contained in:
HorizonCode
2025-07-04 14:56:47 +02:00
parent 41608afae2
commit 7e524debb9
11 changed files with 583 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/pages/Launch.svelte
View File

@@ -37,6 +37,7 @@
import Progress from '@/components/ui/progress/progress.svelte';
import {
compareBuildNumbers,
formatBytes,
formatTimeReadable,
numberHumanReadable,
releaseStreamToReadable,
@@ -55,7 +56,6 @@
} from '@/userSettings';
import Input from '@/components/ui/input/input.svelte';
import { open } from '@tauri-apps/plugin-dialog';
import { invoke } from '@tauri-apps/api/core';
import { toast } from 'svelte-sonner';
import Login from './Login.svelte';
import { currentUser, userAuth } from '@/userAuthentication';
@@ -69,10 +69,26 @@
} from '@/gamemode';
import { currentUserInfo } from '@/data';
import { osuapi } from '@/api/osuapi';
import { getReleaseStream, setConfigValues, setUserConfigValues } from '@/osuUtil';
import {
downloadEZPPLauncherUpdateFiles,
getBeatmapSetsCount,
getEZPPLauncherUpdateFiles,
getReleaseStream,
getSkin,
getSkinsCount,
getVersion,
isOsuRunning,
isValidOsuFolder,
replaceUIFiles,
runOsu,
runUpdater,
setConfigValues,
setUserConfigValues,
} from '@/osuUtil';
import { getCurrentWindow } from '@tauri-apps/api/window';
let selectedTab = $state('home');
let progress = $state(-1);
let launchInfo = $state('');
let selectedGamemode = $derived(
@@ -96,7 +112,7 @@
if (selectedPath === $osuInstallationPath) {
return;
}
const validFolder: boolean = await invoke('valid_osu_folder', { folder: selectedPath });
const validFolder = await isValidOsuFolder(selectedPath);
if (!validFolder) {
toast.error('Oops...', {
description:
@@ -109,27 +125,29 @@
$userSettings.save();
toast.success('osu! installation path set successfully.');
const beatmapSetCount: number | null = await invoke('get_beatmapsets_count', {
folder: selectedPath,
});
const beatmapSetCount: number | null = await getBeatmapSetsCount(selectedPath);
if (beatmapSetCount) {
beatmapSets.set(beatmapSetCount);
}
const skinsCount: number | null = await invoke('get_skins_count', {
folder: selectedPath,
});
const skinsCount: number | null = await getSkinsCount(selectedPath);
if (skinsCount) {
skins.set(skinsCount);
}
const skin: string = await invoke('get_osu_skin', {
folder: $osuInstallationPath,
});
const skin: string = await getSkin(selectedPath);
currentSkin.set(skin);
}
};
const launch = async (offline: boolean) => {
const osuRunning = await isOsuRunning();
if (osuRunning) {
toast.error('Hold on a second!', {
description:
'osu! is currently running, please exit osu! before launching via EZPPLauncher!',
});
return;
}
if (!$osuBuild) {
toast.error('Hmmm...', {
description: 'There was an issue detecting your installed osu! version',
@@ -137,10 +155,11 @@
return;
}
const osuPath = $osuInstallationPath;
launchInfo = 'Validating osu! installation...';
launching.set(true);
const validFolder: boolean = await invoke('valid_osu_folder', { folder: osuPath });
const validFolder = await isValidOsuFolder(osuPath);
if (!validFolder) {
toast.error('Hmmm...', {
description: 'Your selected osu! installation folder is not valid.',
@@ -149,6 +168,34 @@
return;
}
try {
launchInfo = 'Looking for EZPPLauncher File updates...';
const updateResult = await getEZPPLauncherUpdateFiles(osuPath);
if (updateResult) {
if (updateResult.filesToDownload.length > 0) {
launchInfo = 'Found EZPPLauncher File updates!';
await new Promise((res) => setTimeout(res, 1000));
await downloadEZPPLauncherUpdateFiles(
osuPath,
updateResult.filesToDownload,
updateResult.updateFiles,
(file) => {
progress = file.progress;
launchInfo = `Downloading ${file.fileName}(${formatBytes(
file.downloaded
)}/${formatBytes(file.size)})...`;
}
);
progress = -1;
} else {
launchInfo = 'EZPPLauncher Files are up to date!';
await new Promise((res) => setTimeout(res, 1500));
}
}
} catch (err) {
console.log(err);
}
try {
const streamInfo = await osuapi.latestBuildVersion('stable40');
if (!streamInfo) {
@@ -181,7 +228,7 @@
]);
osuStream.set('Stable40');
osuBuild.set(`b${streamInfo}`);
await invoke('run_osu_updater', { folder: osuPath });
await runUpdater(osuPath);
launchInfo = 'osu! is now up to date!';
if (forceUpdate)
await setConfigValues(osuPath, [
@@ -246,34 +293,27 @@
}
await new Promise((res) => setTimeout(res, 1500));
launchInfo = 'Launching osu!...';
await replaceUIFiles(osuPath, false);
await new Promise((res) => setTimeout(res, 1000));
await getCurrentWindow().hide();
await invoke('run_osu', { folder: osuPath });
await runOsu(osuPath);
launchInfo = 'Cleaning up...';
await getCurrentWindow().show();
await new Promise((res) => setTimeout(res, 1000));
await replaceUIFiles(osuPath, true);
const osuReleaseStream: string = await invoke('get_osu_release_stream', {
folder: osuPath,
});
const osuReleaseStream = await getReleaseStream(osuPath);
osuStream.set(osuReleaseStream);
const osuVersion: string = await invoke('get_osu_version', {
folder: osuPath,
});
const osuVersion = await getVersion(osuPath);
osuBuild.set(osuVersion);
const beatmapSetCount: number | null = await invoke('get_beatmapsets_count', {
folder: osuPath,
});
const beatmapSetCount = await getBeatmapSetsCount(osuPath);
if (beatmapSetCount) beatmapSets.set(beatmapSetCount);
const skinCount: number | null = await invoke('get_skins_count', {
folder: osuPath,
});
const skinCount = await getSkinsCount(osuPath);
if (skinCount) skins.set(skinCount);
const skin: string = await invoke('get_osu_skin', {
folder: $osuInstallationPath,
});
const skin = await getSkin(osuPath);
currentSkin.set(skin);
launching.set(false);
@@ -300,7 +340,7 @@
<span class="font-semibold text-xl">Launching...</span>
</div>
<div class="flex flex-col items-center justify-center gap-2 p-3 rounded-lg">
<Progress indeterminate />
<Progress indeterminate={progress === -1} value={progress} />
<span class="text-muted-foreground">{launchInfo}</span>
</div>
</AlertDialog.Content>

33
src/pages/Loading.svelte
View File

@@ -26,7 +26,14 @@
import { ezppfarm } from '@/api/ezpp';
import { toast } from 'svelte-sonner';
import { currentUserInfo } from '@/data';
import { invoke } from '@tauri-apps/api/core';
import {
getBeatmapSetsCount,
getReleaseStream,
getSkin,
getSkinsCount,
getVersion,
isValidOsuFolder,
} from '@/osuUtil';
let ezppLogo: HTMLImageElement;
let spinnerCircle: SVGCircleElement;
@@ -105,9 +112,7 @@
if (!$firstStartup) {
currentLoadingInfo.set('Checking osu installation path...');
const validFolder: boolean = await invoke('valid_osu_folder', {
folder: $osuInstallationPath,
});
const validFolder = await isValidOsuFolder($osuInstallationPath);
if (!validFolder) {
osuInstallationPath.set('');
$userSettings.value('osu_installation_path').del();
@@ -117,29 +122,19 @@
});
} else {
currentLoadingInfo.set('Getting osu version...');
const osuReleaseStream: string = await invoke('get_osu_release_stream', {
folder: $osuInstallationPath,
});
const osuReleaseStream = await getReleaseStream($osuInstallationPath);
osuStream.set(osuReleaseStream);
const osuVersion: string = await invoke('get_osu_version', {
folder: $osuInstallationPath,
});
const osuVersion = await getVersion($osuInstallationPath);
osuBuild.set(osuVersion);
currentLoadingInfo.set('Counting beatmapsets...');
const beatmapSetCount: number | null = await invoke('get_beatmapsets_count', {
folder: $osuInstallationPath,
});
const beatmapSetCount = await getBeatmapSetsCount($osuInstallationPath);
if (beatmapSetCount) beatmapSets.set(beatmapSetCount);
currentLoadingInfo.set('Counting skins...');
const skinCount: number | null = await invoke('get_skins_count', {
folder: $osuInstallationPath,
});
const skinCount = await getSkinsCount($osuInstallationPath);
if (skinCount) skins.set(skinCount);
const skin: string = await invoke('get_osu_skin', {
folder: $osuInstallationPath,
});
const skin: string = await getSkin($osuInstallationPath);
currentSkin.set(skin);
}
}

36
src/pages/SetupWizard.svelte
View File

@@ -4,8 +4,7 @@
import Input from '@/components/ui/input/input.svelte';
import { animate } from 'animejs';
import { onMount } from 'svelte';
import { fade, scale } from 'svelte/transition';
import { invoke } from '@tauri-apps/api/core';
import { fade } from 'svelte/transition';
import { Check, CheckCircle, CircleOff, Settings2 } from 'lucide-svelte';
import { open } from '@tauri-apps/plugin-dialog';
import Checkbox from '@/components/ui/checkbox/checkbox.svelte';
@@ -20,6 +19,15 @@
import { beatmapSets, currentSkin, currentView, osuBuild, osuStream, skins } from '@/global';
import Launch from './Launch.svelte';
import Confetti from 'svelte-confetti';
import {
autoDetectOsuInstallFolder,
getBeatmapSetsCount,
getReleaseStream,
getSkin,
getSkinsCount,
getVersion,
isValidOsuFolder,
} from '@/osuUtil';
let selectedStep = $state(1);
const steps = ['Welcome', 'Locate your osu! Installation', 'Appearance Settings'];
@@ -60,7 +68,7 @@
});
if (typeof selectedPath === 'string') {
const validFolder: boolean = await invoke('valid_osu_folder', { folder: selectedPath });
const validFolder = await isValidOsuFolder(selectedPath);
manualSelect = true;
if (!validFolder) {
manualSelectValid = false;
@@ -78,39 +86,29 @@
await $userSettings.save();
osuInstallationPath.set(osuInstallPath);
const beatmapSetCount: number | null = await invoke('get_beatmapsets_count', {
folder: osuInstallPath,
});
const beatmapSetCount = await getBeatmapSetsCount(osuInstallPath);
if (beatmapSetCount) {
beatmapSets.set(beatmapSetCount);
}
const skinsCount: number | null = await invoke('get_skins_count', {
folder: osuInstallPath,
});
const skinsCount: number | null = await getSkinsCount(osuInstallPath);
if (skinsCount) {
skins.set(skinsCount);
}
const skin: string = await invoke('get_osu_skin', {
folder: $osuInstallationPath,
});
const skin: string = await getSkin(osuInstallPath);
currentSkin.set(skin);
const osuReleaseStream: string = await invoke('get_osu_release_stream', {
folder: $osuInstallationPath,
});
const osuReleaseStream = await getReleaseStream(osuInstallPath);
osuStream.set(osuReleaseStream);
const osuVersion: string = await invoke('get_osu_version', {
folder: $osuInstallationPath,
});
const osuVersion = await getVersion(osuInstallPath);
osuBuild.set(osuVersion);
currentView.set(Launch);
};
onMount(async () => {
const osuPath: string | null = await invoke('find_osu_installation');
const osuPath = await autoDetectOsuInstallFolder();
if (osuPath) {
osuInstallPath = osuPath;
autoDetectedOsuPath = true;