Compare commits

...

24 Commits

Author SHA1 Message Date
HorizonCode 6dc1f4f703 fix: mode select height 2026-06-26 10:58:35 +02:00
HorizonCode 21710d0e02 chore: bump version 2026-06-26 10:42:28 +02:00
HorizonCode b478e7ba95 Merge branch 'master' of https://git.ez-pp.farm/EZPPFarm/EZPPLauncher 2026-06-26 10:01:06 +02:00
HorizonCode bd368adfe5 chore: add scorev2 type and gamemodes 2026-06-26 10:00:56 +02:00
HorizonCode 85ea4167ab fix: update check on launch 2026-06-14 14:33:48 +02:00
HorizonCode adf7e487b9 feat: add update check failure dialog, ability to skip update check 2026-06-08 16:36:48 +02:00
HorizonCode 22d97a0068 chore: bump version 2026-06-07 16:59:50 +02:00
HorizonCode 992127ecb6 fix: only accept json 2026-06-07 00:13:55 +02:00
HorizonCode 0f53057897 chore: implement mirror of osu changelog 2026-06-07 00:10:24 +02:00
HorizonCode 03b326e142 Merge branch 'master' of https://git.ez-pp.farm/EZPPFarm/EZPPLauncher 2026-06-04 16:36:27 +02:00
HorizonCode 2ec8b08983 fix: dont show dynamic beatmap button on direct page 2026-06-04 16:36:20 +02:00
HorizonCode 344f15b8da fix: user config retrival on linux 2026-06-03 20:51:14 +02:00
HorizonCode 554f07412b chore: disable themes on linux for now until fix is found 2026-06-03 19:57:21 +02:00
HorizonCode f8f53c4236 fix: user config retrival on linux 2026-06-03 19:57:00 +02:00
HorizonCode 64f76d95a6 fix: remove platform dependency from patching settings in SetupWizard 2026-06-03 16:38:28 +02:00
HorizonCode 02fecd237c fix: update launcher version retrieval and improve HWID fallback 2026-06-03 16:16:11 +02:00
HorizonCode eaffc35288 fix: build for linux 2026-06-03 01:01:17 +02:00
HorizonCode 78c7fdb756 chore: bump version 2026-06-03 01:01:03 +02:00
HorizonCode ec7ce53016 chore: bump version 2026-06-03 00:51:28 +02:00
HorizonCode 0610d4beef chore: make patch settings available to linux users, force stable patcher stream 2026-06-03 00:49:35 +02:00
HorizonCode 416067f2ea Merge branch 'master' of https://git.ez-pp.farm/EZPPFarm/EZPPLauncher 2026-06-02 23:46:02 +02:00
HorizonCode e58be09bdb chore: add patcher support for linux 2026-06-02 23:45:43 +02:00
HorizonCode ccb0c467f2 chore: add type usage for views in selectedView 2026-06-01 10:47:58 +02:00
HorizonCode 67bc968497 feat: add disableMediaControls function to prevent media key actions 2026-05-30 00:06:16 +02:00
16 changed files with 497 additions and 332 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
{
"name": "ezpplauncher",
"version": "3.2.2",
"version": "3.2.5",
"description": "",
"type": "module",
"scripts": {
@@ -79,4 +79,4 @@
"vite": "^8.0.14",
"vite-plugin-devtools-json": "^1.0.0"
}
}
}
+3
View File
@@ -34,4 +34,7 @@ function run(cmd: string, args: string[]): Promise<void> {
await run('bun', ['./scripts/sync-version.ts']);
await runVite();
//set NO_STRIP=1 in env for linux to prevent stripping of debug symbols in tauri builds, which causes issues with source maps
if (process.platform === 'linux') process.env.NO_STRIP = '1';
await run('bunx', ['tauri', 'build']);
+1 -1
View File
@@ -1239,7 +1239,7 @@ dependencies = [
[[package]]
name = "ezpplauncher"
version = "3.2.2"
version = "3.2.5"
dependencies = [
"aes-gcm",
"anyhow",
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "ezpplauncher"
version = "3.2.2"
version = "3.2.5"
description = "EZPPLauncher redefined."
authors = ["HorizonCode"]
edition = "2024"
+42 -39
View File
@@ -36,14 +36,15 @@ pub fn opened_urls(app: tauri::AppHandle) -> Vec<PathBuf> {
}
#[tauri::command]
pub fn get_launcher_version() -> String {
env!("CARGO_PKG_VERSION").to_string()
pub fn get_launcher_version(app: tauri::AppHandle) -> String {
app.package_info().version.to_string()
}
#[tauri::command]
pub fn get_hwid() -> String {
let hwid = get_id().unwrap();
hwid.into()
get_id()
.unwrap_or("recorderinsandybridge".to_string())
.into()
}
#[tauri::command(rename_all = "snake_case")]
@@ -79,7 +80,6 @@ pub fn valid_osu_folder(folder: String) -> bool {
check_folder_completeness(path, &osu_folder_files) >= 70.0
}
#[cfg(windows)]
#[tauri::command]
pub fn find_osu_installation() -> Option<String> {
#[cfg(windows)]
@@ -450,48 +450,52 @@ pub async fn run_osu(folder: String, patch: bool) -> Result<(), String> {
}
};
#[cfg(windows)]
{
if patch {
let patcher_exe_path = PathBuf::from(&folder)
.join("EZPPLauncher")
.join("patcher")
.join("osu!.patcher.exe");
if patch {
let patcher_exe_path = PathBuf::from(&folder)
.join("EZPPLauncher")
.join("patcher")
.join("osu!.patcher.exe");
if patcher_exe_path.exists() {
#[cfg(windows)]
{
let mut sys = System::new_all();
if patcher_exe_path.exists() {
let mut sys = System::new_all();
loop {
sys.refresh_processes(sysinfo::ProcessesToUpdate::All, true);
loop {
sys.refresh_processes(sysinfo::ProcessesToUpdate::All, true);
let mut found = false;
let mut found = false;
for (_pid, process) in sys.processes() {
if process.name() == "osu!.exe" {
let pid = process.pid();
let title = get_window_title_by_pid(pid);
for (_pid, process) in sys.processes() {
if process.name() == "osu!.exe" {
let pid = process.pid();
let title = get_window_title_by_pid(pid);
if !title.is_empty() && !title.contains("updater") {
found = true;
break;
}
}
}
if found {
if !title.is_empty() && !title.contains("updater") {
found = true;
break;
}
sleep(Duration::from_millis(500)).await;
}
let _ = Command::new(&patcher_exe_path)
.creation_flags(DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP)
.spawn()
.map_err(|e| format!("Failed to run patcher: {e}"))?;
}
if found {
break;
}
sleep(Duration::from_millis(500)).await;
}
#[cfg(windows)]
{
let _ = Command::new(&patcher_exe_path)
.creation_flags(DETACHED_PROCESS | CREATE_NEW_PROCESS_GROUP)
.spawn()
.map_err(|e| format!("Failed to run patcher: {e}"))?;
}
#[cfg(not(windows))]
{
let _ = Command::new("osu-wine")
.arg("--wine")
.arg(&patcher_exe_path)
.spawn()
.map_err(|e| format!("Failed to run patcher: {}", e))?;
}
}
}
@@ -958,7 +962,6 @@ pub async fn download_ezpp_launcher_update(app: AppHandle, url: String) -> Resul
Ok(())
}
#[cfg(windows)]
#[tauri::command]
pub async fn install_ezpp_launcher_update(app: AppHandle) -> Result<(), String> {
#[cfg(windows)]
+11 -4
View File
@@ -24,10 +24,13 @@ pub fn get_osu_user_config<P: AsRef<Path>>(
return None;
}
let current_user = std::env::var("USERNAME").unwrap_or_else(|_| "Admin".to_string());
let current_user = std::env::var("USERNAME")
.or_else(|_| std::env::var("USER"))
.unwrap_or_else(|_| "Admin".to_string());
let osu_config_path = osu_folder_path
.as_ref()
.join(format!("osu!.{}.cfg", current_user));
println!("Looking for user config at: {:?}", osu_config_path);
if !osu_config_path.exists() {
return None;
}
@@ -48,7 +51,9 @@ pub fn set_osu_user_config_vals(
osu_folder_path: &str,
key_values: &[(&str, Option<&str>)],
) -> Result<bool, String> {
let current_user = std::env::var("USERNAME").unwrap_or_else(|_| "Admin".to_string());
let current_user = std::env::var("USERNAME")
.or_else(|_| std::env::var("USER"))
.unwrap_or_else(|_| "Admin".to_string());
let osu_config_path = Path::new(osu_folder_path).join(format!("osu!.{}.cfg", current_user));
if !osu_config_path.exists() {
@@ -310,7 +315,9 @@ pub async fn is_net8_installed() -> bool {
}
let stdout_str = String::from_utf8_lossy(&output.stdout);
stdout_str.lines().any(|line| line.starts_with("Microsoft.WindowsDesktop.App 8."))
stdout_str
.lines()
.any(|line| line.starts_with("Microsoft.WindowsDesktop.App 8."))
}
Err(_) => false,
}
@@ -385,4 +392,4 @@ pub fn encrypt_password(password: &str, entropy: &str) -> Result<String, String>
let base64_string = general_purpose::STANDARD.encode(&encrypted_data);
Ok(base64_string)
}
}
+1 -1
View File
@@ -1,7 +1,7 @@
{
"$schema": "https://schema.tauri.app/config/2",
"productName": "EZPPLauncher",
"version": "3.2.2",
"version": "3.2.5",
"identifier": "farm.EZPPFarm.Launcher",
"mainBinaryName": "ezpplauncher",
"build": {
+29
View File
@@ -3,9 +3,11 @@ import type {
EZPPUserInfoResponse,
EZPPUserResponse,
EZPPUSerStatusResponse,
StreamsResult,
} from '$lib/types';
import { betterFetch } from '@better-fetch/fetch';
const VERSION_ENDPOINT = 'https://version.ez-pp.farm/';
const BANCHO_ENDPOINT = 'https://c.ez-pp.farm/';
const API_ENDPOINT = 'https://api.ez-pp.farm/';
const ENDPOINT = 'https://ez-pp.farm/';
@@ -89,4 +91,31 @@ export const ezppfarm = {
);
return request.error ? undefined : request.data;
},
latestBuildVersion: async (releaseStream: string): Promise<string | undefined> => {
const request = await betterFetch<StreamsResult>(`${VERSION_ENDPOINT}api/changelog`, {
timeout,
query: {
stream: 'none',
},
headers: {
Accept: 'application/json',
'Content-Type': 'application/json',
'User-Agent': 'EZPPLauncher',
},
});
if (request.error) {
return undefined;
}
const releaseData = request.data;
if (!releaseData || !releaseData.streams) {
return undefined;
}
if (releaseData.streams.length === 0) return undefined;
const selectedRelease = releaseData.streams.find(
(releaseBuild) =>
releaseBuild.name.toLowerCase() === releaseStream.replaceAll(' ', '').toLowerCase()
);
if (!selectedRelease) return undefined;
return selectedRelease.latest_build.display_version;
},
};
-35
View File
@@ -1,35 +0,0 @@
import type { StreamsResult } from '$lib/types';
import { betterFetch } from '@better-fetch/fetch';
const API_ENDPOINT = 'https://osu.ppy.sh/api/';
const timeout = 5000; // 5 seconds;
export const osuapi = {
latestBuildVersion: async (releaseStream: string): Promise<string | undefined> => {
const request = await betterFetch<StreamsResult>(`${API_ENDPOINT}v2/changelog`, {
timeout,
query: {
stream: 'none',
},
headers: {
'Content-Type': 'application/json',
'User-Agent': 'EZPPLauncher',
},
});
if (request.error) {
return undefined;
}
const releaseData = request.data;
if (!releaseData || !releaseData.streams) {
return undefined;
}
if (releaseData.streams.length === 0) return undefined;
const selectedRelease = releaseData.streams.find(
(releaseBuild) =>
releaseBuild.name.toLowerCase() === releaseStream.replaceAll(' ', '').toLowerCase()
);
if (!selectedRelease) return undefined;
return selectedRelease.latest_build.display_version;
},
};
+51 -6
View File
@@ -9,6 +9,11 @@ export enum Gamemodes {
RELAX_CATCH = 6,
AUTOPILOT_OSU = 8,
SCOREV2_OSU = 12,
SCOREV2_TAIKO = 13,
SCOREV2_CATCH = 14,
SCOREV2_MANIA = 15,
}
export enum Mode {
@@ -22,12 +27,39 @@ export enum Type {
VANILLA = 0,
RELAX = 4,
AUTOPILOT = 8,
SCOREV2 = 12,
}
export const validModes = [Mode.OSU, Mode.TAIKO, Mode.CATCH, Mode.MANIA];
export const validTypes = [Type.VANILLA, Type.RELAX, Type.AUTOPILOT];
export const validModeTypeCombinations = [0, 1, 2, 3, 4, 5, 6, 8];
export const validModeTypeCombinationsSorted = [0, 4, 8, 1, 5, 2, 6, 3];
export const validTypes = [Type.VANILLA, Type.RELAX, Type.AUTOPILOT, Type.SCOREV2];
export const validModeTypeCombinations = [
Gamemodes.VANILLA_OSU,
Gamemodes.VANILLA_TAIKO,
Gamemodes.VANILLA_CATCH,
Gamemodes.VANILLA_MANIA,
Gamemodes.RELAX_OSU,
Gamemodes.RELAX_TAIKO,
Gamemodes.RELAX_CATCH,
Gamemodes.AUTOPILOT_OSU,
Gamemodes.SCOREV2_OSU,
Gamemodes.SCOREV2_TAIKO,
Gamemodes.SCOREV2_CATCH,
Gamemodes.SCOREV2_MANIA,
];
export const validModeTypeCombinationsSorted = [
Gamemodes.VANILLA_OSU,
Gamemodes.RELAX_OSU,
Gamemodes.AUTOPILOT_OSU,
Gamemodes.SCOREV2_OSU,
Gamemodes.VANILLA_TAIKO,
Gamemodes.RELAX_TAIKO,
Gamemodes.SCOREV2_TAIKO,
Gamemodes.VANILLA_CATCH,
Gamemodes.RELAX_CATCH,
Gamemodes.SCOREV2_CATCH,
Gamemodes.VANILLA_MANIA,
Gamemodes.SCOREV2_MANIA,
];
export const validMode = (modeStr: string) => modeStrToInt(modeStr) !== undefined;
export const validType = (typeStr: string) => typeStrToInt(typeStr) !== undefined;
@@ -60,7 +92,7 @@ export const modeIntToStr = (modeInt: number) => {
return undefined;
};
export const typeStrToInt = (typeStr: 'vanilla' | 'relax' | 'autopilot' | string) => {
export const typeStrToInt = (typeStr: 'vanilla' | 'relax' | 'autopilot' | 'v2' | string) => {
switch (typeStr) {
case 'relax':
return Type.RELAX;
@@ -68,6 +100,8 @@ export const typeStrToInt = (typeStr: 'vanilla' | 'relax' | 'autopilot' | string
return Type.AUTOPILOT;
case 'vanilla':
return Type.VANILLA;
case 'scorev2':
return Type.SCOREV2;
}
return undefined;
};
@@ -80,13 +114,15 @@ export const typeIntToStr = (typeInt: number) => {
return 'autopilot';
case Type.VANILLA:
return 'vanilla';
case Type.SCOREV2:
return 'scorev2';
}
return undefined;
};
export const getGamemodeInt = (
mode: 'osu' | 'taiko' | 'catch' | 'mania' | string | undefined,
type: 'vanilla' | 'relax' | 'autopilot' | string | undefined
type: 'vanilla' | 'relax' | 'autopilot' | 'scorev2' | string | undefined
) => {
let modee = 0;
switch (mode) {
@@ -108,6 +144,9 @@ export const getGamemodeInt = (
case 'autopilot':
modee += Type.AUTOPILOT;
break;
case 'scorev2':
modee += Type.SCOREV2;
break;
}
return modee;
@@ -115,7 +154,7 @@ export const getGamemodeInt = (
export const getGamemodeName = (
mode: 'osu' | 'taiko' | 'catch' | 'mania' | string | undefined,
type: 'vanilla' | 'relax' | 'autopilot' | string | undefined
type: 'vanilla' | 'relax' | 'autopilot' | 'scorev2' | string | undefined
) => {
let modeStr = '';
switch (mode) {
@@ -140,6 +179,9 @@ export const getGamemodeName = (
case 'autopilot':
modeStr += 'ap';
break;
case 'scorev2':
modeStr += 'v2';
break;
default:
modeStr += 'vn';
break;
@@ -173,6 +215,9 @@ export const getModeAndTypeFromGamemode = (gamemode: number) => {
case Type.AUTOPILOT:
type = Type.AUTOPILOT;
break;
case Type.SCOREV2:
type = Type.SCOREV2;
break;
}
return {
+2 -1
View File
@@ -1,5 +1,5 @@
import { active_custom_theme, custom_themes } from './global';
import { setGlobalVolume } from './utils';
import { disableMediaControls, setGlobalVolume } from './utils';
import { betterFetch } from '@better-fetch/fetch';
import { convertFileSrc } from '@tauri-apps/api/core';
import { invoke } from '@tauri-apps/api/core';
@@ -268,6 +268,7 @@ export const loadTheme = async (theme: Theme, themeContainer: HTMLElement, volum
themeScript.mountTheme(themeContainer, { assets: theme.assets });
}
setGlobalVolume(volume);
disableMediaControls();
};
export const deleteTheme = async (themeToUninstall: Theme) => {
+2
View File
@@ -1,3 +1,5 @@
export type LaunchView = 'HOME' | 'LOGIN' | 'SETTINGS' | 'THEMES';
export type EZPPUserResponse = {
code: number;
message: string;
+37
View File
@@ -203,6 +203,43 @@ export function trackMediaContainer(node: HTMLElement) {
};
}
const MEDIA_ACTIONS: MediaSessionAction[] = [
'play',
'pause',
'stop',
'previoustrack',
'nexttrack',
'seekbackward',
'seekforward',
];
export function disableMediaControls() {
const mediaElements: NodeListOf<HTMLMediaElement> = document.querySelectorAll('audio, video');
if ('mediaSession' in navigator) {
MEDIA_ACTIONS.forEach((action) => {
try {
navigator.mediaSession.setActionHandler(action, () => {});
} catch {}
});
}
document.addEventListener(
'keydown',
(e: KeyboardEvent) => {
if (e.key.startsWith('Media')) {
e.preventDefault();
e.stopPropagation();
}
},
true
);
mediaElements.forEach((el) => {
el.disableRemotePlayback = true;
});
}
export function calculateGitBlobSha(fileBuffer: Buffer): string {
const header = Buffer.from(`blob ${fileBuffer.length}\0`);
const store = Buffer.concat([header, fileBuffer]);
+1 -1
View File
@@ -135,7 +135,7 @@
const localThemes = await getThemes();
const lastThemeName = await config_theme.get('Default');
const last_theme = localThemes.find((t) => t.name === lastThemeName);
if (!last_theme) {
if (!last_theme || $platform === 'linux') {
await config.value<string>('theme').set('Default');
loadTheme(localThemes[0], $custom_theme_container!, await config_theme_volume.get(0.15));
} else {
+311 -236
View File
@@ -2,7 +2,6 @@
import DefaultThemePreview from '$assets/default_preview.png';
import Logo from '$assets/logo.png';
import { ezppfarm } from '$lib/api/ezpp';
import { osuapi } from '$lib/api/osuapi';
import * as AlertDialog from '$lib/components/ui/alert-dialog';
import * as Avatar from '$lib/components/ui/avatar';
import Badge from '$lib/components/ui/badge/badge.svelte';
@@ -88,7 +87,7 @@
loadTheme,
type ThemeInfo,
} from '$lib/themes';
import { EZPPActionStatus } from '$lib/types';
import { EZPPActionStatus, type LaunchView } from '$lib/types';
import { currentUser } from '$lib/userAuthentication';
import {
cursorSmoothening,
@@ -141,7 +140,7 @@
import { onMount } from 'svelte';
import { fade, fly, scale } from 'svelte/transition';
let selectedView = $state('home');
let selectedView = $state<LaunchView>('HOME');
let progress = $state(-1);
let launchInfo = $state('');
let launchError = $state<Error | undefined>(undefined);
@@ -151,6 +150,8 @@
let downloadingUpdate = $state(false);
let updateCheckFailed = $state(false);
let dragAndDrop = useDropZone({
onDrop: async (file) => {
const firstFile = file[0];
@@ -245,7 +246,7 @@
}
};
const launch = async () => {
const launch = async (skipUpdateCheck = false) => {
if ($launching) return;
launchInfo = 'Checking if osu! is already running...';
launching.set(true);
@@ -302,105 +303,112 @@
}
}
try {
launchInfo = 'Looking for file updates...';
const updateResult = await getEZPPLauncherUpdateFiles(osuPath, $launcherStream);
if (!skipUpdateCheck) {
try {
launchInfo = 'Looking for file updates...';
let launchStream = $launcherStream;
if ($platform !== 'windows') launchStream = 'stable'; //fallback to stable for non windows systems
const updateResult = await getEZPPLauncherUpdateFiles(osuPath, launchStream);
if (updateResult) {
if (updateResult.filesToDownload.length > 0) {
downloadingEZPPFiles = true;
launchInfo = 'Found file updates!';
await new Promise((res) => setTimeout(res, 1000));
await downloadEZPPLauncherUpdateFiles(
osuPath,
updateResult.filesToDownload,
updateResult.updateFiles,
(file) => {
progress = file.progress;
launchInfo = `${file.fileName}(${formatBytes(
file.downloaded
)}/${formatBytes(file.size)})...`;
}
);
progress = -1;
downloadingEZPPFiles = false;
} else {
launchInfo = 'EZPPLauncher Files are up to date!';
await new Promise((res) => setTimeout(res, 1500));
if (updateResult) {
if (updateResult.filesToDownload.length > 0) {
downloadingEZPPFiles = true;
launchInfo = 'Found file updates!';
await new Promise((res) => setTimeout(res, 1000));
await downloadEZPPLauncherUpdateFiles(
osuPath,
updateResult.filesToDownload,
updateResult.updateFiles,
(file) => {
progress = file.progress;
launchInfo = `${file.fileName}(${formatBytes(
file.downloaded
)}/${formatBytes(file.size)})...`;
}
);
progress = -1;
downloadingEZPPFiles = false;
} else {
launchInfo = 'EZPPLauncher Files are up to date!';
await new Promise((res) => setTimeout(res, 1500));
}
}
} catch (err) {
launchError = err as Error;
launching.set(false);
return;
}
} catch (err) {
launchError = err as Error;
launching.set(false);
return;
}
try {
const streamInfo = await osuapi.latestBuildVersion('stable40');
if (!streamInfo) {
sileo.error({
title: 'Hmmm...',
description: 'Failed to check for updates, maybe osu! is down?',
});
launching.set(false);
return;
}
if (!skipUpdateCheck) {
const streamInfo = await ezppfarm.latestBuildVersion('stable40');
if (!streamInfo) {
sileo.error({
title: 'Hmmm...',
description: 'Failed to check for updates, maybe osu! is down?',
});
launching.set(false);
updateCheckFailed = true;
return;
}
const releaseStream = await getReleaseStream(osuPath);
const releaseStream = await getReleaseStream(osuPath);
if (releaseStream === undefined) {
sileo.error({
title: 'Hmmm...',
description: 'Failed to get osu! release stream.',
});
launching.set(false);
return;
}
if (releaseStream === undefined) {
sileo.error({
title: 'Hmmm...',
description: 'Failed to get osu! release stream.',
});
launching.set(false);
return;
}
// only stable osu! release streams are supported for now
if (!releaseStream.toLowerCase().includes('stable')) {
sileo.error({
title: 'Hmmm...',
description: 'You are not on the stable release stream, please switch to it.',
});
launching.set(false);
return;
}
// only stable osu! release streams are supported for now
if (!releaseStream.toLowerCase().includes('stable')) {
sileo.error({
title: 'Hmmm...',
description: 'You are not on the stable release stream, please switch to it.',
});
launching.set(false);
return;
}
const osuCorrupted = await isOsuCorrupted(osuPath);
let forceUpdate =
(releaseStream && releaseStream.toLowerCase() !== 'stable40') || osuCorrupted;
const osuCorrupted = await isOsuCorrupted(osuPath);
let forceUpdate =
(releaseStream && releaseStream.toLowerCase() !== 'stable40') || osuCorrupted;
const versions = compareBuildNumbers($osuBuild, streamInfo);
if (versions > 0 || forceUpdate) {
launchInfo = 'Update found!';
await new Promise((res) => setTimeout(res, 1500));
launchInfo = 'Running osu! updater...';
await setUserConfigValues(osuPath, [
{
key: 'LastVersion',
value: `b${streamInfo}`,
},
]);
await setConfigValues(osuPath, [
{
key: '_ReleaseStream',
value: 'Stable40',
},
]);
osuStream.set('Stable40');
osuBuild.set(`b${streamInfo}`);
await runUpdater(osuPath);
launchInfo = 'osu! is now up to date!';
if (forceUpdate)
await setConfigValues(osuPath, [
const versions = compareBuildNumbers($osuBuild, streamInfo);
if (versions > 0 || forceUpdate) {
launchInfo = 'Update found!';
await new Promise((res) => setTimeout(res, 1500));
launchInfo = 'Running osu! updater...';
await setUserConfigValues(osuPath, [
{
key: '_UpdateFailCount',
value: '0',
key: 'LastVersion',
value: `b${streamInfo}`,
},
]);
} else {
launchInfo = 'You are up to date!';
await setConfigValues(osuPath, [
{
key: '_ReleaseStream',
value: 'Stable40',
},
]);
osuStream.set('Stable40');
osuBuild.set(`b${streamInfo}`);
await runUpdater(osuPath);
launchInfo = 'osu! is now up to date!';
if (forceUpdate)
await setConfigValues(osuPath, [
{
key: '_UpdateFailCount',
value: '0',
},
]);
} else {
launchInfo = 'You are up to date!';
}
}
if ($currentUser) {
const [username, password] = await Promise.all([
@@ -573,10 +581,11 @@
const beatmapCoverImage = `https://assets.ppy.sh/beatmaps/${userStatus.player_status.status.beatmap.set_id}/covers/list@2x.jpg`;
const isValidImage = await urlIsValidImage(beatmapCoverImage);
if (isValidImage) largeImageKey = beatmapCoverImage;
customButton = {
text: 'View Beatmap',
url: `https://ez-pp.farm/beatmapsets/${userStatus.player_status.status.beatmap.set_id}/${userStatus.player_status.status.beatmap.id}`,
};
if (userStatus.player_status.status.action !== EZPPActionStatus.DIRECT)
customButton = {
text: 'View Beatmap',
url: `https://ez-pp.farm/beatmapsets/${userStatus.player_status.status.beatmap.set_id}/${userStatus.player_status.status.beatmap.id}`,
};
}
details = `[${gamemodeName}] ${details}`;
@@ -710,7 +719,7 @@
]);
currentUser.set(loginResult.user);
selectedView = 'home';
selectedView = 'HOME';
} else {
sileo.error({
title: 'Login failed!',
@@ -1025,6 +1034,47 @@
</AlertDialog.Content>
</AlertDialog.Root>
<AlertDialog.Root open={updateCheckFailed}>
<AlertDialog.Content
class="bg-theme-950 border-theme-800 p-0 max-w-2xl"
escapeKeydownBehavior="ignore"
interactOutsideBehavior="ignore"
>
<div
class="flex flex-col items-center justify-center border-b border-theme-800 bg-black/40 rounded-t-lg p-3"
>
<Import size={40} />
<span class="font-semibold text-xl">Update check failed</span>
</div>
<div
class="flex flex-col items-center text-sm text-center bg-theme-900 border border-theme-800 rounded-lg mx-3 p-3"
>
<p class="mb-4">Failed to check for updates.</p>
<p>Do you want to launch anyway?</p>
</div>
<div class="flex items-center justify-center mb-3 gap-4 mt-4">
<Button
class="min-w-28"
onclick={async () => {
await launch(true);
updateCheckFailed = false;
}}
>
Launch anyways
</Button>
<Button
variant="outline"
onclick={async () => {
updateCheckFailed = false;
}}
>
Abort
</Button>
</div>
</AlertDialog.Content>
</AlertDialog.Root>
<AlertDialog.Root open={$newVersion === undefined && !!droppedTheme && !themeInstalling}>
<AlertDialog.Content
class="bg-theme-950 border-theme-800 p-0 max-w-2xl"
@@ -1149,36 +1199,36 @@
<Badge class="text-[0.5rem] py-0 px-2">{$launcherVersion || 'dev'}</Badge>
<Button
class="flex size-12 items-center gap-2 ring-1 ring-inset ring-white/15 {selectedView ===
'home'
'HOME'
? 'bg-primary/50'
: 'bg-black/20 border-black/20'} hover:bg-primary/50 rounded-[0.85rem] p-3 mt-3"
disabled={$launching}
onclick={() => {
if (!$launching) selectedView = 'home';
if (!$launching) selectedView = 'HOME';
}}
>
<House class="text-theme-200 size-5!" />
</Button>
<Button
class="flex size-12 items-center gap-2 ring-1 ring-inset ring-white/15 {selectedView ===
'themes'
'THEMES'
? 'bg-primary/50'
: 'bg-black/20 border-black/20'} hover:bg-primary/50 rounded-[0.85rem] p-3 mt-3"
disabled={$launching}
onclick={() => {
if (!$launching) selectedView = 'themes';
if (!$launching) selectedView = 'THEMES';
}}
>
<Paintbrush class="text-theme-200 size-5!" />
</Button>
<Button
class="flex size-12 items-center gap-2 ring-1 ring-inset ring-white/15 {selectedView ===
'settings'
'SETTINGS'
? 'bg-primary/50'
: 'bg-black/20 border-black/20'} hover:bg-primary/50 rounded-[0.85rem] p-3 mt-3"
disabled={$launching}
onclick={() => {
if (!$launching) selectedView = 'settings';
if (!$launching) selectedView = 'SETTINGS';
}}
>
<Settings class="text-theme-200 size-5!" />
@@ -1209,14 +1259,14 @@
});
currentUser.set(undefined);
currentUserInfo.set(undefined);
selectedView = 'home';
selectedView = 'HOME';
}}
>
<LogOut class="size-3.5 mr-2" />
Logout
</DropdownMenu.Item>
{:else}
<DropdownMenu.Item class="text-xs" onclick={() => (selectedView = 'login')}>
<DropdownMenu.Item class="text-xs" onclick={() => (selectedView = 'LOGIN')}>
<LogIn class="size-3.5 mr-2" />
Login
</DropdownMenu.Item>
@@ -1226,7 +1276,7 @@
</div>
</div>
<div class="z-10 h-full overflow-hidden">
{#if selectedView === 'home'}
{#if selectedView === 'HOME'}
<div
class="flex flex-col-reverse h-full"
in:fly={{
@@ -1351,7 +1401,7 @@
? 'No connection...'
: undefined}
disabled={$osuInstallationPath === '' || $serverConnectionFails > 1}
onClick={launch}
onClick={async () => await launch()}
/>
</div>
<div class="relative h-50">
@@ -1382,7 +1432,7 @@
{getGamemodeName(modeIntToStr(selectedMode), typeIntToStr(selectedType))}
</div>
</Select.Trigger>
<Select.Content class="bg-theme-950 border border-theme-900 rounded-lg">
<Select.Content class="bg-theme-950 border border-theme-900 rounded-lg max-h-72">
{#each validModeTypeCombinationsSorted as gamemode (gamemode)}
{@const gamemod = getModeAndTypeFromGamemode(gamemode)}
<Select.Item value={gamemode.toFixed()}>
@@ -1522,7 +1572,7 @@
<Button
class="flex-1 h-7 text-xs"
onclick={() => {
selectedView = 'login';
selectedView = 'LOGIN';
}}>Log In</Button
>
<Button
@@ -1543,7 +1593,7 @@
>
</div>
</div>
{:else if selectedView === 'settings'}
{:else if selectedView === 'SETTINGS'}
<div
class="h-screen w-full flex flex-col items-center justify-center bg-black/20 backdrop-blur-sm"
in:fly={{
@@ -1558,17 +1608,16 @@
<div class="flex flex-col">
<Label class="text-sm" for="setting-patch">Patching</Label>
<div class="text-muted-foreground text-xs">
Shows misses in Relax and Autopilot {#if $platform !== 'windows'}<span
Shows misses in Relax and Autopilot {#if $platform !== 'windows'}<!-- <span
class="text-red-500 bg-red-800/20 border border-red-600/20 p-0.5 mx-1 px-2 rounded-lg text-[0.55rem]!"
>currently only on windows!</span
>
> -->
{/if}
</div>
</div>
<Checkbox
id="setting-patch"
checked={$platform === 'windows' ? $patch : false}
disabled={$platform !== 'windows'}
checked={$patch}
onCheckedChange={async (e) => {
patch.set(e);
}}
@@ -1717,6 +1766,7 @@
</div>
</div>
<div class="flex flex-row w-full">
<!-- only stable release stream for linux -->
<Select.Root
type="single"
bind:value={$launcherStream}
@@ -1762,7 +1812,7 @@
{/if}
</div>
</div>
{:else if selectedView === 'login'}
{:else if selectedView === 'LOGIN'}
<div
class="h-screen w-full flex flex-col items-center justify-center bg-black/20 backdrop-blur-sm"
in:fly={{
@@ -1813,7 +1863,7 @@
</Button>
</form>
</div>
{:else if selectedView === 'themes'}
{:else if selectedView === 'THEMES'}
<div
class="h-screen w-full flex flex-col items-center bg-black/20 backdrop-blur-sm"
in:fly={{
@@ -1824,148 +1874,173 @@
}}
out:fly={{ duration: $reduceAnimations ? 0 : 400, y: -5, opacity: 0 }}
>
<ScrollContainer class="pt-8" topOffset={45}>
<div class="grid w-full gap-1 grid-cols-3 p-3 pr-5">
{#each $custom_themes as theme (theme.folder_name)}
<div
class="group overflow-hidden rounded-3xl border {$active_custom_theme &&
$active_custom_theme.folder_name === theme.folder_name
? 'border-primary'
: 'border-theme-800'} bg-theme-950 transition hover:border-white/20 h-73.75"
>
<img
src={theme.preview || DefaultThemePreview}
alt="Preview of {theme.name}"
class="mb-2 h-40 w-full rounded-t-3xl object-cover object-center pointer-events-none select-none"
/>
<div class="flex flex-col gap-1 p-3">
<div class="mb-4 flex items-center justify-between gap-2">
<div class="flex flex-col items-start">
<span class="text-sm font-semibold">{theme.name}</span>
<span class="text-xs text-muted-foreground">by {theme.author}</span>
{#if $platform === 'linux'}
<div
class="flex flex-col items-center gap-4 mt-12 px-6 text-center h-full justify-center"
>
<!-- currently there is a bug when applying themes on Linux, the Launcher freezes, also when trying to load assets via the assetProtocol it fails because it says the asset was loaded insecurely -->
<span class="text-2xl font-bold drop-shadow-lg"
>Custom themes are not supported on Linux yet(we are working on it!)</span
>
<span class="text-muted-foreground font-semibold drop-shadow-lg"
>Due to technical limitations on Linux, custom themes are currently not supported.
</span>
<span class="text-muted-foreground font-semibold drop-shadow-lg"
>We are working on a solution to bring custom themes to Linux in a future update, but
we don't have an ETA yet. Stay tuned!</span
>
</div>
{:else}
<ScrollContainer class="pt-8" topOffset={45}>
<div class="grid w-full gap-1 grid-cols-3 p-3 pr-5">
{#each $custom_themes as theme (theme.folder_name)}
<div
class="group overflow-hidden rounded-3xl border {$active_custom_theme &&
$active_custom_theme.folder_name === theme.folder_name
? 'border-primary'
: 'border-theme-800'} bg-theme-950 transition hover:border-white/20 h-73.75"
>
<img
src={theme.preview || DefaultThemePreview}
alt="Preview of {theme.name}"
class="mb-2 h-40 w-full rounded-t-3xl object-cover object-center pointer-events-none select-none"
/>
<div class="flex flex-col gap-1 p-3">
<div class="mb-4 flex items-center justify-between gap-2">
<div class="flex flex-col items-start">
<span class="text-sm font-semibold">{theme.name}</span>
<span class="text-xs text-muted-foreground">by {theme.author}</span>
</div>
<span class="text-xs text-muted-foreground">v{theme.version}</span>
</div>
<span class="text-xs text-muted-foreground">v{theme.version}</span>
</div>
<div class="flex items-center gap-1">
<Button
class="w-full"
disabled={($active_custom_theme &&
$active_custom_theme.folder_name === theme.folder_name) ||
theme.status === 'downloading' ||
theme.status === 'extracting' ||
theme.status === 'deleting'}
onclick={async () => {
if (theme.status === 'installed') {
if ($custom_theme_container) {
loadTheme(theme, $custom_theme_container, $custom_theme_volume);
await config.value<string>('theme').set(theme.name);
} else {
sileo.error({
title: 'Uhhm..',
description: 'Failed to apply theme.',
});
}
} else {
const downloadThemeResult = await downloadTheme(theme);
if (!downloadThemeResult.success) {
if (downloadThemeResult.error && downloadThemeResult.error.length > 0) {
<div class="flex items-center gap-1">
<Button
class="w-full"
disabled={($active_custom_theme &&
$active_custom_theme.folder_name === theme.folder_name) ||
theme.status === 'downloading' ||
theme.status === 'extracting' ||
theme.status === 'deleting'}
onclick={async () => {
if (theme.status === 'installed') {
if ($custom_theme_container) {
loadTheme(theme, $custom_theme_container, $custom_theme_volume);
await config.value<string>('theme').set(theme.name);
} else {
sileo.error({
title: 'Uhhm..',
description: downloadThemeResult.error,
description: 'Failed to apply theme.',
});
}
} else {
sileo.success({
title: 'Yaay!',
description: 'Theme installed successfully!',
});
}
}
}}
>
{#if $active_custom_theme && $active_custom_theme.folder_name === theme.folder_name}
Theme in use
{:else if theme.status !== 'installed'}
{#if theme.status === 'downloading'}
{theme.updateAvailable ? 'Updating' : 'Downloading'} Theme... ({Math.round(
theme.progress * 100
)}%)
{:else if theme.status === 'extracting'}
Extracting Theme... ({Math.round(theme.progress * 100)}%)
{:else if theme.status === 'deleting'}
Uninstalling Theme...
{:else}
Download Theme
{/if}
{:else}
Use Theme
{/if}
</Button>
{#if theme.status === 'installed' && theme.updateAvailable}
<Button
class="min-w-10"
size="icon"
variant="secondary"
onclick={async () => {
const defaultTheme = $custom_themes.find((t) => t.name === 'Default');
if (defaultTheme) {
loadTheme(defaultTheme, $custom_theme_container!, $custom_theme_volume);
await config.value<string>('theme').set(defaultTheme.name);
if (!(await downloadTheme(theme, true))) {
sileo.error({
title: 'Uhhm..',
description: 'Failed to update theme.',
const downloadThemeResult = await downloadTheme(theme);
if (!downloadThemeResult.success) {
if (
downloadThemeResult.error &&
downloadThemeResult.error.length > 0
) {
sileo.error({
title: 'Uhhm..',
description: downloadThemeResult.error,
});
}
} else {
sileo.success({
title: 'Yaay!',
description: 'Theme installed successfully!',
});
}
}
}}
>
<CloudDownload />
{#if $active_custom_theme && $active_custom_theme.folder_name === theme.folder_name}
Theme in use
{:else if theme.status !== 'installed'}
{#if theme.status === 'downloading'}
{theme.updateAvailable ? 'Updating' : 'Downloading'} Theme... ({Math.round(
theme.progress * 100
)}%)
{:else if theme.status === 'extracting'}
Extracting Theme... ({Math.round(theme.progress * 100)}%)
{:else if theme.status === 'deleting'}
Uninstalling Theme...
{:else}
Download Theme
{/if}
{:else}
Use Theme
{/if}
</Button>
{/if}
{#if (theme.status === 'installed' || theme.status === 'deleting') && $active_custom_theme && $active_custom_theme.folder_name !== theme.folder_name && theme.name !== 'Default'}
<Button
class="min-w-10"
size="icon"
variant="destructive"
disabled={theme.status !== 'installed'}
onclick={async () => {
try {
const deleteResult = await deleteTheme(theme);
if (deleteResult) {
sileo.success({
title: 'Yaay!',
description: 'Theme uninstalled successfully!',
});
} else {
{#if theme.status === 'installed' && theme.updateAvailable}
<Button
class="min-w-10"
size="icon"
variant="secondary"
onclick={async () => {
const defaultTheme = $custom_themes.find((t) => t.name === 'Default');
if (defaultTheme) {
loadTheme(
defaultTheme,
$custom_theme_container!,
$custom_theme_volume
);
await config.value<string>('theme').set(defaultTheme.name);
if (!(await downloadTheme(theme, true))) {
sileo.error({
title: 'Uhhm..',
description: 'Failed to update theme.',
});
}
}
}}
>
<CloudDownload />
</Button>
{/if}
{#if (theme.status === 'installed' || theme.status === 'deleting') && $active_custom_theme && $active_custom_theme.folder_name !== theme.folder_name && theme.name !== 'Default'}
<Button
class="min-w-10"
size="icon"
variant="destructive"
disabled={theme.status !== 'installed'}
onclick={async () => {
try {
const deleteResult = await deleteTheme(theme);
if (deleteResult) {
sileo.success({
title: 'Yaay!',
description: 'Theme uninstalled successfully!',
});
} else {
sileo.error({
title: 'Uhhm..',
description: 'Failed to uninstall theme.',
});
}
} catch (err) {
console.log(err);
sileo.error({
title: 'Uhhm..',
description: 'Failed to uninstall theme.',
});
}
} catch (err) {
console.log(err);
sileo.error({
title: 'Uhhm..',
description: 'Failed to uninstall theme.',
});
}
}}
>
{#if theme.status === 'deleting'}
<LoaderCircle class="animate-spin" />
{:else}
<Trash />
{/if}
</Button>
{/if}
}}
>
{#if theme.status === 'deleting'}
<LoaderCircle class="animate-spin" />
{:else}
<Trash />
{/if}
</Button>
{/if}
</div>
</div>
</div>
</div>
{/each}
</div>
</ScrollContainer>
{/each}
</div>
</ScrollContainer>
{/if}
</div>
{/if}
</div>
+3 -5
View File
@@ -13,7 +13,6 @@
discordPresence,
osuBuild,
osuStream,
platform,
presenceLoading,
skins,
skinsCount,
@@ -266,17 +265,16 @@
<div class="flex flex-col">
<Label class="text-sm" for="setting-patch">Patching</Label>
<div class="text-muted-foreground text-xs">
Shows misses in Relax and Autopilot {#if $platform !== 'windows'}<span
Shows misses in Relax and Autopilot <!-- {#if $platform !== 'windows'}<span
class="text-red-500 bg-red-800/20 border border-red-600/20 p-0.5 mx-1 px-2 rounded-lg text-[0.55rem]!"
>currently only on windows!</span
>
{/if}
{/if} -->
</div>
</div>
<Checkbox
id="setting-patch"
checked={$platform === 'windows' ? $patch : false}
disabled={$platform !== 'windows'}
checked={$patch}
onCheckedChange={async (e) => {
patch.set(e);
}}