LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Catalog import: resolve catalog paths with craft-docpath's resolve_absolute (#2412)
aionggd71b83b2bcdc
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.ymlindex 01cb9cd66..2fe7cd3ac 100644--- a/.github/workflows/nix.yml+++ b/.github/workflows/nix.yml@@ -18,6 +18,44 @@ concurrency:cancel-in-progress: truejobs:+ git-sources:+ name: Git dependencies come from storytold+ runs-on: ubuntu-latest+ timeout-minutes: 5+ steps:+ - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1+ - name: Git dependencies come from storytold+ run: |+ set -euo pipefail+ test -f Cargo.lock || { echo "Cargo.lock is missing"; exit 1; }+ # Source replacement, patches and path overrides in cargo config never show up+ # in Cargo.lock. Parsed rather than grepped: TOML has many spellings of one key.+ # Cargo still reads the legacy .cargo/config.+ python3 - <<'PY'+ import os, sys, tomllib+ for path in (".cargo/config", ".cargo/config.toml"):+ if not os.path.exists(path):+ continue+ config = tomllib.load(open(path, "rb"))+ replaced = [name for name, source in config.get("source", {}).items()+ if isinstance(source, dict) and "replace-with" in source]+ if replaced or "patch" in config or "paths" in config:+ print(f"{path} replaces, patches or overrides a source")+ sys.exit(1)+ PY+ # Fails when Cargo.lock is out of date with the manifests.+ cargo metadata --locked --format-version 1 > /dev/null+ python3 - <<'PY'+ import sys, tomllib+ lock = tomllib.load(open("Cargo.lock", "rb"))+ bad = sorted({p["source"] for p in lock.get("package", [])+ if p.get("source", "").startswith("git+")+ and not p["source"].startswith("git+https://github.com/storytold/")})+ if bad:+ print("Git dependencies outside github.com/storytold:", *bad, sep="\n")+ sys.exit(1)+ PY+nix:# Intentionally tracked at @main (not SHA-pinned) so org-wide CI improvements, security fixes, and build optimizations propagate without PR churn across all craftapp repos.uses: storytold/craft-common-actions/.github/workflows/nix.yml@maindiff --git a/.github/workflows/release.yml b/.github/workflows/release.ymlindex b8fb01326..7356f66fe 100644--- a/.github/workflows/release.yml+++ b/.github/workflows/release.yml@@ -20,7 +20,47 @@ concurrency:cancel-in-progress: falsejobs:+ git-sources:+ name: Git dependencies come from storytold+ runs-on: ubuntu-latest+ permissions:+ contents: read+ steps:+ - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1+ - name: Git dependencies come from storytold+ run: |+ set -euo pipefail+ test -f Cargo.lock || { echo "Cargo.lock is missing"; exit 1; }+ # Source replacement, patches and path overrides in cargo config never show up+ # in Cargo.lock. Parsed rather than grepped: TOML has many spellings of one key.+ # Cargo still reads the legacy .cargo/config.+ python3 - <<'PY'+ import os, sys, tomllib+ for path in (".cargo/config", ".cargo/config.toml"):+ if not os.path.exists(path):+ continue+ config = tomllib.load(open(path, "rb"))+ replaced = [name for name, source in config.get("source", {}).items()+ if isinstance(source, dict) and "replace-with" in source]+ if replaced or "patch" in config or "paths" in config:+ print(f"{path} replaces, patches or overrides a source")+ sys.exit(1)+ PY+ # Fails when Cargo.lock is out of date with the manifests.+ cargo metadata --locked --format-version 1 > /dev/null+ python3 - <<'PY'+ import sys, tomllib+ lock = tomllib.load(open("Cargo.lock", "rb"))+ bad = sorted({p["source"] for p in lock.get("package", [])+ if p.get("source", "").startswith("git+")+ and not p["source"].startswith("git+https://github.com/storytold/")})+ if bad:+ print("Git dependencies outside github.com/storytold:", *bad, sep="\n")+ sys.exit(1)+ PY+release:+ needs: git-sources# Intentionally tracked at @main (not SHA-pinned) so org-wide CI improvements, security fixes, and build optimizations propagate without PR churn across all craftapp repos.uses: storytold/craft-common-actions/.github/workflows/release.yml@mainwith:diff --git a/crates/engine/src/doc_path.rs b/crates/engine/src/doc_path.rsindex c2b0e9f69..d3f455b81 100644--- a/crates/engine/src/doc_path.rs+++ b/crates/engine/src/doc_path.rs@@ -38,13 +38,13 @@ impl std::error::Error for NotFollowed {}/// was opened from.pub fn resolve(stored: &str, document: Option<&Path>) -> Result<PathBuf, NotFollowed> {let document = document.map(|d| if d.is_relative() { std::path::absolute(d).unwrap_or_else(|_| d.to_path_buf()) } else { d.to_path_buf() });- let path = craft_docpath::resolve(stored, document.as_deref()).map_err(NotFollowed::Refused)?;- // A path that is still relative would be taken from the working directory, which the- // document does not choose.- if path.is_relative() {- return Err(NotFollowed::NotHere);+ match craft_docpath::resolve_absolute(stored, document.as_deref()) {+ Ok(path) => Ok(path),+ // A usable path that is not absolute here: a Windows path on macOS or Linux, or a+ // relative path with no document folder to take it from.+ Err(Refused::Invalid) if craft_docpath::resolve(stored, document.as_deref()).is_ok() => Err(NotFollowed::NotHere),+ Err(r) => Err(NotFollowed::Refused(r)),}- Ok(path)}#[cfg(test)]@@ -59,5 +59,12 @@ mod tests {assert_eq!(resolve(r"\\192.0.2.1\share\x.jpg", Some(&doc)), Err(NotFollowed::Refused(Refused::Network)));assert_eq!(resolve("file://192.0.2.1/s/x.jpg", Some(&doc)), Err(NotFollowed::Refused(Refused::Network)));assert_eq!(resolve(r"\\.\COM1", Some(&doc)), Err(NotFollowed::Refused(Refused::Device)));+ #[cfg(windows)]+ assert_eq!(resolve("Photos/2024:05/a.jpg", Some(&doc)), Err(NotFollowed::Refused(Refused::Invalid)));+ #[cfg(not(windows))]+ assert_eq!(resolve(r"C:\Photos\a.jpg", Some(&doc)), Err(NotFollowed::NotHere));+ let gvfs = Path::new("/run/user/1000/gvfs/smb-share:server=tokyo,share=photos/catalog.lrcat");+ #[cfg(not(windows))]+ assert_eq!(resolve("a.jpg", Some(gvfs)), Ok(gvfs.with_file_name("a.jpg")));}}