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
rustfmt
Yashwanth Kamireddidecc4c1c1a71
diff --git a/crates/quince-icloud/src/notes.rs b/crates/quince-icloud/src/notes.rsindex 6a3c7c9..068f856 100644--- a/crates/quince-icloud/src/notes.rs+++ b/crates/quince-icloud/src/notes.rs@@ -1003,9 +1003,21 @@ pub async fn delete_folder_cloudkit(// existed. Without a fresh answer nothing is deleted.let client = ZoneClient::new(http, ckdatabasews_root, CONTAINER, params.clone());let walk = client.all_records(ZONE, None).await?;- let fresh_folders: Vec<NoteFolder> = walk.records.iter().filter(|r| r["recordType"] == "Folder").filter_map(folder_from_record).collect();- let fresh_notes: Vec<Note> = walk.records.iter().filter(|r| r["recordType"] == "Note").filter_map(note_from_record).collect();- let (all, notes) = if walk.complete { (&fresh_folders[..], &fresh_notes[..]) } else {+ let fresh_folders: Vec<NoteFolder> = walk+ .records+ .iter()+ .filter(|r| r["recordType"] == "Folder")+ .filter_map(folder_from_record)+ .collect();+ let fresh_notes: Vec<Note> = walk+ .records+ .iter()+ .filter(|r| r["recordType"] == "Note")+ .filter_map(note_from_record)+ .collect();+ let (all, notes) = if walk.complete {+ (&fresh_folders[..], &fresh_notes[..])+ } else {return Err(Error::Refused("Couldn't read all of this folder from iCloud just now, so nothing was deleted — try again.".into()));};let _ = (all_known, notes_known);diff --git a/probe/examples/drive_cleanup_tests.rs b/probe/examples/drive_cleanup_tests.rsindex cae3c75..64261d2 100644--- a/probe/examples/drive_cleanup_tests.rs+++ b/probe/examples/drive_cleanup_tests.rs@@ -10,16 +10,34 @@ async fn main() -> Result<()> {if !client.resume().await? {return Err(anyhow!("no session"));}- let dws = client.session().service_url("drivews").ok_or_else(|| anyhow!("no drivews"))?;+ let dws = client+ .session()+ .service_url("drivews")+ .ok_or_else(|| anyhow!("no drivews"))?;let (http, p) = (client.http().clone(), client.service_params());let mut lib = quince_core::Library::in_memory()?;drive::sync_folder(&http, &dws, p.clone(), &mut lib, ROOT).await?;- let left: Vec<_> = lib.drive_children(ROOT)?.into_iter()- .filter(|i| i.is_container() && i.name.starts_with("Quince ") && i.name.ends_with(" test")).collect();- println!("left behind: {:?}", left.iter().map(|i| &i.name).collect::<Vec<_>>());- for f in &left { drive::delete(&http, &dws, p.clone(), f).await?; }+ let left: Vec<_> = lib+ .drive_children(ROOT)?+ .into_iter()+ .filter(|i| i.is_container() && i.name.starts_with("Quince ") && i.name.ends_with(" test"))+ .collect();+ println!(+ "left behind: {:?}",+ left.iter().map(|i| &i.name).collect::<Vec<_>>()+ );+ for f in &left {+ drive::delete(&http, &dws, p.clone(), f).await?;+ }let ids: Vec<_> = left.iter().map(|i| i.drivewsid.clone()).collect();- let t: Vec<_> = drive::trash(&http, &dws, p.clone()).await?.into_iter().filter(|i| ids.contains(&i.drivewsid)).collect();- println!("purged, refused: {:?}", drive::delete_forever_many(&http, &dws, p.clone(), &t).await?);+ let t: Vec<_> = drive::trash(&http, &dws, p.clone())+ .await?+ .into_iter()+ .filter(|i| ids.contains(&i.drivewsid))+ .collect();+ println!(+ "purged, refused: {:?}",+ drive::delete_forever_many(&http, &dws, p.clone(), &t).await?+ );Ok(())}diff --git a/probe/examples/notes_folder_delete_stale.rs b/probe/examples/notes_folder_delete_stale.rsindex 92e5b84..7737719 100644--- a/probe/examples/notes_folder_delete_stale.rs+++ b/probe/examples/notes_folder_delete_stale.rs@@ -10,15 +10,35 @@ async fn main() -> Result<()> {if !client.resume().await? {return Err(anyhow!("no session"));}- let root = client.session().service_url("ckdatabasews").ok_or_else(|| anyhow!("no ck"))?;+ let root = client+ .session()+ .service_url("ckdatabasews")+ .ok_or_else(|| anyhow!("no ck"))?;let (http, p) = (client.http().clone(), client.service_params());- let folder = notes::create_folder_cloudkit(&http, &root, p.clone(), "Quince folder delete test", None).await?;- let note = notes::create_cloudkit(&http, &root, p.clone(), Some(&folder), "Quince folder delete test note\nsafe to delete", None).await?;+ let folder =+ notes::create_folder_cloudkit(&http, &root, p.clone(), "Quince folder delete test", None)+ .await?;+ let note = notes::create_cloudkit(+ &http,+ &root,+ p.clone(),+ Some(&folder),+ "Quince folder delete test note\nsafe to delete",+ None,+ )+ .await?;// As a screen that has not yet seen the note, nor the folder's contents.notes::delete_folder_cloudkit(&http, &root, p.clone(), &[], &[], &folder).await?;let zc = quince_icloud::cloudkit::ZoneClient::new(&http, &root, "com.apple.notes", p.clone());let n = zc.lookup_record("Notes", ¬e).await?;let f = zc.lookup_record("Notes", &folder).await?;- println!("note's folder now: {:?}; folder still there: {}", n.as_ref().and_then(|r| r["fields"]["Folder"]["value"]["recordName"].as_str().map(str::to_string)), f.is_some());+ println!(+ "note's folder now: {:?}; folder still there: {}",+ n.as_ref()+ .and_then(|r| r["fields"]["Folder"]["value"]["recordName"]+ .as_str()+ .map(str::to_string)),+ f.is_some()+ );Ok(())}