mirror of
https://github.com/storytold/photocraft.git
synced 2026-10-31 03:32:08 +01:00
aionggandDavid Mann
87918a6c85
A linked smart object's path comes from the document. Every place that follows it now goes through one resolver (photocraft_io::doc_path, built on craft-docpath): a relative path is taken from the document's folder, and only local files or files on the share the document itself is on are opened. Paths to other computers, device paths and URLs are treated like a missing file: the layer keeps its last rendering. - Link watch: such links are not stamped, and no background look starts when no link of the document is followed. - Update Modified Content and other re-renders read only followed files; the error names why a link is not followed. - Package lists such links as missing instead of copying them. - Reveal in Finder for a linked layer shows only a followed file; the document's own Reveal is unchanged. The macOS invocation ends options with `--`, and Explorer is not asked to select a path containing a comma or a quotation mark. - Place Linked stores a relative path as an absolute one. The document path travels to smart-object renders in a thread-local scope entered by Session::edit, command dispatch and background jobs. Co-authored-by: David Mann <daaavid.mann@gmail.com>
60 lines
2.6 KiB
Rust
60 lines
2.6 KiB
Rust
//! Files named by paths stored in a document: linked smart objects, the Displace map and Color
|
|
//! Lookup file of a smart filter, data-set images, video footage.
|
|
//!
|
|
//! Such a path is followed only through [`resolve`]: a relative path is taken from the document's
|
|
//! folder, and only local files, or files on the network share the document itself is on, are
|
|
//! opened (see `craft_docpath`). A refused path is treated like a missing file.
|
|
|
|
use std::fmt;
|
|
use std::path::{Path, PathBuf};
|
|
|
|
pub use craft_docpath::Refused;
|
|
|
|
/// Why a stored path is not followed.
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub enum NotFollowed {
|
|
/// The path is not a local file, or is not on the document's own share.
|
|
Refused(Refused),
|
|
/// The path is relative and the document has no file to take it from.
|
|
NoDocumentFolder,
|
|
}
|
|
|
|
impl fmt::Display for NotFollowed {
|
|
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
match self {
|
|
Self::Refused(r) => r.fmt(f),
|
|
Self::NoDocumentFolder => f.write_str("the path is relative and the document has not been saved"),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl std::error::Error for NotFollowed {}
|
|
|
|
/// The file to open for `stored`, a path or `file:` URL stored in a document, or why it is not
|
|
/// followed. `document` is the path of the document it is stored in, if the document has a file;
|
|
/// a relative `document` is taken from the working directory, where it 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::NoDocumentFolder);
|
|
}
|
|
Ok(path)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn relative_paths_are_taken_from_the_document_folder() {
|
|
let doc = std::env::temp_dir().join("art").join("poster.pcraft");
|
|
assert_eq!(resolve("logo.png", Some(&doc)), Ok(std::env::temp_dir().join("art").join("logo.png")));
|
|
assert_eq!(resolve("logo.png", None), Err(NotFollowed::NoDocumentFolder));
|
|
assert_eq!(resolve(r"\\192.0.2.1\share\x.png", Some(&doc)), Err(NotFollowed::Refused(Refused::Network)));
|
|
assert_eq!(resolve("//192.0.2.1/share/x.png", None), Err(NotFollowed::Refused(Refused::Network)));
|
|
}
|
|
}
|