From 910e219c0eacb60ef60bcee3a596a0619b66c0da Mon Sep 17 00:00:00 2001 From: Geometrically <18202329+Geometrically@users.noreply.github.com> Date: Fri, 16 Aug 2024 23:20:11 -0700 Subject: [PATCH] 0.8.0 beta fixes (#2154) * initial fixes * 0.8.0 beta fixes * run actions * run fmt * Fix windows build * Add purge cache opt * add must revalidate to project req * lint + clippy * fix processes, open folder * Update migrator to use old launcher cache for perf * fix empty dirs not moving * fix lint + create natives dir if not exist * fix large request batches * finish * Fix deep linking on mac * fix comp err * fix comp err (2) --------- Signed-off-by: Geometrically <18202329+Geometrically@users.noreply.github.com> --- .github/workflows/app-release.yml | 1 + Cargo.lock | 88 +-- apps/app-frontend/index.html | 4 +- apps/app-frontend/src/App.vue | 267 ++++----- apps/app-frontend/src/assets/loading/cube.png | Bin 0 -> 959049 bytes apps/app-frontend/src/assets/profile_icon.png | Bin 9396694 -> 0 bytes .../src/assets/stylesheets/global.scss | 31 +- .../components/modrinth-loading-indicator.js | 10 +- .../src/components/ui/ErrorModal.vue | 126 +++- .../src/components/ui/RunningAppBar.vue | 7 +- .../src/components/ui/SplashScreen.vue | 228 ++++++- .../src/components/ui/URLConfirmModal.vue | 13 +- .../components/ui/tutorial/GalleryImage.vue | 198 ------- .../src/components/ui/tutorial/LoginCard.vue | 140 ----- .../ui/tutorial/OnboardingScreen.vue | 284 --------- .../components/ui/tutorial/StickyTitleBar.vue | 81 --- apps/app-frontend/src/helpers/cache.js | 52 +- apps/app-frontend/src/helpers/process.js | 4 +- apps/app-frontend/src/helpers/profile.js | 4 +- apps/app-frontend/src/helpers/settings.js | 10 +- apps/app-frontend/src/main.js | 49 +- apps/app-frontend/src/pages/Browse.vue | 14 +- apps/app-frontend/src/pages/Settings.vue | 62 +- .../app-frontend/src/pages/instance/Index.vue | 28 +- apps/app-frontend/src/pages/instance/Mods.vue | 36 +- apps/app-frontend/src/pages/project/Index.vue | 4 +- apps/app-frontend/src/store/breadcrumbs.js | 1 + apps/app-frontend/src/store/error.js | 4 +- apps/app-frontend/src/store/install.js | 12 +- apps/app-frontend/src/store/loading.js | 8 +- apps/app-playground/src/main.rs | 6 +- apps/app/Cargo.toml | 2 + apps/app/Info.plist | 4 +- apps/app/src/api/cache.rs | 13 +- apps/app/src/api/process.rs | 15 +- apps/app/src/api/profile.rs | 9 +- apps/app/src/api/settings.rs | 12 +- apps/app/src/api/utils.rs | 92 +-- apps/app/src/macos/deep_link.rs | 6 + apps/app/src/macos/mod.rs | 1 + apps/app/src/main.rs | 107 +++- apps/app/tauri.conf.json | 8 +- ...78c4e5c108c62462f16e8f3a84f4efabd529c.json | 12 + packages/app-lib/Cargo.toml | 3 +- .../20240813205023_drop-active-unique.sql | 2 + packages/app-lib/src/api/cache.rs | 17 +- packages/app-lib/src/api/metadata.rs | 2 +- packages/app-lib/src/api/mod.rs | 10 +- packages/app-lib/src/api/pack/import/mmc.rs | 3 +- packages/app-lib/src/api/pack/import/mod.rs | 21 +- .../app-lib/src/api/pack/install_mrpack.rs | 40 +- packages/app-lib/src/api/process.rs | 41 +- packages/app-lib/src/api/profile/mod.rs | 21 +- packages/app-lib/src/api/settings.rs | 15 + packages/app-lib/src/error.rs | 3 + packages/app-lib/src/event/emit.rs | 11 +- packages/app-lib/src/event/mod.rs | 37 +- packages/app-lib/src/launcher/mod.rs | 27 +- packages/app-lib/src/logger.rs | 40 +- packages/app-lib/src/state/cache.rs | 127 ++-- packages/app-lib/src/state/dirs.rs | 359 +++++++++-- packages/app-lib/src/state/discord.rs | 21 +- packages/app-lib/src/state/fs_watcher.rs | 24 +- .../app-lib/src/state/legacy_converter.rs | 561 ++++++++++++++---- packages/app-lib/src/state/mod.rs | 37 +- packages/app-lib/src/state/process.rs | 382 ++++-------- 66 files changed, 1961 insertions(+), 1896 deletions(-) create mode 100644 apps/app-frontend/src/assets/loading/cube.png delete mode 100644 apps/app-frontend/src/assets/profile_icon.png delete mode 100644 apps/app-frontend/src/components/ui/tutorial/GalleryImage.vue delete mode 100644 apps/app-frontend/src/components/ui/tutorial/LoginCard.vue delete mode 100644 apps/app-frontend/src/components/ui/tutorial/OnboardingScreen.vue delete mode 100644 apps/app-frontend/src/components/ui/tutorial/StickyTitleBar.vue create mode 100644 apps/app/src/macos/deep_link.rs create mode 100644 packages/app-lib/.sqlx/query-31938d27442f1f628fdcb81d16678c4e5c108c62462f16e8f3a84f4efabd529c.json create mode 100644 packages/app-lib/migrations/20240813205023_drop-active-unique.sql diff --git a/.github/workflows/app-release.yml b/.github/workflows/app-release.yml index a2890a0fb..88b78f7dd 100644 --- a/.github/workflows/app-release.yml +++ b/.github/workflows/app-release.yml @@ -3,6 +3,7 @@ on: push: branches: - main + - 0.8.0-beta-fixes tags: - 'v*' paths: diff --git a/Cargo.lock b/Cargo.lock index c9b44ce08..5aa840ae3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -129,7 +129,6 @@ dependencies = [ "memchr", "pin-project-lite", "tokio", - "xz2", "zstd 0.13.2", "zstd-safe 7.2.0", ] @@ -504,6 +503,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", + "regex-automata 0.4.7", "serde", ] @@ -1052,6 +1052,17 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +[[package]] +name = "dbus" +version = "0.9.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b" +dependencies = [ + "libc", + "libdbus-sys", + "winapi", +] + [[package]] name = "debugid" version = "0.8.0" @@ -2609,6 +2620,16 @@ version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +[[package]] +name = "libdbus-sys" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06085512b750d640299b79be4bad3d2fa90a9c00b1fd9e1b46364f66f0485c72" +dependencies = [ + "cc", + "pkg-config", +] + [[package]] name = "libm" version = "0.2.8" @@ -2679,17 +2700,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "lzma-sys" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "mac" version = "0.1.1" @@ -2980,6 +2990,15 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "normpath" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed" +dependencies = [ + "windows-sys 0.59.0", +] + [[package]] name = "notify" version = "6.1.1" @@ -3215,6 +3234,19 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "opener" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0812e5e4df08da354c851a3376fead46db31c2214f849d3de356d774d057681" +dependencies = [ + "bstr", + "dbus", + "normpath", + "url", + "windows-sys 0.59.0", +] + [[package]] name = "openssl" version = "0.10.65" @@ -5481,7 +5513,6 @@ dependencies = [ "tokio-stream", "toml 0.8.15", "tracing", - "tracing-appender", "tracing-error", "tracing-subscriber", "url", @@ -5505,6 +5536,7 @@ dependencies = [ "lazy_static", "objc", "once_cell", + "opener", "os_info", "paste", "sentry", @@ -5819,18 +5851,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-appender" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" -dependencies = [ - "crossbeam-channel", - "thiserror", - "time", - "tracing-subscriber", -] - [[package]] name = "tracing-attributes" version = "0.1.27" @@ -6527,6 +6547,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -6898,15 +6927,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "xz2" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" -dependencies = [ - "lzma-sys", -] - [[package]] name = "zbus" version = "3.15.2" diff --git a/apps/app-frontend/index.html b/apps/app-frontend/index.html index 93b695353..d535376f7 100644 --- a/apps/app-frontend/index.html +++ b/apps/app-frontend/index.html @@ -1,10 +1,12 @@ - +