upgrade to dioxus 0.7.1

.gitea/workflows/test.yaml

@@ -18,7 +18,7 @@ jobs:
         run: curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
 
       - name: Install dioxus-cli
-        run: cargo binstall dioxus-cli --version 0.6.3
+        run: cargo binstall dioxus-cli --version 0.7.1
 
       - uses: Swatinem/rust-cache@v2
 

gui/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 # Web Dependencies
 # ================
-dioxus-web = { version = "0.6.3", optional = true }
+dioxus-web = { version = "0.7.1", optional = true }
 wasm-bindgen = { version = "^0.2.92", optional = true }
 wasm-bindgen-futures = { version = "^0.4.42", optional = true }
 wasm-streams = { version = "^0.4.0", optional = true }
@@ -59,7 +59,6 @@ tracing-web = { version = "^0.1.3", optional = true }
 
 # Desktop Dependecies
 # ===================
-dioxus-desktop = { version = "0.6.3", optional = true }
 tokio = { version = "^1.41.1", features = ["net", "rt"], optional = true }
 tokio-rustls = { version = "^0.26.0", optional = true }
 opus = { version = "0.3.0", optional = true }
@@ -68,7 +67,7 @@ dasp_ring_buffer = { version = "0.11.0", optional = true }
 
 # Base Dependencies
 # ================
-dioxus = { version = "0.6.3" }
+dioxus = { version = "0.7.1" }
 once_cell = "1.19.0"
 asynchronous-codec = { workspace = true }
 futures = "^0.3.30"
@@ -89,11 +88,12 @@ tracing = "^0.1.40"
 color-eyre = "^0.6.3"
 crossbeam-queue = "^0.3.11"
 lol_html = "^2.2.0"
-rfd = "^0.15.2"
+rfd = { git = "https://github.com/samsartor/rfd.git", version = "^0.16.0", default-features = false } 
 base64 = "^0.22"
 mime_guess = "^2.0.5"
 async_cell = "^0.2.3"
 reqwest = { version = "^0.12.22", features = ["json"] }
+dioxus-asset-resolver = "0.7.1"
 
 # Denoising
 # =========
@@ -128,4 +128,6 @@ desktop = [
   "opus",
   "cpal",
   "dasp_ring_buffer",
+  "rfd/xdg-portal",
+  "rfd/tokio",
 ]

gui/src/effects.rs

@@ -2,6 +2,7 @@ use crossbeam::atomic::AtomicCell;
 use df::tract::{mut_slice_as_arrayviewmut, slice_as_arrayview};
 use df::tract::{DfParams, DfTract, RuntimeParams};
 use dioxus::prelude::{asset, manganis, Asset};
+use dioxus_asset_resolver::read_asset_bytes;
 use std::cell::RefCell;
 use std::sync::Arc;
 use tracing::{error, info};
@@ -32,7 +33,7 @@ fn with_denoising_model<O>(
             let cell_task = cell.clone();
             *state = DenoisingModelState::Downloading(cell);
             spawn.spawn(async move {
-                let model_bytes = match imp::read_asset_bytes(&DF_MODEL).await {
+                let model_bytes = match read_asset_bytes(&DF_MODEL).await {
                     Ok(b) => b,
                     Err(e) => {
                         error!("could not read denoising model from \"{DF_MODEL}\": {e:?}");

gui/src/imp/desktop.rs

@@ -311,13 +311,3 @@ pub fn init_logging() {
         .with_env_filter(env_filter)
         .init();
 }
-
-// TODO: once we update to dioxus 0.7, swap this out with the dioxus-asset-resolver crate
-pub async fn read_asset_bytes(asset: &dioxus::prelude::Asset) -> color_eyre::Result<Vec<u8>> {
-    let cur_exe = std::env::current_exe().unwrap();
-    let path = cur_exe
-        .parent()
-        .unwrap()
-        .join(asset.to_string().trim_matches('/'));
-    Ok(std::fs::read(&path).with_context(|| format!("native path \"{}\"", path.display()))?)
-}

gui/src/imp/web.rs

@@ -448,12 +448,6 @@ pub fn init_logging() {
     info!("logging initiated");
 }
 
-// TODO: once we update to dioxus 0.7, swap this out with the dioxus-asset-resolver crate
-pub async fn read_asset_bytes(asset: &dioxus::prelude::Asset) -> color_eyre::Result<Vec<u8>> {
-    let url = absolute_url(asset.to_string().trim_matches('/'))?;
-    Ok(reqwest::get(url).await?.bytes().await?.to_vec())
-}
-
 pub struct SpawnHandle;
 
 impl SpawnHandle {

gui/src/main.rs

@@ -1,12 +1,6 @@
-use mumble_web2_gui::{app, imp::init_logging};
+use mumble_web2_gui::{app, imp};
 
 pub fn main() {
-    #[cfg(feature = "desktop")]
+    imp::init_logging();
-    let _guard = tokio::runtime::Builder::new_multi_thread()
-        .enable_all()
-        .build()
-        .unwrap()
-        .enter();
-    init_logging();
     dioxus::launch(app::app);
 }