Skip to content
Merged
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: 17 additions & 3 deletions xsd-parser/src/pipeline/parser/resolver/file_resolver.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
use std::ffi::OsStr;
use std::fs::File;
use std::io::{BufReader, Error};
use std::io::BufReader;
use std::io::Error as IoError;
use std::path::PathBuf;
use thiserror::Error;

use url::Url;

Expand All @@ -18,9 +21,16 @@ impl FileResolver {
}
}

#[derive(Debug, Error)]
#[error("IO Error: {error} (path: {path})")]
pub struct FileResolverError {
path: PathBuf,
error: IoError,
}

impl Resolver for FileResolver {
type Buffer = BufReader<File>;
type Error = Error;
type Error = FileResolverError;

fn resolve(&mut self, req: &ResolveRequest) -> ResolveResult<Self> {
let url = if let Some(current) = &req.current_location {
Expand All @@ -37,7 +47,11 @@ impl Resolver for FileResolver {
return Ok(None);
};

let file = File::open(&path)?;
let file = match File::open(&path) {
Ok(file) => file,
Err(error) => return Err(FileResolverError { path, error }),
};

let buffer = BufReader::new(file);

let name = path
Expand Down
Loading