Native iCloud apps for Windows and Linux, built in Rust. Notes, Reminders, Calendar, Contacts, Drive and Photos, offline and in sync with your iPhone.
Rust apple-notesapple-reminderscloudkitcrdtdesktop-appicloudicloud-calendaricloud-driveicloud-notesicloud-photosiphonelinuxlinux-desktoplocal-firstoffline-firstprivacyrusttauritauri-appwindows
Drive: a file refused as busy while it goes up is sent again
Yashwanth Kamireddi634fca64abc7
diff --git a/crates/quince-icloud/src/drive.rs b/crates/quince-icloud/src/drive.rsindex a0c9117..59d5b30 100644--- a/crates/quince-icloud/src/drive.rs+++ b/crates/quince-icloud/src/drive.rs@@ -1190,6 +1190,42 @@ pub async fn upload(folder_id: &str,path: &std::path::Path,progress: Progress,+) -> Result<DriveItem> {+ // A busy Drive at any step is met again from the start — a new slot, the bytes again —+ // so a file half sent is never filed, and a moment's overload costs nothing.+ let mut attempt = 0;+ loop {+ attempt += 1;+ let result = upload_once(+ http,+ docws_root,+ drivews_root,+ params.clone(),+ folder_id,+ path,+ progress.clone(),+ )+ .await;+ match result {+ Err(Error::Refused(ref m)) if m == BUSY && attempt < 3 => {+ tokio::time::sleep(std::time::Duration::from_secs(3 * attempt)).await;+ }+ other => return other,+ }+ }+}++/// What a busy Drive is said to be, in one place so a retry can know it.+const BUSY: &str = "iCloud Drive is busy right now — try this one again in a minute.";++async fn upload_once(+ http: &reqwest::Client,+ docws_root: &str,+ drivews_root: &str,+ params: Vec<(String, String)>,+ folder_id: &str,+ path: &std::path::Path,+ progress: Progress,) -> Result<DriveItem> {use tokio::io::AsyncReadExt;@@ -1280,6 +1316,9 @@ pub async fn upload(.await?;let status = response.status();let text = response.text().await.unwrap_or_default();+ if matches!(status.as_u16(), 429 | 500..=599) {+ return Err(Error::Refused(BUSY.into()));+ }if !status.is_success() {return Err(Error::Protocol(format!("Apple would not take the file ({status}): {}",@@ -1570,6 +1609,50 @@ mod app_library_tests {std::fs::remove_file(&file).ok();}+ /// A busy Drive while the bytes go up: the file is tried again from a fresh slot, up to+ /// three times, and only then reported busy — not dropped at the first refusal.+ #[tokio::test]+ async fn a_file_refused_as_busy_is_sent_again() {+ use wiremock::matchers::{method, path_regex};+ use wiremock::{Mock, MockServer, ResponseTemplate};+ let server = MockServer::start().await;+ Mock::given(method("POST"))+ .and(path_regex(r".*/upload/web$"))+ .respond_with(ResponseTemplate::new(200).set_body_json(serde_json::json!([+ { "url": format!("{}/content", server.uri()), "document_id": "D1" }+ ])))+ .mount(&server)+ .await;+ Mock::given(method("POST"))+ .and(path_regex(r".*/content$"))+ .respond_with(ResponseTemplate::new(503))+ .mount(&server)+ .await;+ let file = std::env::temp_dir().join("quince-busy-test.txt");+ std::fs::write(&file, b"hello").unwrap();+ let err = upload(+ &reqwest::Client::new(),+ &server.uri(),+ &server.uri(),+ vec![],+ "FOLDER::com.apple.CloudDocs::root",+ &file,+ std::sync::Arc::new(|_, _| {}),+ )+ .await+ .unwrap_err();+ let slots = server+ .received_requests()+ .await+ .unwrap()+ .iter()+ .filter(|r| r.url.path().ends_with("/upload/web"))+ .count();+ assert_eq!(slots, 3, "three tries, each from a fresh slot");+ assert_eq!(err.to_string(), BUSY);+ std::fs::remove_file(&file).ok();+ }+/// The documents zone is everything else, and must still take a file.#[tokio::test]async fn the_ordinary_drive_is_not_refused() {