Need to merge Frame and remove anise from file loading

src/bin/anise/main.rs

@@ -5,7 +5,7 @@ use snafu::prelude::*;
 
 use anise::cli::args::{Actions, Args};
 use anise::cli::inspect::{BpcRow, SpkRow};
-use anise::cli::{AniseSnafu, CliDAFSnafu, CliErrors, CliFileRecordSnafu};
+use anise::cli::{AniseSnafu, CliDAFSnafu, CliDataSetSnafu, CliErrors, CliFileRecordSnafu};
 use anise::file2heap;
 use anise::naif::daf::{FileRecord, NAIFRecord, NAIFSummaryRecord};
 use anise::naif::kpl::parser::convert_tpc;
@@ -46,14 +46,14 @@ fn main() -> Result<(), CliErrors> {
                     DataSetType::SpacecraftData => {
                         // Decode as spacecraft data
                         let dataset = DataSet::<SpacecraftData, 64>::try_from_bytes(&bytes)
-                            .map_err(|source| CliErrors::AniseError { source })?;
+                            .with_context(|_| CliDataSetSnafu)?;
                         println!("{dataset}");
                         Ok(())
                     }
                     DataSetType::PlanetaryData => {
                         // Decode as planetary data
                         let dataset = DataSet::<PlanetaryData, 64>::try_from_bytes(&bytes)
-                            .map_err(|source| CliErrors::AniseError { source })?;
+                            .with_context(|_| CliDataSetSnafu)?;
                         println!("{dataset}");
                         Ok(())
                     }
@@ -178,12 +178,11 @@ fn main() -> Result<(), CliErrors> {
             gmfile,
             outfile,
         } => {
-            let dataset =
-                convert_tpc(pckfile, gmfile).map_err(|source| CliErrors::AniseError { source })?;
+            let dataset = convert_tpc(pckfile, gmfile).with_context(|_| CliDataSetSnafu)?;
 
             dataset
                 .save_as(outfile, false)
-                .map_err(|source| CliErrors::AniseError { source })?;
+                .with_context(|_| CliDataSetSnafu)?;
 
             Ok(())
         }

src/cli/mod.rs

@@ -6,7 +6,7 @@ use std::io;
 
 use crate::{
     naif::daf::{file_record::FileRecordError, DAFError},
-    prelude::AniseError,
+    structure::dataset::DataSetError,
 };
 
 pub mod args;
@@ -30,7 +30,7 @@ pub enum CliErrors {
     ArgumentError {
         arg: String,
     },
-    AniseError {
-        source: AniseError,
+    CliDataSet {
+        source: DataSetError,
     },
 }

src/errors.rs

@@ -16,6 +16,7 @@ use crate::structure::semver::Semver;
 use crate::NaifId;
 use core::convert::From;
 use core::fmt;
+use der::Error as DerError;
 use std::io::ErrorKind as IOErrorKind;
 
 #[derive(Clone, PartialEq, Debug)]
@@ -86,8 +87,14 @@ pub enum DecodingError {
         #[snafu(backtrace)]
         source: IntegrityError,
     },
+    #[snafu(display("decoding DER failed: {err}"))]
+    DecodingDer { err: DerError },
     #[snafu(display("somehow casting the data failed"))]
     Casting,
+    #[snafu(display("could not load ANISE data version {got}, expected {exp}"))]
+    AniseVersion { got: Semver, exp: Semver },
+    #[snafu(display("data could not be parsed as {kind} despite ANISE version matching (should be loaded as another type?)"))]
+    Obscure { kind: &'static str },
 }
 
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]

src/naif/kpl/mod.rs

@@ -12,7 +12,7 @@ use core::str::FromStr;
 use std::fmt::Debug;
 use std::{collections::HashMap, hash::Hash};
 
-use crate::prelude::AniseError;
+use snafu::{whatever, Whatever};
 
 use self::parser::Assignment;
 
@@ -38,10 +38,10 @@ pub enum KPLValue {
 }
 
 impl KPLValue {
-    pub fn to_vec_f64(&self) -> Result<Vec<f64>, AniseError> {
+    pub fn to_vec_f64(&self) -> Result<Vec<f64>, Whatever> {
         match self {
             KPLValue::Matrix(data) => Ok(data.clone()),
-            _ => Err(AniseError::ParameterNotSpecified),
+            _ => whatever!("can only convert matrices to vec of f64"),
         }
     }
 }
@@ -90,7 +90,7 @@ pub enum Parameter {
 }
 
 impl FromStr for Parameter {
-    type Err = AniseError;
+    type Err = Whatever;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s {
@@ -115,12 +115,10 @@ impl FromStr for Parameter {
             "UNITS" => Ok(Self::Units),
             "AXES" => Ok(Self::Axes),
             "GMLIST" | "NAME" | "SPEC" => {
-                // This is a known unsupported parameter
-                Err(AniseError::ParameterNotSpecified)
+                whatever!("unsupported parameter `{s}`")
             }
             _ => {
-                println!("WHAT IS `{s}` ?");
-                Err(AniseError::ParameterNotSpecified)
+                whatever!("unknown parameter `{s}`")
             }
         }
     }

src/naif/kpl/parser.rs

@@ -19,8 +19,7 @@ use log::{error, info, warn};
 
 use crate::naif::kpl::tpc::TPCItem;
 use crate::naif::kpl::Parameter;
-use crate::prelude::AniseError;
-use crate::structure::dataset::{DataSet, DataSetBuilder, DataSetType};
+use crate::structure::dataset::{DataSet, DataSetBuilder, DataSetError, DataSetType};
 use crate::structure::metadata::Metadata;
 use crate::structure::planetocentric::ellipsoid::Ellipsoid;
 use crate::structure::planetocentric::phaseangle::PhaseAngle;
@@ -78,7 +77,7 @@ impl Assignment {
 pub fn parse_file<P: AsRef<Path>, I: KPLItem>(
     file_path: P,
     show_comments: bool,
-) -> Result<HashMap<i32, I>, AniseError> {
+) -> Result<HashMap<i32, I>, DataSetError> {
     let file = File::open(file_path).expect("Failed to open file");
     let reader = BufReader::new(file);
 
@@ -135,7 +134,7 @@ pub fn parse_file<P: AsRef<Path>, I: KPLItem>(
 pub fn convert_tpc<'a, P: AsRef<Path>>(
     pck: P,
     gm: P,
-) -> Result<DataSet<'a, PlanetaryData, 64>, AniseError> {
+) -> Result<DataSet<'a, PlanetaryData, 64>, DataSetError> {
     let mut buf = vec![];
     let mut dataset_builder = DataSetBuilder::default();