Skip to content
Merged
Show file tree
Hide file tree
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
9 changes: 6 additions & 3 deletions hugr-cli/src/hugr_io.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Input/output arguments for the HUGR CLI.

use clio::Input;
use hugr::envelope::read_envelope;
use hugr::envelope::{read_envelope, EnvelopeError};
use hugr::extension::ExtensionRegistry;
use hugr::package::Package;
use hugr::{Extension, Hugr};
Expand Down Expand Up @@ -48,8 +48,11 @@ impl HugrInputArgs {
pub fn get_package(&mut self) -> Result<Package, CliError> {
let extensions = self.load_extensions()?;
let buffer = BufReader::new(&mut self.input);
let (_, pkg) = read_envelope(buffer, &extensions)?;
Ok(pkg)
match read_envelope(buffer, &extensions) {
Ok((_, pkg)) => Ok(pkg),
Err(EnvelopeError::MagicNumber { .. }) => Err(CliError::NotAnEnvelope),
Err(e) => Err(CliError::Envelope(e)),
}
}

/// Read a hugr JSON file from the input.
Expand Down
5 changes: 5 additions & 0 deletions hugr-cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ pub enum CliError {
#[display("Error decoding HUGR envelope: {_0}")]
/// Errors produced by the `validate` subcommand.
Envelope(EnvelopeError),
/// Pretty error when the user passes a non-envelope file.
#[display(
"Input file is not a HUGR envelope. Invalid magic number.\n\nUse `--hugr-json` to read a raw HUGR JSON file instead."
)]
NotAnEnvelope,
}

/// Other arguments affecting the HUGR CLI runtime.
Expand Down
Loading