feat: instances v2 (#6431)

* feat: base of instances v2

* feat: use old profiles with compat layer

* prototype: instances v2

* fix: install_from using profile

* fix: skins migration fix

* fix: frontend still using profile path

* fix: add update proj multiselect guard

* fix: cargo fmt

* fix: content missing fields

* feat: break up app-lib/api/instance.rs

* fix: check_content_updates mismatch

* fix: updater modal cleanup w/new structure

* feat: better update all handling

* fix: remove preview_update_all

* fix: feedback on bulk update + lint

* fix: rem transitions

* fix: change to jsonb

* feat: app db backup after update

* fix: lint

* fix: sqlx prepare + use sqlx macros

* fix: lint

* fix: bugs

* feat: defuck the installing process up

* fix: bug of hell

* fix: shear

* fix: fmt

* fix: install progress spacing + change mc/content/overrides to bytes

* fix: lint

* fix: prepr

* fix: navtabs anim not working in app

* fix: worlds.vue improvements + browse page fixes

* feat: optimise queries + adapter fns

* fix: lint

* fix: lint

* feat: shared modrinth-content-management crate (#6469)

* feat: disable warnings setting

* feat: add instances shortcuts (#6329)

* Add modrinth://launch deep link to start a profile

Support external profile launching via modrinth://launch/{profile_path} for integrations such as Stream Deck.

* Change route to /launch/profile/{id} for future extensibility

* fix: ensure profile path is url decoded

* fix: URL-decode profile path from deep link

* fix: use urlencoding crate for URL decoding

* feat: implement app instance shortcuts

* feat: change windows shortcut creation to use windows api instead

* feat: implement creating a shortcut launching world/server

* format

* fmt

* fix multiline inline tables

* pnpm prepr

* feat: move create shortcut to last item

* refactor: split up shortcuts.rs for individual platforms

* refactor: turn profile launch url into url type

* use string literal and add safety comment

* pt2

* refactor: rename anything that's profile into instance

* update mac shortcut

---------

Co-authored-by: DJCheesusReal <134006619+DJCheesusReal@users.noreply.github.com>

---------

Co-authored-by: Truman Gao <106889354+tdgao@users.noreply.github.com>
Co-authored-by: DJCheesusReal <134006619+DJCheesusReal@users.noreply.github.com>
This commit is contained in:
Calum H.
2026-06-25 21:19:29 +00:00
committed by GitHub
co-authored by DJCheesusReal Truman Gao
parent ef4044534f
commit 734720e11e
353 changed files with 24745 additions and 9771 deletions
+27 -53
View File
@@ -1,11 +1,11 @@
use super::{FriendPayload, LoadingBarId};
use crate::event::{
CommandPayload, EventError, LoadingBar, LoadingBarType, ProcessPayloadType,
ProfilePayloadType,
CommandPayload, EventError, InstanceBulkUpdateProgressPayload,
InstancePayloadType, LoadingBar, LoadingBarType, ProcessPayloadType,
};
#[cfg(feature = "tauri")]
use crate::event::{
LoadingPayload, ProcessPayload, ProfilePayload, WarningPayload,
InstancePayload, LoadingPayload, ProcessPayload, WarningPayload,
};
use futures::prelude::*;
use serde_json::Value;
@@ -94,47 +94,6 @@ pub async fn init_loading_unsafe(
Ok(key)
}
pub async fn init_or_edit_loading(
id: Option<LoadingBarId>,
bar_type: LoadingBarType,
total: f64,
title: &str,
) -> crate::Result<LoadingBarId> {
if let Some(id) = id {
edit_loading(&id, bar_type, total, title).await?;
Ok(id)
} else {
init_loading(bar_type, total, title).await
}
}
// Edits a loading bar's type
// This also resets the bar's current progress to 0
pub async fn edit_loading(
id: &LoadingBarId,
bar_type: LoadingBarType,
total: f64,
title: &str,
) -> crate::Result<()> {
let event_state = crate::EventState::get()?;
if let Some(mut bar) = event_state.loading_bars.get_mut(&id.0) {
bar.bar_type = bar_type;
bar.total = total;
bar.message = title.to_string();
bar.current = 0.0;
bar.last_sent = 0.0;
#[cfg(feature = "cli")]
{
bar.cli_progress_bar.reset(); // indicatif::ProgressBar::new(CLI_PROGRESS_BAR_TOTAL as u64);
}
};
emit_loading(id, 0.0, None)?;
Ok(())
}
// emit_loading emits a loading event to the frontend
// key refers to the loading bar to update
// increment refers to by what relative increment to the loading struct's total to update
@@ -220,6 +179,21 @@ pub async fn emit_warning(message: &str) -> crate::Result<()> {
Ok(())
}
#[allow(unused_variables)]
pub async fn emit_instance_bulk_update_progress(
payload: InstanceBulkUpdateProgressPayload,
) -> crate::Result<()> {
#[cfg(feature = "tauri")]
{
let event_state = crate::EventState::get()?;
event_state
.app
.emit("instance_bulk_update_progress", payload)
.map_err(EventError::from)?;
}
Ok(())
}
// emit_command(CommandPayload::Something { something })
// ie: installing a pack, opening an .mrpack, etc
// Generally used for url deep links and file opens that we want to handle in the frontend
@@ -243,7 +217,7 @@ pub async fn emit_command(command: CommandPayload) -> crate::Result<()> {
// emit_process(uuid, pid, event, message)
#[allow(unused_variables)]
pub async fn emit_process(
profile_path: &str,
instance_id: &str,
uuid: Uuid,
event: ProcessPayloadType,
message: &str,
@@ -256,7 +230,7 @@ pub async fn emit_process(
.emit(
"process",
ProcessPayload {
profile_path_id: profile_path.to_string(),
instance_id: instance_id.to_string(),
uuid,
event,
message: message.to_string(),
@@ -267,11 +241,11 @@ pub async fn emit_process(
Ok(())
}
// emit_profile(path, event)
// emit_instance(path, event)
#[allow(unused_variables)]
pub async fn emit_profile(
profile_path_id: &str,
event: ProfilePayloadType,
pub async fn emit_instance(
instance_id: &str,
event: InstancePayloadType,
) -> crate::Result<()> {
#[cfg(feature = "tauri")]
{
@@ -279,9 +253,9 @@ pub async fn emit_profile(
event_state
.app
.emit(
"profile",
ProfilePayload {
profile_path_id: profile_path_id.to_string(),
"instance",
InstancePayload {
instance_id: instance_id.to_string(),
event,
},
)
+46 -17
View File
@@ -145,36 +145,36 @@ pub enum LoadingBarType {
version: u32,
},
PackFileDownload {
profile_path: String,
instance_id: String,
pack_name: String,
icon: Option<String>,
pack_version: String,
},
PackDownload {
profile_path: String,
instance_id: String,
pack_name: String,
icon: Option<PathBuf>,
pack_id: Option<String>,
pack_version: Option<String>,
},
MinecraftDownload {
profile_path: String,
profile_name: String,
instance_id: String,
instance_name: String,
},
ProfileUpdate {
profile_path: String,
profile_name: String,
InstanceUpdate {
instance_id: String,
instance_name: String,
},
ZipExtract {
profile_path: String,
profile_name: String,
instance_id: String,
instance_name: String,
},
ConfigChange {
new_path: PathBuf,
},
CopyProfile {
CopyInstance {
import_location: PathBuf,
profile_name: String,
instance_name: String,
},
LauncherUpdate {
version: String,
@@ -197,6 +197,23 @@ pub struct WarningPayload {
pub message: String,
}
#[derive(Serialize, Clone)]
#[serde(rename_all = "camelCase")]
pub struct InstanceBulkUpdateProgressPayload {
pub instance_id: String,
pub stage: InstanceBulkUpdateProgressStage,
pub current: usize,
pub total: usize,
}
#[derive(Serialize, Clone)]
#[serde(rename_all = "snake_case")]
pub enum InstanceBulkUpdateProgressStage {
ResolvingVersions,
Downloading,
Finishing,
}
#[derive(Serialize, Clone)]
#[serde(tag = "event")]
pub enum CommandPayload {
@@ -212,6 +229,11 @@ pub enum CommandPayload {
InstallServer {
id: String,
},
LaunchInstance {
id: String,
server: Option<String>,
singleplayer_world: Option<String>,
},
RunMRPack {
// run or install .mrpack
path: PathBuf,
@@ -221,7 +243,7 @@ pub enum CommandPayload {
#[derive(Serialize, Clone)]
#[cfg(feature = "tauri")]
pub struct ProcessPayload {
pub profile_path_id: String,
pub instance_id: String,
pub uuid: Uuid,
pub event: ProcessPayloadType,
pub message: String,
@@ -236,15 +258,15 @@ pub enum ProcessPayloadType {
#[derive(Serialize, Clone)]
#[cfg(feature = "tauri")]
pub struct ProfilePayload {
pub profile_path_id: String,
pub struct InstancePayload {
pub instance_id: String,
#[serde(flatten)]
pub event: ProfilePayloadType,
pub event: InstancePayloadType,
}
#[derive(Serialize, Clone)]
#[serde(tag = "event", rename_all = "snake_case")]
pub enum ProfilePayloadType {
pub enum InstancePayloadType {
Created,
Synced,
ServersUpdated,
@@ -257,6 +279,13 @@ pub enum ProfilePayloadType {
timestamp: DateTime<Utc>,
},
Edited,
ContentInstallFinished {
project_ids: Vec<String>,
},
ContentInstallFailed {
project_ids: Vec<String>,
message: String,
},
Removed,
}
@@ -287,7 +316,7 @@ mod log_types {
#[derive(Serialize, Clone)]
pub struct LogPayload {
pub profile_path_id: String,
pub instance_id: String,
#[serde(flatten)]
pub event: LogEvent,
}