mirror of
https://github.com/storytold/photocraft.git
synced 2026-10-27 09:42:00 +01:00
18f9f11de4
The desktop app's --control already reads PHOTOCRAFT_CONTROL_PORT, and the CLI read the token variables at run time. Now every fallback is declared with `env =` on its flag (clap's `env` workspace feature, no new crate in Cargo.lock): - --control-token and --control-token-file in ControlArgs fall back to PHOTOCRAFT_CONTROL_TOKEN and PHOTOCRAFT_CONTROL_TOKEN_FILE, as security::token_inputs did at run time. The CLI no longer calls token_inputs, so the variables are read in one place; the desktop app still uses it until step 5. Help names the token's variable but never shows its value (hide_env_values). A token from the environment together with the other flag is now clap's either/or usage error (exit 2) rather than the automation crate's (exit 1). - `serve` takes PHOTOCRAFT_CONTROL_PORT as --port and `mcp` as the bridge port when the flag is absent, as #2495 proposed. The variable must be a port: `mcp` refuses 127.0.0.1:7878 or :7878 from it, as the desktop app's --control would; only --bridge takes host:port. - The automation roots stay flag-only for the CLI: a PHOTOCRAFT_AUTOMATION_*_ROOT exported for the desktop app must not widen headless file access (#1551). - A flag wins, and an empty or blank variable counts as unset (blank_env_is_unset; clap would hand the empty value to the parser), so stdio and headless stay the default. - A bad value or conflict from a variable is a usage error naming the variable instead of the flag it stands in for (name_env_vars). - The port variable changes what the command does, so when it (not the flag) turns on TCP or bridging, the command says so on stderr and names the way back (ArgMatches::value_source tells which). bin() in the tests removes the token and port variables, so an exported one can't change a test. New tests: control_port_env_switches_modes_with_a_notice_and_flags_win (ported from #2495, also checking the bad values) and control_token_env_vars_are_the_flags_fallbacks. Co-authored-by: ahmedhosnypro <ahhosnyas@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
176 lines
7.1 KiB
TOML
176 lines
7.1 KiB
TOML
[workspace]
|
||
resolver = "3"
|
||
members = ["crates/*", "apps/*", "xtask"]
|
||
default-members = ["crates/*", "apps/photocraft", "apps/photocraft-cli", "xtask"]
|
||
|
||
[workspace.package]
|
||
version = "0.15.1"
|
||
edition = "2024"
|
||
license = "MIT OR Apache-2.0"
|
||
rust-version = "1.95"
|
||
|
||
[workspace.dependencies]
|
||
craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "5c874d51eeb3de70e735c8ce87a59a7dedd47675", features = ["serde"] }
|
||
# internal
|
||
photocraft-geom = { path = "crates/geom" }
|
||
photocraft-color = { path = "crates/color" }
|
||
photocraft-cms = { path = "crates/cms" }
|
||
photocraft-raster = { path = "crates/raster" }
|
||
photocraft-doc = { path = "crates/doc" }
|
||
photocraft-ops = { path = "crates/ops" }
|
||
photocraft-psd = { path = "crates/psd" }
|
||
photocraft-codecs = { path = "crates/codecs" }
|
||
photocraft-raw = { path = "crates/raw" }
|
||
photocraft-affinity = { path = "crates/affinity" }
|
||
photocraft-compose = { path = "crates/compose" }
|
||
photocraft-gpu = { path = "crates/gpu" }
|
||
photocraft-paint = { path = "crates/paint" }
|
||
photocraft-algo = { path = "crates/algo" }
|
||
photocraft-io = { path = "crates/io" }
|
||
photocraft-text = { path = "crates/text" }
|
||
photocraft-vector = { path = "crates/vector" }
|
||
photocraft-format = { path = "crates/format" }
|
||
photocraft-automation = { path = "crates/automation" }
|
||
photocraft-plugins = { path = "crates/plugins" }
|
||
photocraft-engine = { path = "crates/engine" }
|
||
photocraft-ui-egui = { path = "crates/ui-egui" }
|
||
photocraft-testkit = { path = "crates/testkit" }
|
||
photocraft-tablet = { path = "crates/tablet" }
|
||
photocraft-ipp = { path = "crates/ipp" }
|
||
|
||
# external
|
||
craft-print = { git = "https://github.com/storytold/craft-libs", rev = "3d37da389a3618ab9b76109da11416e9ca4ea719" }
|
||
craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "82a24b006eefa036b43c09a67fb9a3fbd17ffe63" }
|
||
thiserror = "2"
|
||
serde = { version = "1", features = ["derive", "rc"] }
|
||
serde_json = "1"
|
||
clap = { version = "4", features = ["derive", "env"] }
|
||
arc-swap = "1"
|
||
bytemuck = { version = "1", features = ["derive"] }
|
||
flate2 = { version = "1", default-features = false, features = ["rust_backend"] }
|
||
image = { version = "0.25", default-features = false }
|
||
# Baseline-JPEG decode of lossy DNG tiles (compression 34892), shared with zune-jpeg.
|
||
zune-core = "0.5"
|
||
zune-jpeg = "0.5"
|
||
proptest = "1"
|
||
eframe = { version = "0.36", default-features = false }
|
||
# Without `default_fonts`, which embeds egui's fonts uncompressed: ui-egui ships them deflated
|
||
# (egui_fonts.rs; the web build's size gate).
|
||
egui = { version = "0.36", default-features = false }
|
||
egui_kittest = "0.36"
|
||
rfd = "0.17"
|
||
log = "0.4"
|
||
# All date/time conversion goes through chrono (no hand-rolled calendar code beyond the 400-year range extension; AGENTS.md).
|
||
chrono = { version = "0.4.45", default-features = false, features = ["std"] }
|
||
rayon = "1"
|
||
criterion = { version = "0.5", default-features = false }
|
||
getrandom = "0.3"
|
||
|
||
[workspace.lints.rust]
|
||
unsafe_code = "forbid"
|
||
|
||
[workspace.lints.clippy]
|
||
dbg_macro = "warn"
|
||
todo = "warn"
|
||
|
||
# Dependencies carry no debug info: their frames in a backtrace lose file:line, and the target dir
|
||
# and link times shrink. The test profile inherits both settings.
|
||
[profile.dev.package."*"]
|
||
opt-level = 2
|
||
debug = false
|
||
|
||
[profile.dev]
|
||
opt-level = 1
|
||
# Line tables keep file:line in panic backtraces but drop variable info, which roughly halves link
|
||
# time and PDB size for the test binaries (#2204). CI's Windows legs build with no debuginfo at all
|
||
# (CARGO_PROFILE_DEV_DEBUG=0). To inspect locals in a debugger, build with
|
||
# CARGO_PROFILE_DEV_DEBUG=true.
|
||
debug = "line-tables-only"
|
||
|
||
# Test builds compile ui-egui without optimization: its library and unit tests were the biggest
|
||
# test-build units after engine's (12.6 of ~63 compile minutes on the Windows CI runner), and its
|
||
# tests run no heavier pixel code of their own (that lives in the crates that stay optimized).
|
||
# Measured on CI: Windows build 18.9 -> 15.4 min, test run 10.0 -> 10.5. `cargo run` and
|
||
# `cargo build` use the dev profile and are unaffected.
|
||
[profile.test.package.photocraft-ui-egui]
|
||
opt-level = 0
|
||
|
||
[profile.release]
|
||
lto = "thin"
|
||
codegen-units = 1
|
||
|
||
# The browser build (apps/photocraft-web, `data-cargo-profile` in its index.html). Hosts cap the
|
||
# size of a single file (Cloudflare Pages/Workers: 25 MiB), and the wasm is downloaded on every
|
||
# visit, so this profile optimizes for size: fat LTO, opt-level "z" for PhotoCraft's own crates,
|
||
# "s" for dependencies and for the crates that decode files, and 3 for pixel processing (filters
|
||
# and compositing). Dependencies stay at "s": at "z" the whole wasm grows (by 0.4 MB, measured).
|
||
# panic stays the target default (wasm32-unknown-unknown aborts; AGENTS.md's `panic = "unwind"`
|
||
# is for the native app shell). packaging/web/package.sh fails the build above 24 MiB.
|
||
[profile.wasm-release]
|
||
inherits = "release"
|
||
opt-level = "z"
|
||
lto = "fat"
|
||
codegen-units = 1
|
||
strip = "debuginfo"
|
||
|
||
[profile.wasm-release.package."*"]
|
||
opt-level = "s"
|
||
|
||
# Decoding and rasterizing keep their speed.
|
||
[profile.wasm-release.package.photocraft-codecs]
|
||
opt-level = "s"
|
||
[profile.wasm-release.package.photocraft-raw]
|
||
opt-level = "s"
|
||
[profile.wasm-release.package.photocraft-heif]
|
||
opt-level = "s"
|
||
[profile.wasm-release.package.photocraft-vector]
|
||
opt-level = "s"
|
||
|
||
# Large crates off the per-frame and per-pixel paths: the document model, file parsers run once
|
||
# per open/save, JSON (settings, presets, control channel), SVG parsing, and shader translation
|
||
# (runs when a pipeline is created). "z" keeps the wasm well under the size gate.
|
||
[profile.wasm-release.package.photocraft-doc]
|
||
opt-level = "z"
|
||
[profile.wasm-release.package.photocraft-psd]
|
||
opt-level = "z"
|
||
[profile.wasm-release.package.photocraft-format]
|
||
opt-level = "z"
|
||
[profile.wasm-release.package.photocraft-affinity]
|
||
opt-level = "z"
|
||
[profile.wasm-release.package.serde_json]
|
||
opt-level = "z"
|
||
[profile.wasm-release.package.usvg]
|
||
opt-level = "z"
|
||
[profile.wasm-release.package.naga]
|
||
opt-level = "z"
|
||
|
||
# The browser UI toolkit favors size to stay within the WebAssembly upload budget.
|
||
[profile.wasm-release.package.egui]
|
||
opt-level = "z"
|
||
[profile.wasm-release.package.epaint]
|
||
opt-level = "z"
|
||
[profile.wasm-release.package.eframe]
|
||
opt-level = "z"
|
||
|
||
# Pixel processing keeps its speed-oriented optimization level, with two exceptions.
|
||
# Colour-management transforms are built once and cached (`transform::cached`), so "z" costs
|
||
# little runtime. The browser app composites per frame on the GPU (`crates/gpu`, WebGPU/WebGL2),
|
||
# so the CPU compositor is not the browser's hot path there; "z" for compose keeps the wasm
|
||
# under the 24 MiB gate (measured −122 KB vs opt-level 3). algo's filters run per pixel on
|
||
# every interactive filter application; "z" there is the size lever of last resort (−331 KB),
|
||
# taken because the gate is enforced in CI: if browser filters feel too slow, restore 3 here
|
||
# and reclaim the bytes from a feature-gated decoder instead.
|
||
[profile.wasm-release.package.photocraft-raster]
|
||
opt-level = 3
|
||
[profile.wasm-release.package.photocraft-color]
|
||
opt-level = 3
|
||
[profile.wasm-release.package.photocraft-cms]
|
||
opt-level = "z"
|
||
[profile.wasm-release.package.photocraft-compose]
|
||
opt-level = "z"
|
||
[profile.wasm-release.package.photocraft-algo]
|
||
opt-level = "z"
|
||
[profile.wasm-release.package.photocraft-paint]
|
||
opt-level = 3
|
||
|