* Add launcher_feature_version to Profile * Misc fixes - Add typing to theme and settings stuff - Push instance route on creation from installing a modpack - Fixed servers not reloading properly when first added * Make old instances scan the logs folder for joined servers on launcher startup * Create AttachedWorldData * Change AttachedWorldData interface * Rename WorldType::World to WorldType::Singleplayer * Implement world display status system * Fix Minecraft font * Fix set_world_display_status Tauri error * Add 'Play instance' option * Add option to disable worlds showing in Home * Fixes - Fix available server filter only showing if there are some available - Fixed server and singleplayer filters sometimes showing when there are only servers or singleplayer worlds - Fixed new worlds not being automatically added when detected - Rephrased Jump back into worlds option description * Fixed sometimes more than 6 items showing up in Jump back in * Fix servers.dat issue with instances you haven't played before * Update a bunch of app dependencies in non-breaking ways * Update dependencies in app-lib that had breaking updates * Update dependencies in app that had breaking updates * Fix too large of bulk requests being made, limit max to 800 #3430 * Also update tauri-plugin-opener * Update app-lib to Rust 2024 * Non-breaking updates in ariadne * Breaking updates in ariadne * Ariadne Rust 2024 * Add hiding from home page, add types to Mods.vue * Make recent worlds go into grid when display is huge * Fix lint * Remove redundant media query * Fix protocol version on home page, and home page being blocked by pinging servers * Clippy fix in app-lib * Clippy fix in app * Clippy fix * More Clippy fixes * Fix Prettier lints * Undo `from_string` changes * Update macos dependencies * Apply updates to app-playground as well * Update Wry + Tauri * Update sysinfo * Update theseus_gui to Rust 2024 * Downgrade rand in ariadne to fix labrinth Labrinth can't use rand 0.9 due to argon2 * Cargo format --------- Signed-off-by: Josiah Glosson <soujournme@gmail.com> Co-authored-by: Prospector <prospectordev@gmail.com> Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com> Co-authored-by: Alejandro González <me@alegon.dev>
76 lines
2.4 KiB
Rust
76 lines
2.4 KiB
Rust
use std::path::PathBuf;
|
|
|
|
use crate::{
|
|
event::{
|
|
CommandPayload,
|
|
emit::{emit_command, emit_warning},
|
|
},
|
|
util::io,
|
|
};
|
|
|
|
/// Handles external functions (such as through URL deep linkage)
|
|
/// Link is extracted value (link) in somewhat URL format, such as
|
|
/// subdomain1/subdomain2
|
|
/// (Does not include modrinth://)
|
|
pub async fn handle_url(sublink: &str) -> crate::Result<CommandPayload> {
|
|
Ok(match sublink.split_once('/') {
|
|
// /mod/{id} - Installs a mod of mod id
|
|
Some(("mod", id)) => CommandPayload::InstallMod { id: id.to_string() },
|
|
// /version/{id} - Installs a specific version of id
|
|
Some(("version", id)) => {
|
|
CommandPayload::InstallVersion { id: id.to_string() }
|
|
}
|
|
// /modpack/{id} - Installs a modpack of modpack id
|
|
Some(("modpack", id)) => {
|
|
CommandPayload::InstallModpack { id: id.to_string() }
|
|
}
|
|
_ => {
|
|
emit_warning(&format!(
|
|
"Invalid command, unrecognized path: {sublink}"
|
|
))
|
|
.await?;
|
|
return Err(crate::ErrorKind::InputError(format!(
|
|
"Invalid command, unrecognized path: {sublink}"
|
|
))
|
|
.into());
|
|
}
|
|
})
|
|
}
|
|
|
|
pub async fn parse_command(
|
|
command_string: &str,
|
|
) -> crate::Result<CommandPayload> {
|
|
tracing::debug!("Parsing command: {}", &command_string);
|
|
|
|
// modrinth://some-command
|
|
// This occurs when following a web redirect link
|
|
if let Some(sublink) = command_string.strip_prefix("modrinth://") {
|
|
Ok(handle_url(sublink).await?)
|
|
} else {
|
|
// We assume anything else is a filepath to an .mrpack file
|
|
let path = PathBuf::from(command_string);
|
|
let path = io::canonicalize(path)?;
|
|
if let Some(ext) = path.extension() {
|
|
if ext == "mrpack" {
|
|
return Ok(CommandPayload::RunMRPack { path });
|
|
}
|
|
}
|
|
emit_warning(&format!(
|
|
"Invalid command, unrecognized filetype: {}",
|
|
path.display()
|
|
))
|
|
.await?;
|
|
Err(crate::ErrorKind::InputError(format!(
|
|
"Invalid command, unrecognized filetype: {}",
|
|
path.display()
|
|
))
|
|
.into())
|
|
}
|
|
}
|
|
|
|
pub async fn parse_and_emit_command(command_string: &str) -> crate::Result<()> {
|
|
let command = parse_command(command_string).await?;
|
|
emit_command(command).await?;
|
|
Ok(())
|
|
}
|