Re-inserting a card that has already been imported produced a folder full of `-1` copies. Both halves of the placement logic treated a taken name as a collision to rename around, which is right for the case they were written for — two cameras both writing IMG_0001.CR3 — and exactly wrong for the far more common one, where the taken name is the same photograph. Locally this cannot be answered from the catalog. On a library whose catalog describes a *server*, a file sitting in the local destination has no row to be found by, so the only way to know whether it has already been copied is to look. The destination folder is listed once per folder rather than probed per file: a card is two thousand frames landing in a handful of days. Remotely the same question is one PROPFIND that was already being made to resolve the name, so `upload_original` now returns `Placed::AlreadyThere` instead of inventing a second copy of work that is already safe. The count is reported apart from `uploaded`, because "12 already on the server" and "12 uploaded" are different answers to whether this run backed anything up — and apart from the local duplicate count, because these files *were* copied here. Name plus length decides it, not a digest: this runs before any transfer, and hashing to answer it would read the whole card to avoid reading the whole card. A camera reusing a filename after IMG_9999 writes a different number of bytes essentially always, which leaves the rename for the case it is really for. The digest tier still catches the same frame under a different name. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
233 lines
8.9 KiB
Rust
233 lines
8.9 KiB
Rust
//! Pluggable remote storage for DarkRoom.
|
|
//!
|
|
//! Defines the [`RemoteBackend`] trait and the capability model the sync
|
|
//! engine adapts to. Only the Nextcloud connector is implemented
|
|
//! (`dr-sync-nextcloud`), but the boundary is designed so other backends can
|
|
//! be added without touching the engine.
|
|
//!
|
|
//! # Why capabilities rather than a common denominator
|
|
//!
|
|
//! Nextcloud's fast path relies on a behaviour that is *not* a WebDAV
|
|
//! guarantee: directory ETags propagate up the tree, so an unchanged root
|
|
//! ETag proves nothing anywhere in the library changed. That single property
|
|
//! turns a no-op sync over 50k images into one HTTP request.
|
|
//!
|
|
//! A trait built to what every backend can do would force full enumeration
|
|
//! every time — the exact cost the design exists to avoid. So backends
|
|
//! declare what they support and the engine picks a strategy (ARCH §8.1).
|
|
|
|
use std::ops::Range;
|
|
|
|
use async_trait::async_trait;
|
|
|
|
pub mod capability;
|
|
pub mod error;
|
|
pub mod reachability;
|
|
pub mod scan;
|
|
pub mod types;
|
|
pub mod upload;
|
|
|
|
pub use capability::{Capabilities, ChangeDetection, ChunkConstraints, ServerPreviews};
|
|
pub use error::RemoteError;
|
|
pub use reachability::{Connectivity, Reachability};
|
|
pub use scan::{scan, ScanProgress, ScanResult};
|
|
pub use types::{
|
|
Cursor, EntryKind, Identity, Precondition, RemoteChange, RemoteEntry, RemoteId, RemotePath,
|
|
Validator,
|
|
};
|
|
pub use upload::{destination, upload_original, Placed};
|
|
|
|
/// TRACES: FR-NC-12
|
|
/// A remote storage backend.
|
|
///
|
|
/// Implementations are expected to be cheap to clone or to be used behind an
|
|
/// `Arc`; the engine may call them concurrently.
|
|
#[async_trait]
|
|
pub trait RemoteBackend: Send + Sync {
|
|
/// What this backend supports. Read once at connect time and used to pick
|
|
/// a sync strategy.
|
|
fn capabilities(&self) -> &Capabilities;
|
|
|
|
/// Human-readable backend name, for logs and the UI.
|
|
fn name(&self) -> &str;
|
|
|
|
// ---- discovery --------------------------------------------------------
|
|
|
|
/// List one directory level.
|
|
///
|
|
/// `since` carries the validator the caller last saw, so backends able to
|
|
/// skip unchanged entries may do so. Backends that cannot simply ignore
|
|
/// it.
|
|
async fn list(
|
|
&self,
|
|
dir: &RemotePath,
|
|
since: Option<&Validator>,
|
|
) -> Result<Vec<RemoteEntry>, RemoteError>;
|
|
|
|
/// Fetch a directory's validator without listing its contents.
|
|
///
|
|
/// The cheap probe that makes ETag pruning work: one request against the
|
|
/// root answers "did anything change?". Backends without
|
|
/// [`ChangeDetection::PropagatingEtags`] return
|
|
/// [`RemoteError::Unsupported`].
|
|
async fn dir_validator(&self, dir: &RemotePath) -> Result<Validator, RemoteError>;
|
|
|
|
/// Ask what changed since a cursor.
|
|
///
|
|
/// Only meaningful for [`ChangeDetection::DeltaCursor`] backends; others
|
|
/// return [`RemoteError::Unsupported`].
|
|
async fn delta(&self, cursor: &Cursor) -> Result<(Vec<RemoteChange>, Cursor), RemoteError>;
|
|
|
|
// ---- transfer ---------------------------------------------------------
|
|
|
|
/// Fetch an object, optionally a byte range.
|
|
///
|
|
/// The range is a hint, not a guarantee: backends without range support
|
|
/// may return the whole object, and the caller slices. Correctness holds
|
|
/// either way; [`Capabilities::range_reads`] says whether it was cheap.
|
|
async fn get(&self, id: &RemoteId, range: Option<Range<u64>>) -> Result<Vec<u8>, RemoteError>;
|
|
|
|
/// Upload, optionally guarded by a precondition.
|
|
///
|
|
/// Backends handle chunking internally based on body size — chunked
|
|
/// upload is an implementation detail, not part of this interface, since
|
|
/// exposing it would leak one server's protocol into the abstraction.
|
|
async fn put(
|
|
&self,
|
|
path: &RemotePath,
|
|
body: Vec<u8>,
|
|
precond: Option<Precondition>,
|
|
) -> Result<Validator, RemoteError>;
|
|
|
|
/// Upload many small objects.
|
|
///
|
|
/// Defaults to sequential [`put`](Self::put) calls; backends with a bulk
|
|
/// endpoint override it. Sidecars are the motivating case — hundreds of
|
|
/// a few KB each.
|
|
async fn put_many(
|
|
&self,
|
|
items: Vec<(RemotePath, Vec<u8>)>,
|
|
) -> Result<Vec<Result<Validator, RemoteError>>, RemoteError> {
|
|
let mut out = Vec::with_capacity(items.len());
|
|
for (path, body) in items {
|
|
out.push(self.put(&path, body, None).await);
|
|
}
|
|
Ok(out)
|
|
}
|
|
|
|
/// Delete an object.
|
|
async fn delete(&self, id: &RemoteId, precond: Option<Precondition>)
|
|
-> Result<(), RemoteError>;
|
|
|
|
/// Move an object, keeping its identity.
|
|
///
|
|
/// TRACES: FR-CAT-15
|
|
/// **The stable id must survive.** This is what a soft delete uses to put a
|
|
/// photograph in the trash folder, and what a restore uses to bring it back.
|
|
/// A move implemented as copy-then-delete would allocate a *new*
|
|
/// `oc:fileid`, which orphans the thumbnail shard entry and the sidecar
|
|
/// mapping and turns a restore into a full re-download. WebDAV `MOVE` is one
|
|
/// request and preserves the id, which is why this is its own method rather
|
|
/// than something the caller composes.
|
|
///
|
|
/// Creates missing parent directories of `to`: the trash folder does not
|
|
/// exist until the first image is trashed, and requiring the caller to
|
|
/// create it separately makes the first trash of every library a two-step
|
|
/// dance with a failure mode in the middle.
|
|
async fn move_to(&self, from: &RemoteId, to: &RemotePath) -> Result<(), RemoteError>;
|
|
|
|
/// Create a directory, and any missing parents.
|
|
///
|
|
/// Succeeds if it already exists — callers use this to guarantee a
|
|
/// destination, not to claim they created it.
|
|
async fn create_dir(&self, path: &RemotePath) -> Result<(), RemoteError>;
|
|
|
|
// ---- optional ---------------------------------------------------------
|
|
|
|
/// Server-rendered thumbnail, where available.
|
|
///
|
|
/// `Ok(None)` means the server has no preview for this object — which is
|
|
/// common for RAW, since stock Nextcloud ships no RAW preview provider
|
|
/// (ARCH §6.7). Callers must have a local fallback.
|
|
async fn thumbnail(&self, _id: &RemoteId, _size: u32) -> Result<Option<Vec<u8>>, RemoteError> {
|
|
Ok(None)
|
|
}
|
|
}
|
|
|
|
/// TRACES: FR-NC-4 | FR-NC-12
|
|
/// Which sync strategy the engine should use for a backend.
|
|
///
|
|
/// Derived from capabilities at connect time. Reported to the user so a slow
|
|
/// backend is visibly slow rather than mysteriously slow (FR-NC-12).
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub enum SyncStrategy {
|
|
/// Ask the server what changed. Cheapest.
|
|
Delta,
|
|
/// Probe the root ETag; recurse only where it differs. One request when
|
|
/// nothing changed.
|
|
EtagPruning,
|
|
/// Enumerate the tree, using per-entry ETags to avoid re-downloading.
|
|
FullListing,
|
|
/// Enumerate and compare modification times. Degraded — clock skew and
|
|
/// second-granularity timestamps both cause misses.
|
|
TimestampCompare,
|
|
}
|
|
|
|
impl SyncStrategy {
|
|
pub fn for_capabilities(caps: &Capabilities) -> Self {
|
|
match caps.change_detection {
|
|
ChangeDetection::DeltaCursor => SyncStrategy::Delta,
|
|
ChangeDetection::PropagatingEtags => SyncStrategy::EtagPruning,
|
|
ChangeDetection::LocalEtags => SyncStrategy::FullListing,
|
|
ChangeDetection::Timestamps => SyncStrategy::TimestampCompare,
|
|
}
|
|
}
|
|
|
|
/// A short description for the UI.
|
|
pub fn describe(self) -> &'static str {
|
|
match self {
|
|
SyncStrategy::Delta => "server change feed",
|
|
SyncStrategy::EtagPruning => "incremental (ETag pruning)",
|
|
SyncStrategy::FullListing => "full listing, cached by ETag",
|
|
SyncStrategy::TimestampCompare => "full listing by timestamp (degraded)",
|
|
}
|
|
}
|
|
|
|
/// Whether this strategy can prove "nothing changed" cheaply.
|
|
///
|
|
/// Where false, every sync costs at least one request per folder, which
|
|
/// the UI should warn about on large libraries.
|
|
pub fn has_cheap_noop(self) -> bool {
|
|
matches!(self, SyncStrategy::Delta | SyncStrategy::EtagPruning)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn strategy_follows_capability() {
|
|
let mut caps = Capabilities::minimal();
|
|
assert_eq!(
|
|
SyncStrategy::for_capabilities(&caps),
|
|
SyncStrategy::TimestampCompare
|
|
);
|
|
|
|
caps.change_detection = ChangeDetection::PropagatingEtags;
|
|
assert_eq!(
|
|
SyncStrategy::for_capabilities(&caps),
|
|
SyncStrategy::EtagPruning
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn only_delta_and_pruning_have_cheap_noop() {
|
|
assert!(SyncStrategy::Delta.has_cheap_noop());
|
|
assert!(SyncStrategy::EtagPruning.has_cheap_noop());
|
|
// These cost at least one request per folder, every time.
|
|
assert!(!SyncStrategy::FullListing.has_cheap_noop());
|
|
assert!(!SyncStrategy::TimestampCompare.has_cheap_noop());
|
|
}
|
|
}
|