Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions src/designspace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#![deny(rustdoc::broken_intra_doc_links)]

use serde::{Deserialize, Serialize};
use std::{fs::File, io::BufReader, path::Path};
use std::path::Path;

use plist::Dictionary;

Expand Down Expand Up @@ -335,7 +335,15 @@ pub struct Dimension {
impl DesignSpaceDocument {
/// Load a designspace.
pub fn load<P: AsRef<Path>>(path: P) -> Result<DesignSpaceDocument, DesignSpaceLoadError> {
let reader = BufReader::new(File::open(path).map_err(DesignSpaceLoadError::Io)?);
let reader =
std::io::BufReader::new(std::fs::File::open(path).map_err(DesignSpaceLoadError::Io)?);
Self::load_from_reader(reader)
}

/// Load a designspace from a reader.
pub fn load_from_reader(
reader: impl std::io::BufRead,
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason we constrain on BufRead here, instead of just Read?

) -> Result<DesignSpaceDocument, DesignSpaceLoadError> {
quick_xml::de::from_reader(reader).map_err(DesignSpaceLoadError::DeError)
}

Expand Down Expand Up @@ -525,6 +533,14 @@ mod tests {
Dimension { name: name.to_string(), uservalue: None, xvalue: Some(xvalue), yvalue: None }
}

#[test]
fn load_from_reader_matches_load() {
let from_path = DesignSpaceDocument::load("testdata/wght.designspace").unwrap();
let bytes = std::fs::read("testdata/wght.designspace").unwrap();
let from_reader = DesignSpaceDocument::load_from_reader(bytes.as_slice()).unwrap();
assert_eq!(from_path, from_reader);
}

#[test]
fn read_single_wght() {
let ds = DesignSpaceDocument::load(Path::new("testdata/single_wght.designspace")).unwrap();
Expand Down
Loading