Test imdl torrent verify output

- Test all individual `FileError` variants
- Test terminal colors
- Test multiple and single file torrents

type: testing

Cargo.toml

@@ -54,6 +54,7 @@ version  = "0.3.0"
 features = ["default", "wrap_help"]
 
 [dev-dependencies]
+indoc    = "0.3.4"
 temptree = "0.0.0"
 
 [workspace]

src/env.rs

@@ -78,8 +78,6 @@ impl Env {
         )
         .ok();
 
-        error.print_body(self).ok();
-
         if let Some(lint) = error.lint() {
           writeln!(
             &mut self.err,

src/error.rs

@@ -120,7 +120,7 @@ pub(crate) enum Error {
   ))]
   Unstable { feature: &'static str },
   #[snafu(display("Torrent verification failed."))]
-  Verify { status: Status },
+  Verify,
 }
 
 impl Error {
@@ -137,14 +137,6 @@ impl Error {
       message: message.into(),
     }
   }
-
-  pub(crate) fn print_body(&self, env: &mut Env) -> Result<()> {
-    if let Self::Verify { status } = self {
-      status.print_body(env)?;
-    }
-
-    Ok(())
-  }
 }
 
 impl From<clap::Error> for Error {

src/file_error.rs

@@ -73,8 +73,8 @@ impl Display for FileError {
       Self::Io(io_error) => write!(f, "{}", io_error),
       Self::Missing => write!(f, "File missing"),
       Self::Directory => write!(f, "Expected file but found directory"),
-      Self::Surfeit(difference) => write!(f, "Extra bytes: {}", difference),
-      Self::Dearth(difference) => write!(f, "Missing bytes: {}", difference),
+      Self::Surfeit(difference) => write!(f, "{} too long", difference),
+      Self::Dearth(difference) => write!(f, "{} too short", difference),
       Self::Md5 { actual, expected } => write!(
         f,
         "MD5 checksum mismatch: {} (expected {})",

src/output_stream.rs

@@ -49,6 +49,10 @@ impl OutputStream {
     self.style
   }
 
+  pub(crate) fn is_styled_term(&self) -> bool {
+    self.is_styled() && self.is_term()
+  }
+
   pub(crate) fn style(&self) -> Style {
     Style::from_active(self.style)
   }

src/status.rs

@@ -49,7 +49,7 @@ impl Status {
     }
   }
 
-  pub(crate) fn print_body(&self, env: &mut Env) -> Result<()> {
+  pub(crate) fn print(&self, env: &mut Env) -> Result<()> {
     match self {
       Self::Single { error, .. } => {
         if let Some(error) = error {
@@ -70,13 +70,6 @@ impl Status {
             error.println(env.err_mut()).context(error::Stderr)?;
           }
         }
-
-        errln!(
-          env,
-          "{}/{} files corrupted.",
-          files.iter().filter(|file| file.is_bad()).count(),
-          files.len(),
-        )?;
       }
     }
 

src/step.rs

@@ -15,7 +15,7 @@ pub(crate) trait Step {
       dim.suffix()
     )?;
 
-    err!(env, "{}{} ", message.prefix(), self.symbol())?;
+    err!(env, "{} {}", self.symbol(), message.prefix())?;
 
     self.write_message(env.err_mut()).context(error::Stderr)?;
 

src/subcommand/torrent/create.rs

@@ -208,7 +208,7 @@ impl Create {
 
     CreateStep::Searching.print(env)?;
 
-    let spinner = if env.err().is_styled() {
+    let spinner = if env.err().is_styled_term() {
       let style = ProgressStyle::default_spinner()
         .template("{spinner:.green} {msg:.bold}…")
         .tick_chars(consts::TICK_CHARS);
@@ -300,7 +300,7 @@ impl Create {
 
     CreateStep::Hashing.print(env)?;
 
-    let progress_bar = if env.err().is_styled() {
+    let progress_bar = if env.err().is_styled_term() {
       let style = ProgressStyle::default_bar()
         .template(
           "{spinner:.green} ⟪{elapsed_precise}⟫ ⟦{bar:40.cyan}⟧ \
@@ -380,7 +380,7 @@ impl Create {
       let status = metainfo.verify(&input, None)?;
 
       if !status.good() {
-        return Err(Error::Verify { status });
+        return Err(Error::Verify);
       }
     }