Add download progress bar

This commit is contained in:
2026-07-18 20:08:02 -04:00
parent be17ff79f8
commit 91c595bb42
4 changed files with 119 additions and 17 deletions
+7 -10
View File
@@ -228,7 +228,6 @@ fn delete_entry(app: AppHandle, store: State<'_, Store>, path: String) -> Result
}
}
/// Moves an entry into another folder, keeping its name.
#[tauri::command]
fn move_entry(
app: AppHandle,
@@ -308,7 +307,6 @@ fn duplicate_entry(
Ok(candidate)
}
/// Absolute path on disk, used to reveal an entry in the system file manager.
#[tauri::command]
fn absolute_path(
app: AppHandle,
@@ -761,8 +759,6 @@ fn cloud_list_files(
sync::list_account_files(&server_url, &token, folder_id.as_deref())
}
/// Downloads an account file into the shared asset library, where every
/// project can reference it by name.
#[tauri::command]
fn cloud_download_file(
app: AppHandle,
@@ -770,7 +766,10 @@ fn cloud_download_file(
file_id: String,
) -> Result<String, String> {
let (server_url, token) = cloud_credentials(&app, &store)?;
sync::report_progress(&app, "file", 0, 1, false);
let file = sync::pull_account_file(&server_url, &token, &file_id)?;
sync::report_progress(&app, &file.name, 1, 1, true);
let bytes = BASE64
.decode(file.content.as_bytes())
@@ -791,8 +790,6 @@ fn cloud_list_shared(
sync::list_shared(&server_url, &token)
}
/// Downloads a cloud document into the workspace and remembers where it came
/// from so it can be synced back.
#[tauri::command]
fn cloud_download_document(
app: AppHandle,
@@ -801,7 +798,10 @@ fn cloud_download_document(
parent: String,
) -> Result<String, String> {
let (server_url, token) = cloud_credentials(&app, &store)?;
sync::report_progress(&app, "document", 0, 1, false);
let document = sync::pull_document(&server_url, &token, &document_id)?;
sync::report_progress(&app, &document.title, 1, 1, true);
let mut name = document.title.replace('/', "-").trim().to_string();
if name.is_empty() {
@@ -872,8 +872,6 @@ pub struct LinkedDocument {
pub sync_state: Option<String>,
}
/// Every cloud document that has been downloaded, so the cloud view can show
/// which ones live on this device and whether they are up to date.
#[tauri::command]
fn cloud_linked_documents(
app: AppHandle,
@@ -908,7 +906,6 @@ pub struct LinkedSpace {
pub sync_state: Option<String>,
}
/// Cloud spaces that have been downloaded, wherever they sit in the workspace.
#[tauri::command]
fn cloud_linked_spaces(
app: AppHandle,
@@ -968,7 +965,7 @@ fn cloud_clone_space(
if dir.exists() {
return Err(format!("A project named '{}' already exists", project_name));
}
sync::clone_space(&server_url, &token, &store, &project, &dir, &space_id)
sync::clone_space(&server_url, &token, &app, &store, &project, &dir, &space_id)
}
#[tauri::command]
+36 -4
View File
@@ -493,9 +493,39 @@ pub fn push_project(
Ok(report)
}
#[derive(Serialize, Clone)]
pub struct DownloadProgress {
pub label: String,
pub current: usize,
pub total: usize,
pub done: bool,
}
pub const PROGRESS_EVENT: &str = "download://progress";
pub fn report_progress(
app: &tauri::AppHandle,
label: &str,
current: usize,
total: usize,
done: bool,
) {
use tauri::Emitter;
let _ = app.emit(
PROGRESS_EVENT,
DownloadProgress {
label: label.to_string(),
current,
total,
done,
},
);
}
pub fn clone_space(
server_url: &str,
token: &str,
app: &tauri::AppHandle,
store: &Store,
project: &str,
project_dir: &Path,
@@ -509,14 +539,19 @@ pub fn clone_space(
meta.entrypoint = manifest.entrypoint.clone();
let mut report = SyncReport::default();
let total = manifest.files.len();
for (index, entry) in manifest.files.iter().enumerate() {
report_progress(app, project, index, total, false);
for entry in &manifest.files {
let remote = pull_file(server_url, token, space_id, &entry.path)?;
write_local(project_dir, &entry.path, &remote.bytes()?)?;
meta.base_hashes.insert(entry.path.clone(), remote.hash);
report.pulled.push(entry.path.clone());
}
report_progress(app, project, total, total, true);
meta.last_synced_at = Some(chrono::Utc::now().to_rfc3339());
store.save_meta(project, &meta)?;
save_base_snapshots(store, project, project_dir, &meta)?;
@@ -652,8 +687,6 @@ pub fn pull_document(
.map_err(|e| e.to_string())
}
/// Syncs one downloaded cloud document. The merge base is the copy stored when
/// the document was last exchanged with the server.
pub fn sync_document(
server_url: &str,
token: &str,
@@ -788,7 +821,6 @@ pub fn sync_document(
Ok(report)
}
/// Applies a resolved cloud document and uploads it.
pub fn resolve_document_conflict(
server_url: &str,
token: &str,