yindo/drop-app
1
0
Fork 0
forked from Drop-OSS/archived-drop-app
Code Pull Requests Actions Activity

fix: app states

Browse Source
This commit is contained in:
DecDuck
2025-07-26 17:57:12 +10:00
parent f92ec38231
commit aad2d964eb
7 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app.vue
View File

@@ -22,6 +22,7 @@ const router = useRouter();
const state = useAppState();
try {
state.value = JSON.parse(await invoke("fetch_state"));
console.log(state.value)
} catch (e) {
console.error("failed to parse state", e);
}

7
src-tauri/src/client/cleanup.rs
View File

@@ -1,10 +1,11 @@
use log::{debug, error};
use tauri::AppHandle;
use tokio::sync::Mutex;
use crate::AppState;
#[tauri::command]
pub async fn quit(app: tauri::AppHandle, state: tauri::State<'_, std::sync::Mutex<AppState<'_>>>) -> Result<(), ()> {
pub async fn quit(app: tauri::AppHandle, state: tauri::State<'_, Mutex<AppState<'_>>>) -> Result<(), ()> {
cleanup_and_exit(&app, &state).await;
Ok(())
@@ -12,10 +13,10 @@ pub async fn quit(app: tauri::AppHandle, state: tauri::State<'_, std::sync::Mute
pub async fn cleanup_and_exit(
app: &AppHandle,
state: &tauri::State<'_, std::sync::Mutex<AppState<'_>>>,
state: &tauri::State<'_, Mutex<AppState<'_>>>,
) {
debug!("cleaning up and exiting application");
let download_manager = state.lock().unwrap().download_manager.clone();
let download_manager = state.lock().await.download_manager.clone();
match download_manager.ensure_terminated().await {
Ok(res) => match res {
Ok(_) => debug!("download manager terminated correctly"),

8
src-tauri/src/client/commands.rs
View File

@@ -1,10 +1,12 @@
use tokio::sync::Mutex;
use crate::AppState;
#[tauri::command]
pub fn fetch_state(
state: tauri::State<'_, std::sync::Mutex<AppState<'_>>>,
pub async fn fetch_state(
state: tauri::State<'_, Mutex<AppState<'_>>>,
) -> Result<String, String> {
let guard = state.lock().unwrap();
let guard = state.lock().await;
let cloned_state = serde_json::to_string(&guard.clone()).map_err(|e| e.to_string())?;
drop(guard);
Ok(cloned_state)

28
src-tauri/src/download_manager/commands.rs
View File

@@ -1,31 +1,35 @@
use std::sync::Mutex;
use tokio::sync::Mutex;
use crate::{database::models::data::DownloadableMetadata, AppState};
#[tauri::command]
pub fn pause_downloads(state: tauri::State<'_, Mutex<AppState>>) {
state.lock().unwrap().download_manager.pause_downloads()
pub async fn pause_downloads(state: tauri::State<'_, Mutex<AppState<'_>>>) -> Result<(), ()> {
state.lock().await.download_manager.pause_downloads();
Ok(())
}
#[tauri::command]
pub fn resume_downloads(state: tauri::State<'_, Mutex<AppState>>) {
state.lock().unwrap().download_manager.resume_downloads()
pub async fn resume_downloads(state: tauri::State<'_, Mutex<AppState<'_>>>) -> Result<(), ()> {
state.lock().await.download_manager.resume_downloads();
Ok(())
}
#[tauri::command]
pub fn move_download_in_queue(
state: tauri::State<'_, Mutex<AppState>>,
pub async fn move_download_in_queue(
state: tauri::State<'_, Mutex<AppState<'_>>>,
old_index: usize,
new_index: usize,
) {
) -> Result<(), ()> {
state
.lock()
.unwrap()
.await
.download_manager
.rearrange(old_index, new_index)
.rearrange(old_index, new_index);
Ok(())
}
#[tauri::command]
pub fn cancel_game(state: tauri::State<'_, Mutex<AppState>>, meta: DownloadableMetadata) {
state.lock().unwrap().download_manager.cancel(meta)
pub async fn cancel_game(state: tauri::State<'_, Mutex<AppState<'_>>>, meta: DownloadableMetadata) -> Result<(), ()> {
state.lock().await.download_manager.cancel(meta);
Ok(())
}

40
src-tauri/src/lib.rs
View File

@@ -58,6 +58,7 @@ use remote::commands::{
use remote::fetch_object::{fetch_object, fetch_object_offline};
use remote::server_proto::{handle_server_proto, handle_server_proto_offline};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::fs::File;
use std::io::Write;
use std::panic::PanicHookInfo;
@@ -65,13 +66,13 @@ use std::path::Path;
use std::str::FromStr;
use std::sync::Arc;
use std::time::SystemTime;
use std::collections::HashMap;
use std::{env, panic};
use tauri::menu::{Menu, MenuItem, PredefinedMenuItem};
use tauri::tray::TrayIconBuilder;
use tauri::{AppHandle, Manager, RunEvent, WindowEvent};
use tauri_plugin_deep_link::DeepLinkExt;
use tauri_plugin_dialog::DialogExt;
use tokio::runtime::Handle;
use tokio::sync::Mutex;
#[derive(Clone, Copy, Serialize, Eq, PartialEq)]
@@ -317,11 +318,14 @@ pub async fn run() {
))
.setup(|app| {
let app = app.handle().clone();
let runtime = Handle::current();
tauri::async_runtime::spawn(async move {
runtime.spawn(async move {
let state = setup(app.clone()).await;
debug!("initialized drop client");
app.manage(Mutex::new(state));
info!("initialized drop client");
if !app.manage(Mutex::new(state)) {
panic!("failed to setup drop state before Tauri does")
}
{
use tauri_plugin_deep_link::DeepLinkExt;
@@ -329,20 +333,6 @@ pub async fn run() {
debug!("registered all pre-defined deep links");
}
let _main_window = tauri::WebviewWindowBuilder::new(
&app,
"main", // BTW this is not the name of the window, just the label. Keep this 'main', there are permissions & configs that depend on it
tauri::WebviewUrl::App("index.html".into()),
)
.title("Drop Desktop App")
.min_inner_size(1000.0, 500.0)
.inner_size(1536.0, 864.0)
.decorations(false)
.shadow(false)
.data_directory(DATA_ROOT_DIR.join(".webview"))
.build()
.unwrap();
let deep_link_handle = app.clone();
app.deep_link().on_open_url(move |event| {
@@ -413,6 +403,20 @@ pub async fn run() {
.show(|_| {});
}
};
let _main_window = tauri::WebviewWindowBuilder::new(
&app,
"main", // BTW this is not the name of the window, just the label. Keep this 'main', there are permissions & configs that depend on it
tauri::WebviewUrl::App("index.html".into()),
)
.title("Drop Desktop App")
.min_inner_size(1000.0, 500.0)
.inner_size(1536.0, 864.0)
.decorations(false)
.shadow(false)
.data_directory(DATA_ROOT_DIR.join(".webview"))
.build()
.unwrap();
});
Ok(())
})

7
src-tauri/src/remote/commands.rs
View File

@@ -1,8 +1,7 @@
use std::sync::Mutex;
use log::debug;
use reqwest::Client;
use tauri::{AppHandle, Emitter, Manager};
use tokio::sync::Mutex;
use url::Url;
use crate::{
@@ -72,7 +71,7 @@ pub async fn sign_out(app: AppHandle) {
// Update app state
{
let app_state = app.state::<Mutex<AppState>>();
let mut app_state_handle = app_state.lock().unwrap();
let mut app_state_handle = app_state.lock().await;
app_state_handle.status = AppStatus::SignedOut;
app_state_handle.user = None;
}
@@ -85,7 +84,7 @@ pub async fn sign_out(app: AppHandle) {
pub async fn retry_connect(state: tauri::State<'_, Mutex<AppState<'_>>>) -> Result<(), ()> {
let (app_status, user) = setup().await;
let mut guard = state.lock().unwrap();
let mut guard = state.lock().await;
guard.status = app_status;
guard.user = user;
drop(guard);

5
src-tauri/src/remote/utils.rs
View File

@@ -1,7 +1,6 @@
use std::sync::Mutex;
use log::{debug, warn};
use serde::Deserialize;
use tokio::sync::Mutex;
use url::Url;
use crate::{
@@ -34,7 +33,7 @@ pub async fn use_remote_logic(
}
{
let mut app_state = state.lock().unwrap();
let mut app_state = state.lock().await;
app_state.status = AppStatus::SignedOut;
}