You've already forked AstralRinth
7d92e4ec7f
* feat: base content card component * fix: tooltips + colors * feat: fix orgs * feat: base content tab internals rewrite * feat: fix invalidmodal * feat: add ContentModpackCard * fix: extract types * draft: layout * feat: unlink modal * feat: impl content tab * fix: lint * fix: toggling * temp: disable updating stuff * feat: selection v-model * feat: bulk selection * feat: mods tab rough draft * feat: use fuse.js * feat: add project combobox * clean up project combobox * feat: start install to play modal * fix: events * feat: use v-on * feat: bulk actions + fix floating action bar width * feat: figma alignments * feat: migrate toggle to tailwind * fix: row borders * feat: disabled state * feat: virtual list impl for card table based on window scroll * fix: lint * feat: virtualization + smaller contentcard items * feat: use ContentCardTable + ContentCardItems * feat: fix gap + border issues on last elm * feat: cleanup + use proper searching * fix: use TeleportOverflowMenu * fix: fallback to svg if src is invalid on avatar component * fix: storybook * feat: start on updater modal * feat: finish content updater modal * feat: i18n pass * feat: impl modal * feat(app): backend changes for content tab refactor (#5237) * feat: include_changelog=false for updater modal * fix: hash overrides * feat: update checking for modpack * feat: qa * feat: modpack content modal * fix: padding in table to match modals + tightness * fix: lint * feat: delete modal * feat: fix toggle bugs * fix: prepr * fix: duplicate messages * qa: full width search * qa: use bg-surface-1.5 * qa: animation for filter pills * qa: standardize hover colors * fix: border-[1px] is border * qa: mass de-select actually mass selecting * qa: match figma designs for floating action bar * qa: modal fixes * q: modal fixes x2 * fix: table border * qa: confirm modals * qa: modal alignment * qa: re-add stuck heading + dedupe logic * qa: dedupe virtual scrolling + remove dead components * qa: responsiveness for content table + link fixes * qa: version column link, tooltips + lint fixes * qa: instance busy protections * fix: installation freeze bug * chore: remove old mods page * refactor: deduplicate layout * chore: delete old content page(s) * qa * qa * qa * feat: sort btn - to iterate * fix: ml * feat: date added * fix: lint * fix: formatting.ts removal * feat: get_dependencies_as_content_items * qa: final QA changes * refactor: deduplicate + polish content.rs * feat: hook up content.vue with v1 * feat: hide v1 content api behind frontend feature flag * fix: query keys + copy on empty state * chore: i18n pass * feat: reimpl unlink + upload endpoint * feat: use bulk endpoints v1 * fix: lint * fix: flags * fix: responsiveness via container queries * fix: lint * qa: 1 * qa: fixes * qa: fix ssr issues with browse content * qa: header page divider * qa: modals * fix: prepr * fix: issues * fix: lint * fix: toggle v1 ff * qa: 5 * qa: delete modal copy * feat: creation flow modals (#5383) * refactor: delete content v0 usages + impl * feat: qa + fixes * feat: installing banner using state event * feat: fix modpack card bugs + filtering issues * refactor: delete backups v0 api module * feat: v1 servers GET endpoint * fix: backups * feat: swap to kyros upload v1 addon * fix: use tanstack for loader.vue * feat: finish install from discovery modal * qa: bug fixes * feat: set up installation settings * fix: lint * fix: typos * fix: bugs * fix: disable inline content * feat: content tab improvements — upload UX, installation settings, and client-only indicators Upload cancellation and navigation guard: - Add ConfirmLeaveModal that prompts when navigating away during upload - Cancel in-flight XHR uploads when user confirms leaving the page - Add beforeunload handler to warn on browser/tab close during upload - Track uploadedBytes/totalBytes in UploadState for progress display - Replace Collapsible with Transition for upload progress admonition - Show byte progress and percentage in upload banner - Clamp upload progress to prevent exceeding 100% Installation settings (server.properties): - Add KnownPropertiesFields and PropertiesFields types to Archon types - Add buildProperties() to creation flow context to collect gamemode, difficulty, seed, world type, structures, and generator settings - Pass properties through installContent on onboarding, discovery, and ServerSetupModal flows Server setup and discovery flow improvements: - Migrate ServerSetupModal from servers_v0.reinstall to content_v1.installContent - Replace loaderApiNames lookup with toApiLoader() helper - Remove eraseDataOnInstall toggle — always use soft_override: false - Simplify modpack install on discovery page to use first available version and route through creation flow modal for both onboarding and non-onboarding - Differentiate post-install navigation: content page for onboarding, loader options for existing servers Modpack update flow: - Replace updateModpack() call with installContent() using soft_override: true to support version selection in the content updater modal Client-only mod indicators: - Add environment field to AddonVersion (reuses Labrinth.Projects.v3.Environment) - Add environment to ContentItem and isClientOnly to ContentCardTableItem - Show orange TriangleAlertIcon with tooltip on client-only mods in content table - Add "Client-only" filter pill to content filtering (controlled via showClientOnlyFilter on ContentManagerContext) - Apply client-only indicators in both ContentPageLayout and ModpackContentModal Misc: - Add CLAUDE.md note about using prepr commands for lint checks - Export ConfirmLeaveModal from instances barrel * fix: piping * fix: switch content disable for linked server instances * feat: client only filter * fix: prepr * feat: hasUpdate shape update * feat: bulk update endpoint impl for content in panel * feat: websocket state impl again with new phases * fix: ws * fix: use timeout fn for sync admon + fix content card layout scroll for browsers with overflow anchor bug * fix: qa bugs * fix: lint, a11y and i18n * refactor: set up layouts folder properly * fix: linked data cache stuff + lint * feat: move installationsettings to shared layout * fix: lint * fix: issues * feat: temp fuck staging up * fix: lockfile * fix: data sync issues on loader.vue * fix: lint * Hide shader configuration files from content list (#5499) * feat: workaround search problem + split out reset * fix: qa * fix: changelog not showing on first open * fix: qa + optimistic updating improvements * fix: prepr+lint * fix: qa * feat: qa * fix: lint * fix: lint * fix: build * fix: build * fix: type errors * fix: fade and JAVA_HOME passthrough * feat: qa * feat: impl diff shit * fix: qa * fix: app qa * feat: update diff modal * fix: endpoint * fix: qa * fix: qa * fix: use bulk in modpack modal * feat: abort signal impl + fix issues * fix: diff modal trunc * feat: qa * fix: qa * feat: tooltip content tab * fix: prepr * fix: dismiss on settings btn * feat: qa * feat: dont clear handlers on disconnect * fix: lint * fix: wrangler + introduce staging-archon env file --------- Signed-off-by: Calum H. <calum@modrinth.com> Co-authored-by: tdgao <mr.trumgao@gmail.com> Co-authored-by: Artyom Ezri <61311568+Artezon@users.noreply.github.com>
189 lines
5.7 KiB
Rust
189 lines
5.7 KiB
Rust
use serde::{Deserialize, Serialize};
|
|
use tauri::Runtime;
|
|
use tauri_plugin_opener::OpenerExt;
|
|
use theseus::{
|
|
handler,
|
|
prelude::{CommandPayload, DirectoryInfo},
|
|
};
|
|
|
|
use crate::api::{Result, TheseusSerializableError};
|
|
use dashmap::DashMap;
|
|
use std::path::{Path, PathBuf};
|
|
use theseus::prelude::canonicalize;
|
|
use url::Url;
|
|
|
|
pub fn init<R: Runtime>() -> tauri::plugin::TauriPlugin<R> {
|
|
tauri::plugin::Builder::new("utils")
|
|
.invoke_handler(tauri::generate_handler![
|
|
get_os,
|
|
is_network_metered,
|
|
should_disable_mouseover,
|
|
highlight_in_folder,
|
|
open_path,
|
|
show_launcher_logs_folder,
|
|
progress_bars_list,
|
|
get_opening_command
|
|
])
|
|
.build()
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
#[allow(clippy::enum_variant_names)]
|
|
pub enum OS {
|
|
Windows,
|
|
Linux,
|
|
MacOS,
|
|
}
|
|
|
|
/// Gets OS
|
|
#[tauri::command]
|
|
pub fn get_os() -> OS {
|
|
#[cfg(target_os = "windows")]
|
|
let os = OS::Windows;
|
|
#[cfg(target_os = "linux")]
|
|
let os = OS::Linux;
|
|
#[cfg(target_os = "macos")]
|
|
let os = OS::MacOS;
|
|
os
|
|
}
|
|
|
|
#[tauri::command]
|
|
pub async fn is_network_metered() -> Result<bool> {
|
|
Ok(theseus::prelude::is_network_metered().await?)
|
|
}
|
|
|
|
// Lists active progress bars
|
|
// Create a new HashMap with the same keys
|
|
// Values provided should not be used directly, as they are not guaranteed to be up-to-date
|
|
#[tauri::command]
|
|
pub async fn progress_bars_list()
|
|
-> Result<DashMap<uuid::Uuid, theseus::LoadingBar>> {
|
|
let res = theseus::EventState::list_progress_bars().await?;
|
|
Ok(res)
|
|
}
|
|
|
|
// disables mouseover and fixes a random crash error only fixed by recent versions of macos
|
|
#[tauri::command]
|
|
pub async fn should_disable_mouseover() -> bool {
|
|
if cfg!(target_os = "macos") {
|
|
// We try to match version to 12.2 or higher. If unrecognizable to pattern or lower, we default to the css with disabled mouseover for safety
|
|
if let tauri_plugin_os::Version::Semantic(major, minor, _) =
|
|
tauri_plugin_os::version()
|
|
&& major >= 12
|
|
&& minor >= 3
|
|
{
|
|
// Mac os version is 12.3 or higher, we allow mouseover
|
|
return false;
|
|
}
|
|
true
|
|
} else {
|
|
// Not macos, we allow mouseover
|
|
false
|
|
}
|
|
}
|
|
|
|
#[tauri::command]
|
|
pub async fn highlight_in_folder<R: Runtime>(
|
|
app: tauri::AppHandle<R>,
|
|
path: PathBuf,
|
|
) {
|
|
tauri::async_runtime::spawn_blocking(move || {
|
|
if let Err(e) = app.opener().reveal_item_in_dir(path) {
|
|
tracing::error!("Failed to highlight file in folder: {}", e);
|
|
}
|
|
})
|
|
.await
|
|
.ok();
|
|
}
|
|
|
|
#[tauri::command]
|
|
pub async fn open_path<R: Runtime>(app: tauri::AppHandle<R>, path: PathBuf) {
|
|
tauri::async_runtime::spawn_blocking(move || {
|
|
if let Err(e) =
|
|
app.opener().open_path(path.to_string_lossy(), None::<&str>)
|
|
{
|
|
tracing::error!("Failed to open path: {}", e);
|
|
}
|
|
})
|
|
.await
|
|
.ok();
|
|
}
|
|
|
|
#[tauri::command]
|
|
pub async fn show_launcher_logs_folder<R: Runtime>(app: tauri::AppHandle<R>) {
|
|
if let Some(d) = DirectoryInfo::global_handle_if_ready() {
|
|
let path = d.launcher_logs_dir().unwrap_or_default();
|
|
// failure to get folder just opens filesystem
|
|
// (ie: if in debug mode only and launcher_logs never created)
|
|
open_path(app, path).await;
|
|
}
|
|
}
|
|
|
|
// Get opening command
|
|
// For example, if a user clicks on an .mrpack to open the app.
|
|
// This should be called once and only when the app is done booting up and ready to receive a command
|
|
// Returns a Command struct- see events.js
|
|
#[tauri::command]
|
|
#[cfg(target_os = "macos")]
|
|
pub async fn get_opening_command(
|
|
state: tauri::State<'_, crate::macos::deep_link::InitialPayload>,
|
|
) -> Result<Option<CommandPayload>> {
|
|
let payload = state.payload.lock().await;
|
|
|
|
return if let Some(payload) = payload.as_ref() {
|
|
tracing::info!("opening command {payload}");
|
|
|
|
Ok(Some(handler::parse_command(payload).await?))
|
|
} else {
|
|
Ok(None)
|
|
};
|
|
}
|
|
|
|
#[tauri::command]
|
|
#[cfg(not(target_os = "macos"))]
|
|
pub async fn get_opening_command() -> Result<Option<CommandPayload>> {
|
|
// Tauri is not CLI, we use arguments as path to file to call
|
|
let cmd_arg = std::env::args_os().nth(1);
|
|
|
|
tracing::info!("opening command {cmd_arg:?}");
|
|
|
|
let cmd_arg = cmd_arg.map(|path| path.to_string_lossy().to_string());
|
|
if let Some(cmd) = cmd_arg {
|
|
tracing::debug!("Opening command: {:?}", cmd);
|
|
return Ok(Some(handler::parse_command(&cmd).await?));
|
|
}
|
|
Ok(None)
|
|
}
|
|
|
|
// helper function called when redirected by a weblink (ie: modrith://do-something) or when redirected by a .mrpack file (in which case its a filepath)
|
|
// We hijack the deep link library (which also contains functionality for instance-checking)
|
|
pub async fn handle_command(command: String) -> Result<()> {
|
|
tracing::info!("handle command: {command}");
|
|
Ok(theseus::handler::parse_and_emit_command(&command).await?)
|
|
}
|
|
|
|
// Remove when (and if) https://github.com/tauri-apps/tauri/issues/12022 is implemented
|
|
pub(crate) fn tauri_convert_file_src(path: &Path) -> Result<Url> {
|
|
#[cfg(any(windows, target_os = "android"))]
|
|
const BASE: &str = "http://asset.localhost/";
|
|
#[cfg(not(any(windows, target_os = "android")))]
|
|
const BASE: &str = "asset://localhost/";
|
|
|
|
macro_rules! theseus_try {
|
|
($test:expr) => {
|
|
match $test {
|
|
Ok(val) => val,
|
|
Err(e) => {
|
|
return Err(TheseusSerializableError::Theseus(e.into()))
|
|
}
|
|
}
|
|
};
|
|
}
|
|
|
|
let path = theseus_try!(canonicalize(path));
|
|
let path = path.to_string_lossy();
|
|
let encoded = urlencoding::encode(&path);
|
|
|
|
Ok(theseus_try!(Url::parse(&format!("{BASE}{encoded}"))))
|
|
}
|