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
Probes: read Photos from the library's discovered zone
Yashwanth Kamireddi738e88c91c01
diff --git a/probe/examples/photos_albums_roundtrip.rs b/probe/examples/photos_albums_roundtrip.rsindex 3307d4b..5be8972 100644--- a/probe/examples/photos_albums_roundtrip.rs+++ b/probe/examples/photos_albums_roundtrip.rs@@ -3,7 +3,7 @@//! step read back from Apple. The photos themselves are never touched.use anyhow::{anyhow, Result};use base64::Engine;-use quince_icloud::photos::{self, CONTAINER, ZONE};+use quince_icloud::photos::{self, CONTAINER};#[tokio::main]async fn main() -> Result<()> {@@ -22,6 +22,7 @@ async fn main() -> Result<()> {.ok_or_else(|| anyhow!("no ck"))?;let (http, p) = (client.http().clone(), client.service_params());let zc = quince_icloud::cloudkit::ZoneClient::new(&http, &ck, CONTAINER, p.clone());+ let zone = quince_icloud::photos::library_zone(&zc).await;let name_of = |r: &serde_json::Value| {r.pointer("/fields/albumNameEnc/value").and_then(|v| v.as_str())@@ -40,7 +41,7 @@ async fn main() -> Result<()> {).await?;let made = zc- .lookup_record(ZONE, &album.id)+ .lookup_record(&zone, &album.id).await?.ok_or_else(|| anyhow!("album not there"))?;println!(@@ -55,7 +56,7 @@ async fn main() -> Result<()> {println!("added {added:?}");for a in &assets {let r = zc- .lookup_record(ZONE, &format!("{a}-IN-{}", album.id))+ .lookup_record(&zone, &format!("{a}-IN-{}", album.id)).await?;println!(" relation {a}: {}",@@ -65,7 +66,7 @@ async fn main() -> Result<()> {photos::remove_from_album(&http, &ck, p.clone(), &album.id, &assets[..1]).await?;let gone = zc- .lookup_record(ZONE, &format!("{}-IN-{}", assets[0], album.id))+ .lookup_record(&zone, &format!("{}-IN-{}", assets[0], album.id)).await?;println!("removed first: relation now {}",@@ -75,7 +76,7 @@ async fn main() -> Result<()> {"STILL THERE"});- let photo = zc.lookup_record(ZONE, &assets[0]).await?;+ let photo = zc.lookup_record(&zone, &assets[0]).await?;println!(" the photo itself: {}",photo.map_or("MISSING".into(), |r| format!(@@ -94,20 +95,20 @@ async fn main() -> Result<()> {).await?;let renamed = zc- .lookup_record(ZONE, &album.id)+ .lookup_record(&zone, &album.id).await?.ok_or_else(|| anyhow!("album gone"))?;println!("renamed: {:?}", name_of(&renamed));photos::delete_album(&http, &ck, p.clone(), &album.id, tag.as_deref()).await?;- let deleted = zc.lookup_record(ZONE, &album.id).await?;+ let deleted = zc.lookup_record(&zone, &album.id).await?;println!("deleted: isDeleted={:?}",deleted.and_then(|r| r.pointer("/fields/isDeleted/value").cloned()));// What the album's one remaining photo relation becomes once the album is deleted.let left = zc- .lookup_record(ZONE, &format!("{}-IN-{}", assets[1], album.id))+ .lookup_record(&zone, &format!("{}-IN-{}", assets[1], album.id)).await?;println!(" remaining relation after delete: {}",diff --git a/probe/examples/photos_date_roundtrip.rs b/probe/examples/photos_date_roundtrip.rsindex 9007be1..05164c7 100644--- a/probe/examples/photos_date_roundtrip.rs+++ b/probe/examples/photos_date_roundtrip.rs@@ -1,7 +1,7 @@//! Live, on a wallpaper he named as a throwaway: its date moved a day later through Quince's own//! set_date, read back from Apple, then put back exactly as it was.use anyhow::{anyhow, Result};-use quince_icloud::photos::{self, CONTAINER, ZONE};+use quince_icloud::photos::{self, CONTAINER};#[tokio::main]async fn main() -> Result<()> {@@ -17,19 +17,20 @@ async fn main() -> Result<()> {.ok_or_else(|| anyhow!("no ck"))?;let (http, p) = (client.http().clone(), client.service_params());let zc = quince_icloud::cloudkit::ZoneClient::new(&http, &ck, CONTAINER, p.clone());+ let zone = quince_icloud::photos::library_zone(&zc).await;let date = |r: &serde_json::Value| {r.pointer("/fields/assetDate/value").and_then(|v| v.as_i64())};let before = zc- .lookup_record(ZONE, &asset)+ .lookup_record(&zone, &asset).await?.ok_or_else(|| anyhow!("gone"))?;let was = date(&before).ok_or_else(|| anyhow!("no date"))?;println!("before: {was}");let tag = before.get("recordChangeTag").and_then(|t| t.as_str());photos::set_date(&http, &ck, p.clone(), &asset, tag, was + 86_400_000).await?;- let now = zc.lookup_record(ZONE, &asset).await?.unwrap();+ let now = zc.lookup_record(&zone, &asset).await?.unwrap();println!("moved: {:?} (a day later: {})",date(&now),@@ -37,7 +38,7 @@ async fn main() -> Result<()> {);let tag = now.get("recordChangeTag").and_then(|t| t.as_str());photos::set_date(&http, &ck, p.clone(), &asset, tag, was).await?;- let back = zc.lookup_record(ZONE, &asset).await?.unwrap();+ let back = zc.lookup_record(&zone, &asset).await?.unwrap();println!("back: {:?} (as it was: {})",date(&back),diff --git a/probe/examples/photos_download_choice.rs b/probe/examples/photos_download_choice.rsindex 1d4244b..25ded8e 100644--- a/probe/examples/photos_download_choice.rs+++ b/probe/examples/photos_download_choice.rs@@ -1,7 +1,7 @@//! Live, read-only: for each of icloud.com's Download Options, the file Quince picks for a photo//! and a video, downloaded to a folder named on the command line and checked by its first bytes.use anyhow::{anyhow, Result};-use quince_icloud::photos::{download_choice, Want, CONTAINER, ZONE};+use quince_icloud::photos::{download_choice, Want, CONTAINER};#[tokio::main]async fn main() -> Result<()> {@@ -19,9 +19,10 @@ async fn main() -> Result<()> {let http = client.http().clone();let zc =quince_icloud::cloudkit::ZoneClient::new(&http, &ck, CONTAINER, client.service_params());+ let zone = quince_icloud::photos::library_zone(&zc).await;for id in args {let asset = zc- .lookup_record(ZONE, &id)+ .lookup_record(&zone, &id).await?.ok_or_else(|| anyhow!("gone"))?;let m = asset@@ -29,7 +30,7 @@ async fn main() -> Result<()> {.and_then(|v| v.as_str()).ok_or_else(|| anyhow!("no master"))?;let master = zc- .lookup_record(ZONE, m)+ .lookup_record(&zone, m).await?.ok_or_else(|| anyhow!("no master"))?;let video = masterdiff --git a/probe/examples/photos_expunge.rs b/probe/examples/photos_expunge.rsindex 1b6269a..9c1f3bc 100644--- a/probe/examples/photos_expunge.rs+++ b/probe/examples/photos_expunge.rs@@ -3,7 +3,7 @@//! quince-upload-test.jpg, and reads each back from Apple after.use anyhow::{anyhow, Result};use base64::Engine;-use quince_icloud::photos::{self, Flag, CONTAINER, ZONE};+use quince_icloud::photos::{self, Flag, CONTAINER};#[tokio::main]async fn main() -> Result<()> {@@ -18,16 +18,17 @@ async fn main() -> Result<()> {.ok_or_else(|| anyhow!("no ck"))?;let (http, p) = (client.http().clone(), client.service_params());let zc = quince_icloud::cloudkit::ZoneClient::new(&http, &ck, CONTAINER, p.clone());+ let zone = quince_icloud::photos::library_zone(&zc).await;for asset in std::env::args().skip(1) {let a = zc- .lookup_record(ZONE, &asset)+ .lookup_record(&zone, &asset).await?.ok_or_else(|| anyhow!("{asset}: gone"))?;let master = a.pointer("/fields/masterRef/value/recordName").and_then(|v| v.as_str()).unwrap_or_default();- let m = zc.lookup_record(ZONE, master).await?;+ let m = zc.lookup_record(&zone, master).await?;let name = m.as_ref().and_then(|m| {@@ -47,7 +48,7 @@ async fn main() -> Result<()> {}let tag = a.get("recordChangeTag").and_then(|t| t.as_str());photos::set_flag(&http, &ck, p.clone(), &asset, tag, Flag::Expunged, true).await?;- let after = zc.lookup_record(ZONE, &asset).await?;+ let after = zc.lookup_record(&zone, &asset).await?;println!("{asset} ({name}): after = {}",after.map_or("record gone".into(), |r| format!(diff --git a/probe/examples/photos_fetch_to_file.rs b/probe/examples/photos_fetch_to_file.rsindex 84d8d17..2f0f1fd 100644--- a/probe/examples/photos_fetch_to_file.rs+++ b/probe/examples/photos_fetch_to_file.rs@@ -1,7 +1,7 @@//! Live, read-only: a photo's whole picture fetched to a file in a folder named on the command//! line with Quince's own fetch_to_file, and compared with the same link fetched directly.use anyhow::{anyhow, Result};-use quince_icloud::photos::{fetch_to_file, links_of, CONTAINER, ZONE};+use quince_icloud::photos::{fetch_to_file, links_of, CONTAINER};#[tokio::main]async fn main() -> Result<()> {@@ -20,8 +20,9 @@ async fn main() -> Result<()> {let http = client.http().clone();let zc =quince_icloud::cloudkit::ZoneClient::new(&http, &ck, CONTAINER, client.service_params());+ let zone = quince_icloud::photos::library_zone(&zc).await;let a = zc- .lookup_record(ZONE, &id)+ .lookup_record(&zone, &id).await?.ok_or_else(|| anyhow!("gone"))?;let m = a@@ -29,7 +30,7 @@ async fn main() -> Result<()> {.and_then(|v| v.as_str()).ok_or_else(|| anyhow!("no master"))?;let master = zc- .lookup_record(ZONE, m)+ .lookup_record(&zone, m).await?.ok_or_else(|| anyhow!("no master"))?;let url = links_of(&master).full.ok_or_else(|| anyhow!("no full"))?;diff --git a/probe/examples/photos_flags_batch_live.rs b/probe/examples/photos_flags_batch_live.rsindex 98ef2bd..3c83964 100644--- a/probe/examples/photos_flags_batch_live.rs+++ b/probe/examples/photos_flags_batch_live.rs@@ -36,10 +36,19 @@ async fn main() -> Result<()> {let now = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH)?.as_millis() as i64;+ let library =+ quince_icloud::photos::library_zone(&quince_icloud::cloudkit::ZoneClient::new(+ &http,+ &root,+ quince_icloud::photos::CONTAINER,+ p.clone(),+ ))+ .await;match quince_icloud::photos_upload::upload(&http,&up,&dsid,+ &library,f,&name,now,diff --git a/probe/examples/photos_folder_add_live.rs b/probe/examples/photos_folder_add_live.rsindex 26bc2cf..ba89307 100644--- a/probe/examples/photos_folder_add_live.rs+++ b/probe/examples/photos_folder_add_live.rs@@ -10,7 +10,7 @@//! The file must be named quince-upload-test.jpg (photos_expunge deletes it for good after).use anyhow::{anyhow, Result};use quince_core::drive::DriveItem;-use quince_icloud::photos::{Flag, CONTAINER, ZONE};+use quince_icloud::photos::{Flag, CONTAINER};use quince_vfs::{fuse, Cache, Fut, Remote, Store, ROOT};use std::collections::HashMap;use std::sync::{Arc, Mutex};@@ -80,10 +80,19 @@ impl Remote for Photos {Box::pin(async move {let name = path.file_name().unwrap().to_string_lossy().into_owned();let c = &me.ctx;+ let library =+ quince_icloud::photos::library_zone(&quince_icloud::cloudkit::ZoneClient::new(+ &c.http,+ &c.ck,+ quince_icloud::photos::CONTAINER,+ c.params.clone(),+ ))+ .await;let outcome = quince_icloud::photos_upload::upload(&c.http,&c.up,&c.dsid,+ &library,&path,&name,1_792_521_600_000,@@ -126,8 +135,9 @@ impl Remote for Photos {CONTAINER,c.params.clone(),);+ let zone = quince_icloud::photos::library_zone(&zc).await;let rec = zc- .lookup_record(ZONE, &asset)+ .lookup_record(&zone, &asset).await.map_err(|e| e.to_string())?.ok_or("gone")?;@@ -219,9 +229,10 @@ fn main() -> Result<()> {let asset = asset.ok_or_else(|| anyhow!("never sent"))?;let found = rt.block_on(async {let c = &photos.ctx;- quince_icloud::cloudkit::ZoneClient::new(&c.http, &c.ck, CONTAINER, c.params.clone())- .lookup_record(ZONE, &asset)- .await+ let zc =+ quince_icloud::cloudkit::ZoneClient::new(&c.http, &c.ck, CONTAINER, c.params.clone());+ let zone = quince_icloud::photos::library_zone(&zc).await;+ zc.lookup_record(&zone, &asset).await})?;println!("{} in iCloud Photos",@@ -253,9 +264,10 @@ fn main() -> Result<()> {std::fs::remove_file(&target)?;let after = rt.block_on(async {let c = &photos.ctx;- quince_icloud::cloudkit::ZoneClient::new(&c.http, &c.ck, CONTAINER, c.params.clone())- .lookup_record(ZONE, &asset)- .await+ let zc =+ quince_icloud::cloudkit::ZoneClient::new(&c.http, &c.ck, CONTAINER, c.params.clone());+ let zone = quince_icloud::photos::library_zone(&zc).await;+ zc.lookup_record(&zone, &asset).await})?;let deleted = after.as_ref()diff --git a/probe/examples/photos_folder_roundtrip.rs b/probe/examples/photos_folder_roundtrip.rsindex ee53a52..e09c819 100644--- a/probe/examples/photos_folder_roundtrip.rs+++ b/probe/examples/photos_folder_roundtrip.rs@@ -4,7 +4,7 @@//! read back. Whatever is left is deleted. No photo is touched.use anyhow::{anyhow, Result};use base64::Engine;-use quince_icloud::photos::{self, CONTAINER, ZONE};+use quince_icloud::photos::{self, CONTAINER};#[tokio::main]async fn main() -> Result<()> {@@ -19,6 +19,7 @@ async fn main() -> Result<()> {.ok_or_else(|| anyhow!("no ck"))?;let (http, p) = (client.http().clone(), client.service_params());let zc = quince_icloud::cloudkit::ZoneClient::new(&http, &ck, CONTAINER, p.clone());+ let zone = quince_icloud::photos::library_zone(&zc).await;let show = |r: &serde_json::Value| {let name = r.pointer("/fields/albumNameEnc/value")@@ -44,7 +45,7 @@ async fn main() -> Result<()> {.await?;println!("folder: {}",- show(&zc.lookup_record(ZONE, &folder.id).await?.unwrap())+ show(&zc.lookup_record(&zone, &folder.id).await?.unwrap()));let inner = photos::create_album(&http,@@ -58,7 +59,7 @@ async fn main() -> Result<()> {.await?;println!("inner: {}",- show(&zc.lookup_record(ZONE, &inner.id).await?.unwrap())+ show(&zc.lookup_record(&zone, &inner.id).await?.unwrap()));let tag = photos::rename_album(&http,@@ -71,14 +72,14 @@ async fn main() -> Result<()> {.await?;println!("renamed: {}",- show(&zc.lookup_record(ZONE, &folder.id).await?.unwrap())+ show(&zc.lookup_record(&zone, &folder.id).await?.unwrap()));photos::delete_album(&http, &ck, p.clone(), &folder.id, tag.as_deref()).await?;println!("folder after delete: {}",- show(&zc.lookup_record(ZONE, &folder.id).await?.unwrap())+ show(&zc.lookup_record(&zone, &folder.id).await?.unwrap()));- let inner_now = zc.lookup_record(ZONE, &inner.id).await?.unwrap();+ let inner_now = zc.lookup_record(&zone, &inner.id).await?.unwrap();println!("inner after the folder's delete: {}", show(&inner_now));if inner_now.pointer("/fields/isDeleted/value")@@ -89,7 +90,7 @@ async fn main() -> Result<()> {photos::delete_album(&http, &ck, p.clone(), &inner.id, t).await?;println!("inner deleted too: {}",- show(&zc.lookup_record(ZONE, &inner.id).await?.unwrap())+ show(&zc.lookup_record(&zone, &inner.id).await?.unwrap()));}Ok(())diff --git a/probe/examples/photos_full_link.rs b/probe/examples/photos_full_link.rsindex f99faeb..9cb554d 100644--- a/probe/examples/photos_full_link.rs+++ b/probe/examples/photos_full_link.rs@@ -1,7 +1,7 @@//! Live, read-only: which renditions a photo's master offers, and that the "full" one Quince//! picks for zooming downloads as a displayable image.use anyhow::{anyhow, Result};-use quince_icloud::photos::{links_of, CONTAINER, ZONE};+use quince_icloud::photos::{links_of, CONTAINER};#[tokio::main]async fn main() -> Result<()> {@@ -17,8 +17,9 @@ async fn main() -> Result<()> {.ok_or_else(|| anyhow!("no ck"))?;let (http, p) = (client.http().clone(), client.service_params());let zc = quince_icloud::cloudkit::ZoneClient::new(&http, &ck, CONTAINER, p);+ let zone = quince_icloud::photos::library_zone(&zc).await;let a = zc- .lookup_record(ZONE, &asset)+ .lookup_record(&zone, &asset).await?.ok_or_else(|| anyhow!("no asset"))?;let master = a@@ -26,7 +27,7 @@ async fn main() -> Result<()> {.and_then(|v| v.as_str()).ok_or_else(|| anyhow!("no master"))?;let m = zc- .lookup_record(ZONE, master)+ .lookup_record(&zone, master).await?.ok_or_else(|| anyhow!("no master record"))?;let mut keys: Vec<_> = m["fields"]diff --git a/probe/examples/photos_heavy_roundtrip.rs b/probe/examples/photos_heavy_roundtrip.rsindex 661eadc..e56f093 100644--- a/probe/examples/photos_heavy_roundtrip.rs+++ b/probe/examples/photos_heavy_roundtrip.rs@@ -2,7 +2,7 @@//! through Quince's own uploader, its original downloaded back from Apple and compared byte for//! byte by SHA-256, then deleted for good. Proves a heavy upload arrives whole.use anyhow::{anyhow, Result};-use quince_icloud::photos::{download_choice, set_flag, Flag, Want, CONTAINER, ZONE};+use quince_icloud::photos::{download_choice, set_flag, Flag, Want, CONTAINER};use quince_icloud::photos_upload::{Outcome, Stage};use sha2::{Digest, Sha256};@@ -55,10 +55,18 @@ async fn main() -> Result<()> {let modified = std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH)?.as_millis() as i64;+ let library = quince_icloud::photos::library_zone(&quince_icloud::cloudkit::ZoneClient::new(+ &http,+ &ck,+ quince_icloud::photos::CONTAINER,+ p.clone(),+ ))+ .await;let outcome = quince_icloud::photos_upload::upload(&http,&up,&dsid,+ &library,&path,&name,modified,@@ -72,12 +80,13 @@ async fn main() -> Result<()> {return Err(anyhow!("not uploaded: {outcome:?}"));};let zc = quince_icloud::cloudkit::ZoneClient::new(&http, &ck, CONTAINER, p.clone());+ let zone = quince_icloud::photos::library_zone(&zc).await;let asset = zc- .lookup_record(ZONE, &u.asset)+ .lookup_record(&zone, &u.asset).await?.ok_or_else(|| anyhow!("asset missing"))?;let master = zc- .lookup_record(ZONE, &u.master)+ .lookup_record(&zone, &u.master).await?.ok_or_else(|| anyhow!("master missing"))?;let (url, back_name) = download_choice(&asset, &master, Want::Originals, true)@@ -106,7 +115,7 @@ async fn main() -> Result<()> {.get("recordChangeTag").and_then(|x| x.as_str()).map(str::to_string);- let now = zc.lookup_record(ZONE, &u.asset).await?.unwrap();+ let now = zc.lookup_record(&zone, &u.asset).await?.unwrap();let tag = tag.or_else(|| {now.get("recordChangeTag").and_then(|x| x.as_str())@@ -122,7 +131,7 @@ async fn main() -> Result<()> {true,).await?;- let gone = zc.lookup_record(ZONE, &u.asset).await?;+ let gone = zc.lookup_record(&zone, &u.asset).await?;println!("deleted for good: {:?}",gone.and_then(|r| r.pointer("/fields/isExpunged/value").cloned())diff --git a/probe/examples/photos_hide_roundtrip.rs b/probe/examples/photos_hide_roundtrip.rsindex ac4d922..d0863c8 100644--- a/probe/examples/photos_hide_roundtrip.rs+++ b/probe/examples/photos_hide_roundtrip.rs@@ -1,7 +1,7 @@//! Live, on a wallpaper he named as a throwaway: Hide then Unhide through Quince's own//! set_flag, each read back from Apple. Leaves the photo as it was.use anyhow::{anyhow, Result};-use quince_icloud::photos::{self, Flag, CONTAINER, ZONE};+use quince_icloud::photos::{self, Flag, CONTAINER};#[tokio::main]async fn main() -> Result<()> {@@ -17,9 +17,10 @@ async fn main() -> Result<()> {.ok_or_else(|| anyhow!("no ck"))?;let (http, p) = (client.http().clone(), client.service_params());let zc = quince_icloud::cloudkit::ZoneClient::new(&http, &ck, CONTAINER, p.clone());+ let zone = quince_icloud::photos::library_zone(&zc).await;let hidden = |r: &serde_json::Value| r.pointer("/fields/isHidden/value").cloned();let before = zc- .lookup_record(ZONE, &asset)+ .lookup_record(&zone, &asset).await?.ok_or_else(|| anyhow!("no such photo"))?;println!("before: isHidden={:?}", hidden(&before));@@ -37,7 +38,7 @@ async fn main() -> Result<()> {true,).await?;- let now = zc.lookup_record(ZONE, &asset).await?.unwrap();+ let now = zc.lookup_record(&zone, &asset).await?.unwrap();println!("hidden: isHidden={:?}", hidden(&now));let tag = after.get("recordChangeTag")@@ -58,7 +59,7 @@ async fn main() -> Result<()> {false,).await?;- let back = zc.lookup_record(ZONE, &asset).await?.unwrap();+ let back = zc.lookup_record(&zone, &asset).await?.unwrap();println!("unhidden: isHidden={:?}", hidden(&back));Ok(())}diff --git a/probe/examples/photos_keywords_roundtrip.rs b/probe/examples/photos_keywords_roundtrip.rsindex 1624848..db7e533 100644--- a/probe/examples/photos_keywords_roundtrip.rs+++ b/probe/examples/photos_keywords_roundtrip.rs@@ -3,7 +3,7 @@//! writes for ["loupe"] is byte for byte the one Apple wrote on his photo.use anyhow::{anyhow, Result};use base64::Engine;-use quince_icloud::photos::{self, CONTAINER, ZONE};+use quince_icloud::photos::{self, CONTAINER};#[tokio::main]async fn main() -> Result<()> {@@ -29,21 +29,22 @@ async fn main() -> Result<()> {.ok_or_else(|| anyhow!("no ck"))?;let (http, p) = (client.http().clone(), client.service_params());let zc = quince_icloud::cloudkit::ZoneClient::new(&http, &ck, CONTAINER, p.clone());+ let zone = quince_icloud::photos::library_zone(&zc).await;let words = |r: &serde_json::Value| -> Option<plist::Value> {let v = r.pointer("/fields/keywordsEnc/value")?.as_str()?;plist::from_bytes(&base64::engine::general_purpose::STANDARD.decode(v).ok()?).ok()};let before = zc- .lookup_record(ZONE, &asset)+ .lookup_record(&zone, &asset).await?.ok_or_else(|| anyhow!("gone"))?;println!("before: {:?}", words(&before));let wanted: Vec<String> = vec!["spring".into(), "quince test ✿".into()];photos::set_keywords(&http, &ck, p.clone(), &asset, &[], &wanted).await?;- let now = zc.lookup_record(ZONE, &asset).await?.unwrap();+ let now = zc.lookup_record(&zone, &asset).await?.unwrap();println!("set: {:?}", words(&now));photos::set_keywords(&http, &ck, p.clone(), &asset, &wanted, &[]).await?;- let back = zc.lookup_record(ZONE, &asset).await?.unwrap();+ let back = zc.lookup_record(&zone, &asset).await?.unwrap();println!("clear: {:?}", words(&back));Ok(())}diff --git a/probe/examples/photos_live_size.rs b/probe/examples/photos_live_size.rsindex bf2971d..d350348 100644--- a/probe/examples/photos_live_size.rs+++ b/probe/examples/photos_live_size.rs@@ -2,7 +2,7 @@//! advertises (`resOriginalVidComplFileSize`) — what the Photos folder lists the .MOV at — and//! is a QuickTime file. Takes asset ids; prints only sizes and the file's first box.use anyhow::{anyhow, Result};-use quince_icloud::photos::{links_of, CONTAINER, ZONE};+use quince_icloud::photos::{links_of, CONTAINER};#[tokio::main]async fn main() -> Result<()> {@@ -17,9 +17,10 @@ async fn main() -> Result<()> {.ok_or_else(|| anyhow!("no ck"))?;let (http, p) = (client.http().clone(), client.service_params());let zc = quince_icloud::cloudkit::ZoneClient::new(&http, &ck, CONTAINER, p);+ let zone = quince_icloud::photos::library_zone(&zc).await;for (n, asset) in std::env::args().skip(1).enumerate() {let a = zc- .lookup_record(ZONE, &asset)+ .lookup_record(&zone, &asset).await?.ok_or_else(|| anyhow!("no asset"))?;let master = a@@ -27,7 +28,7 @@ async fn main() -> Result<()> {.and_then(|v| v.as_str()).ok_or_else(|| anyhow!("no master"))?;let m = zc- .lookup_record(ZONE, master)+ .lookup_record(&zone, master).await?.ok_or_else(|| anyhow!("no master record"))?;let said = mdiff --git a/probe/examples/photos_peek.rs b/probe/examples/photos_peek.rsindex 5907b5c..981c14a 100644--- a/probe/examples/photos_peek.rs+++ b/probe/examples/photos_peek.rs@@ -18,8 +18,9 @@ async fn main() -> Result<()> {quince_icloud::photos::CONTAINER,client.service_params(),);+ let zone = quince_icloud::photos::library_zone(&zc).await;let r = zc- .lookup_record(quince_icloud::photos::ZONE, &asset)+ .lookup_record(&zone, &asset).await?.ok_or_else(|| anyhow!("gone"))?;for (k, v) in r["fields"].as_object().unwrap() {diff --git a/probe/examples/photos_rating_roundtrip.rs b/probe/examples/photos_rating_roundtrip.rsindex 26ef92c..9de4b1c 100644--- a/probe/examples/photos_rating_roundtrip.rs+++ b/probe/examples/photos_rating_roundtrip.rs@@ -1,7 +1,7 @@//! Live, on a wallpaper he named as a throwaway: a star rating set through Quince's own//! set_rating, read back from Apple, then cleared. Leaves the photo as it was.use anyhow::{anyhow, Result};-use quince_icloud::photos::{self, CONTAINER, ZONE};+use quince_icloud::photos::{self, CONTAINER};#[tokio::main]async fn main() -> Result<()> {@@ -17,19 +17,20 @@ async fn main() -> Result<()> {.ok_or_else(|| anyhow!("no ck"))?;let (http, p) = (client.http().clone(), client.service_params());let zc = quince_icloud::cloudkit::ZoneClient::new(&http, &ck, CONTAINER, p.clone());+ let zone = quince_icloud::photos::library_zone(&zc).await;let rating = |r: &serde_json::Value| r.pointer("/fields/rating/value").cloned();let before = zc- .lookup_record(ZONE, &asset)+ .lookup_record(&zone, &asset).await?.ok_or_else(|| anyhow!("gone"))?;println!("before: {:?}", rating(&before));let tag = before.get("recordChangeTag").and_then(|t| t.as_str());photos::set_rating(&http, &ck, p.clone(), &asset, tag, 3).await?;- let now = zc.lookup_record(ZONE, &asset).await?.unwrap();+ let now = zc.lookup_record(&zone, &asset).await?.unwrap();println!("set: {:?}", rating(&now));let tag = now.get("recordChangeTag").and_then(|t| t.as_str());photos::set_rating(&http, &ck, p.clone(), &asset, tag, 0).await?;- let back = zc.lookup_record(ZONE, &asset).await?.unwrap();+ let back = zc.lookup_record(&zone, &asset).await?.unwrap();println!("clear: {:?}", rating(&back));Ok(())}diff --git a/probe/examples/photos_text_roundtrip.rs b/probe/examples/photos_text_roundtrip.rsindex 504e984..6725281 100644--- a/probe/examples/photos_text_roundtrip.rs+++ b/probe/examples/photos_text_roundtrip.rs@@ -3,7 +3,7 @@//! cleared. Leaves the photo as it was.use anyhow::{anyhow, Result};use base64::Engine;-use quince_icloud::photos::{self, CONTAINER, ZONE};+use quince_icloud::photos::{self, CONTAINER};#[tokio::main]async fn main() -> Result<()> {@@ -19,6 +19,7 @@ async fn main() -> Result<()> {.ok_or_else(|| anyhow!("no ck"))?;let (http, p) = (client.http().clone(), client.service_params());let zc = quince_icloud::cloudkit::ZoneClient::new(&http, &ck, CONTAINER, p.clone());+ let zone = quince_icloud::photos::library_zone(&zc).await;let text = |r: &serde_json::Value, f: &str| {r.pointer(&format!("/fields/{f}/value")).and_then(|v| v.as_str())@@ -39,7 +40,7 @@ async fn main() -> Result<()> {)};let before = zc- .lookup_record(ZONE, &asset)+ .lookup_record(&zone, &asset).await?.ok_or_else(|| anyhow!("gone"))?;println!("before: {}", show(&before));@@ -52,10 +53,10 @@ async fn main() -> Result<()> {Some("Quince test — a caption ✿"),).await?;- let now = zc.lookup_record(ZONE, &asset).await?.unwrap();+ let now = zc.lookup_record(&zone, &asset).await?.unwrap();println!("set: {}", show(&now));photos::set_title_and_caption(&http, &ck, p.clone(), &asset, Some(""), Some("")).await?;- let back = zc.lookup_record(ZONE, &asset).await?.unwrap();+ let back = zc.lookup_record(&zone, &asset).await?.unwrap();println!("clear: {}", show(&back));Ok(())}diff --git a/probe/examples/photos_upload_quince.rs b/probe/examples/photos_upload_quince.rsindex 6599e62..3c76c86 100644--- a/probe/examples/photos_upload_quince.rs+++ b/probe/examples/photos_upload_quince.rs@@ -34,10 +34,18 @@ async fn main() -> Result<()> {let t = std::time::Instant::now();let progress: std::sync::Arc<dyn Fn(Stage) + Send + Sync> =std::sync::Arc::new(move |s| println!(" {:>6.2}s {s:?}", t.elapsed().as_secs_f64()));+ let library = quince_icloud::photos::library_zone(&quince_icloud::cloudkit::ZoneClient::new(+ &http,+ &ck,+ quince_icloud::photos::CONTAINER,+ p.clone(),+ ))+ .await;let outcome = quince_icloud::photos_upload::upload(&http,&up,&dsid,+ &library,&path,&name,std::time::SystemTime::now()diff --git a/probe/examples/plist_peek.rs b/probe/examples/plist_peek.rsindex 9c9a047..5a7eae0 100644--- a/probe/examples/plist_peek.rs+++ b/probe/examples/plist_peek.rs@@ -19,8 +19,9 @@ async fn main() -> Result<()> {quince_icloud::photos::CONTAINER,client.service_params(),);+ let zone = quince_icloud::photos::library_zone(&zc).await;let r = zc- .lookup_record(quince_icloud::photos::ZONE, &asset)+ .lookup_record(&zone, &asset).await?.ok_or_else(|| anyhow!("gone"))?;for f in ["keywordsEnc", "locationEnc", "locationV2Enc"] {