mirror of
https://github.com/modrinth/code.git
synced 2026-08-31 03:55:59 +00:00
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:
co-authored by
DJCheesusReal
Truman Gao
parent
ef4044534f
commit
734720e11e
@@ -1495,16 +1495,16 @@ impl CachedEntry {
|
||||
CacheValueType::FileHash => {
|
||||
// TODO: Replace state call here
|
||||
let state = crate::State::get().await?;
|
||||
let profiles_dir = state.directories.profiles_dir();
|
||||
let instances_dir = state.directories.instances_dir();
|
||||
|
||||
async fn hash_file(
|
||||
profiles_dir: &Path,
|
||||
instances_dir: &Path,
|
||||
key: String,
|
||||
) -> crate::Result<(CachedEntry, bool)> {
|
||||
let path =
|
||||
key.split_once('-').map(|x| x.1).unwrap_or_default();
|
||||
|
||||
let full_path = profiles_dir.join(path);
|
||||
let full_path = instances_dir.join(path);
|
||||
|
||||
let mut file = tokio::fs::File::open(&full_path).await?;
|
||||
let size = file.metadata().await?.len();
|
||||
@@ -1541,7 +1541,7 @@ impl CachedEntry {
|
||||
|
||||
use futures::stream::StreamExt;
|
||||
let results: Vec<_> = futures::stream::iter(keys)
|
||||
.map(|x| hash_file(&profiles_dir, x.to_string()))
|
||||
.map(|x| hash_file(&instances_dir, x.to_string()))
|
||||
.buffer_unordered(64) // hash 64 files at once
|
||||
.collect::<Vec<_>>()
|
||||
.await
|
||||
@@ -2120,7 +2120,7 @@ impl CachedEntry {
|
||||
|
||||
pub async fn cache_file_hash(
|
||||
bytes: bytes::Bytes,
|
||||
profile_path: &str,
|
||||
instance_id: &str,
|
||||
path: &str,
|
||||
known_hash: Option<&str>,
|
||||
project_type: Option<ProjectType>,
|
||||
@@ -2136,7 +2136,7 @@ pub async fn cache_file_hash(
|
||||
};
|
||||
|
||||
cache_file_hash_metadata(
|
||||
profile_path,
|
||||
instance_id,
|
||||
path,
|
||||
size as u64,
|
||||
hash,
|
||||
@@ -2148,7 +2148,7 @@ pub async fn cache_file_hash(
|
||||
}
|
||||
|
||||
pub async fn cache_file_hash_metadata(
|
||||
profile_path: &str,
|
||||
instance_id: &str,
|
||||
path: &str,
|
||||
size: u64,
|
||||
hash: String,
|
||||
@@ -2167,7 +2167,7 @@ pub async fn cache_file_hash_metadata(
|
||||
// Streamed extraction already computed these values, so avoid buffering the file just to cache them.
|
||||
CachedEntry::upsert_many(
|
||||
&[CacheValue::FileHash(CachedFileHash {
|
||||
path: format!("{profile_path}/{path}"),
|
||||
path: format!("{instance_id}/{path}"),
|
||||
size,
|
||||
hash,
|
||||
project_type,
|
||||
|
||||
Reference in New Issue
Block a user