dtourolle
cc1c5c892d
Correcting the previous commit: I claimed VFS placeholders could not be
downloaded. That was wrong. The desktop client exposes a socket at
$XDG_RUNTIME_DIR/Nextcloud/socket speaking newline-delimited
COMMAND:argument, and MAKE_AVAILABLE_LOCALLY:<path> does fetch the file.
Verified against client 4.0.7: a 1-byte stub became a real 2.8MB file in
2.8 seconds.
Implemented as dr-sync-nextcloud::desktop_client, deliberately optional.
Android has no desktop client, no XDG_RUNTIME_DIR socket and no
placeholders, so detect() returns None there and callers fall back to the
connector. It earns its place only because it is ~30 lines with no
dependencies: where a library already lives in a VFS folder, asking the
client to fetch beats downloading a second copy over WebDAV and leaving
the client's placeholder state inconsistent.
What this does not change: hydration is whole-file, so it suits the
original tier and never browsing. Filling a grid this way downloads the
entire library. Range extraction remains the only mechanism satisfying
FR-NC-3, and ARCH §9.0 now says so precisely.
Also fixes two real Android build failures found by cross-compiling:
- reqwest's `rustls` feature defaults to aws-lc-rs, whose aws-lc-sys
crate is C and fails under the NDK — exactly the pain D1 chose Rust
to avoid. Switched to rustls-no-provider + ring, installing the
provider in the constructor so no caller can build a client that
panics on first use.
- ring itself needs CC/AR per target; cargo-ndk sets only the linker.
Added them to the container.
87 tests passing. dr-sync-nextcloud cross-compiles for aarch64-linux-android.
79 lines
2.3 KiB
TOML
79 lines
2.3 KiB
TOML
[workspace]
|
|
resolver = "2"
|
|
members = [
|
|
"core/dr-types",
|
|
"core/dr-decode",
|
|
"core/dr-gpu",
|
|
"core/dr-sync",
|
|
"core/dr-sync-nextcloud",
|
|
"ui/dr-ui",
|
|
"apps/darkroom-desktop",
|
|
"tools/traceability",
|
|
]
|
|
|
|
[workspace.package]
|
|
version = "0.1.0"
|
|
edition = "2021"
|
|
rust-version = "1.92"
|
|
license = "GPL-3.0-or-later"
|
|
repository = "https://github.com/dtourolle/DarkRoom"
|
|
|
|
[workspace.dependencies]
|
|
# Internal
|
|
dr-types = { path = "core/dr-types" }
|
|
dr-decode = { path = "core/dr-decode" }
|
|
dr-gpu = { path = "core/dr-gpu" }
|
|
dr-sync = { path = "core/dr-sync" }
|
|
dr-sync-nextcloud = { path = "core/dr-sync-nextcloud" }
|
|
dr-ui = { path = "ui/dr-ui" }
|
|
|
|
# GPU + UI
|
|
wgpu = "23"
|
|
slint = { version = "1.9", default-features = false }
|
|
slint-build = "1.9"
|
|
|
|
# Foundations
|
|
anyhow = "1"
|
|
thiserror = "2"
|
|
log = "0.4"
|
|
env_logger = "0.11"
|
|
pollster = "0.4"
|
|
|
|
# Networking — no mature Nextcloud crate exists; the connector is hand-rolled
|
|
# over reqwest (D7). reqwest_dav was evaluated and is too thin to build on.
|
|
# `rustls-no-provider` rather than `rustls`: the latter defaults to the
|
|
# aws-lc-rs crypto provider, whose aws-lc-sys crate is C and fails to
|
|
# cross-compile for Android — precisely the NDK pain D1 chose Rust to avoid.
|
|
# ring is pure Rust apart from a small asm core that does build under the NDK.
|
|
#
|
|
# Note this still pulls rustls-platform-verifier, which crashes on Android
|
|
# unless initialised from Kotlin (spike S3). D7 records `tls_certs_only` plus
|
|
# webpki-roots as the escape hatch.
|
|
reqwest = { version = "0.13", default-features = false, features = ["rustls-no-provider", "stream", "json"] }
|
|
rustls = { version = "0.23", default-features = false, features = ["ring", "std", "tls12"] }
|
|
quick-xml = "0.41"
|
|
tokio = { version = "1", features = ["rt-multi-thread", "macros", "sync", "time"] }
|
|
url = "2.5"
|
|
async-trait = "0.1"
|
|
serde = { version = "1", features = ["derive"] }
|
|
serde_json = "1"
|
|
base64 = "0.23"
|
|
|
|
# Decode. rawler is the pure-Rust decoder (D2); zune-jpeg decodes the
|
|
# embedded previews rawler extracts.
|
|
rawler = "0.7"
|
|
zune-jpeg = "0.4.21"
|
|
bytemuck = { version = "1", features = ["derive"] }
|
|
|
|
[profile.dev]
|
|
# Dependencies optimised even in dev builds — wgpu and image decoding are
|
|
# unusably slow otherwise, and they rarely need debugging.
|
|
opt-level = 0
|
|
|
|
[profile.dev.package."*"]
|
|
opt-level = 2
|
|
|
|
[profile.release]
|
|
lto = "thin"
|
|
codegen-units = 1
|