Consolidate main

src/clierror.rs → src/clitypes.rs

@@ -1,6 +1,50 @@
+#![macro_use]
 use std::borrow::ToOwned;
 use std::fmt;
 use std::io;
+use std::process::{ExitCode, Termination};
+
+macro_rules! wout {
+    ($($arg:tt)*) => ({
+        use std::io::Write;
+        (writeln!(&mut ::std::io::stdout(), $($arg)*)).unwrap();
+    });
+}
+
+macro_rules! werr {
+    ($($arg:tt)*) => ({
+        use std::io::Write;
+        use log::error;
+        error!("{}", $($arg)*);
+        (writeln!(&mut ::std::io::stderr(), $($arg)*)).unwrap();
+    });
+}
+
+// TODO: format parameter so we don't need to do fail!(format!())
+macro_rules! fail {
+    ($e:expr) => {{
+        use log::error;
+        let err = ::std::convert::From::from($e);
+        error!("{err}");
+        Err(err)
+    }};
+}
+
+#[repr(u8)]
+pub enum QsvExitCode {
+    Good = 0,
+    Bad = 1,
+    IncorrectUsage = 2,
+    Abort = 255,
+}
+
+impl Termination for QsvExitCode {
+    fn report(self) -> ExitCode {
+        ExitCode::from(self as u8)
+    }
+}
+
+pub type CliResult<T> = Result<T, CliError>;
 
 #[derive(Debug)]
 pub enum CliError {

src/main.rs

@@ -42,10 +42,9 @@
 
 extern crate crossbeam_channel as channel;
 
-use crate::clierror::CliError;
+use crate::clitypes::{CliError, CliResult, QsvExitCode};
 use std::env;
 use std::io;
-use std::process::{ExitCode, Termination};
 use std::time::Instant;
 
 use docopt::Docopt;
@@ -59,32 +58,6 @@ use pyo3::Python;
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
-macro_rules! wout {
-    ($($arg:tt)*) => ({
-        use std::io::Write;
-        (writeln!(&mut ::std::io::stdout(), $($arg)*)).unwrap();
-    });
-}
-
-macro_rules! werr {
-    ($($arg:tt)*) => ({
-        use std::io::Write;
-        use log::error;
-        error!("{}", $($arg)*);
-        (writeln!(&mut ::std::io::stderr(), $($arg)*)).unwrap();
-    });
-}
-
-// TODO: format parameter so we don't need to do fail!(format!())
-macro_rules! fail {
-    ($e:expr) => {{
-        use log::error;
-        let err = ::std::convert::From::from($e);
-        error!("{err}");
-        Err(err)
-    }};
-}
-
 macro_rules! command_list {
     () => {
         "
@@ -142,7 +115,7 @@ macro_rules! command_list {
 "
     };
 }
-mod clierror;
+mod clitypes;
 mod cmd;
 mod config;
 mod index;
@@ -168,20 +141,6 @@ Options:
 "
 );
 
-#[repr(u8)]
-pub enum QsvExitCode {
-    Good = 0,
-    Bad = 1,
-    IncorrectUsage = 2,
-    Abort = 255,
-}
-
-impl Termination for QsvExitCode {
-    fn report(self) -> ExitCode {
-        ExitCode::from(self as u8)
-    }
-}
-
 #[derive(Deserialize)]
 struct Args {
     arg_command: Option<Command>,
@@ -201,7 +160,7 @@ fn main() -> QsvExitCode {
     #[cfg(feature = "python")]
     if !check_python() {
         werr!("Python 3.8+ required.");
-        return QsvExitCode::IncorrectUsage;
+        return QsvExitCode::Abort;
     }
 
     let now = Instant::now();
@@ -261,8 +220,9 @@ Please choose one of the following commands:",
                 QsvExitCode::Bad
             }
             Err(CliError::Io(ref err)) if err.kind() == io::ErrorKind::BrokenPipe => {
+                werr!("Broken pipe: {err}");
                 util::log_end(qsv_args, now);
-                QsvExitCode::Good
+                QsvExitCode::Abort
             }
             Err(CliError::Io(err)) => {
                 werr!("{err}");
@@ -415,5 +375,3 @@ impl Command {
         }
     }
 }
-
-pub type CliResult<T> = Result<T, CliError>;

src/maindp.rs

@@ -1,10 +1,9 @@
 #![allow(dead_code)]
 extern crate crossbeam_channel as channel;
 
-use crate::clierror::CliError;
+use crate::clitypes::{CliError, CliResult, QsvExitCode};
 use std::env;
 use std::io;
-use std::process::{ExitCode, Termination};
 use std::time::Instant;
 
 use docopt::Docopt;
@@ -15,31 +14,6 @@ use serde::Deserialize;
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
-macro_rules! wout {
-    ($($arg:tt)*) => ({
-        use std::io::Write;
-        (writeln!(&mut ::std::io::stdout(), $($arg)*)).unwrap();
-    });
-}
-
-macro_rules! werr {
-    ($($arg:tt)*) => ({
-        use std::io::Write;
-        use log::error;
-        error!("{}", $($arg)*);
-        (writeln!(&mut ::std::io::stderr(), $($arg)*)).unwrap();
-    });
-}
-
-macro_rules! fail {
-    ($e:expr) => {{
-        use log::error;
-        let err = ::std::convert::From::from($e);
-        error!("{err}");
-        Err(err)
-    }};
-}
-
 macro_rules! command_list {
     () => {
         "
@@ -70,7 +44,7 @@ macro_rules! command_list {
 "
     };
 }
-mod clierror;
+mod clitypes;
 mod cmd;
 mod config;
 mod index;
@@ -94,20 +68,6 @@ Options:
 * sponsored by datHere - Data Infrastructure Engineering
 "
 );
-
-pub enum QsvExitCode {
-    Good = 0,
-    Bad = 1,
-    IncorrectUsage = 2,
-    Abort = 255,
-}
-
-impl Termination for QsvExitCode {
-    fn report(self) -> ExitCode {
-        ExitCode::from(self as u8)
-    }
-}
-
 #[derive(Deserialize)]
 struct Args {
     arg_command: Option<Command>,
@@ -168,8 +128,9 @@ Please choose one of the following commands:",
                 QsvExitCode::Bad
             }
             Err(CliError::Io(ref err)) if err.kind() == io::ErrorKind::BrokenPipe => {
+                werr!("Broken pipe: {err}");
                 util::log_end(qsv_args, now);
-                QsvExitCode::Good
+                QsvExitCode::Abort
             }
             Err(CliError::Io(err)) => {
                 werr!("{err}");
@@ -257,5 +218,3 @@ impl Command {
         }
     }
 }
-
-pub type CliResult<T> = Result<T, CliError>;

src/mainlite.rs

@@ -1,10 +1,9 @@
 #![allow(dead_code)]
 extern crate crossbeam_channel as channel;
 
-use crate::clierror::CliError;
+use crate::clitypes::{CliError, CliResult, QsvExitCode};
 use std::env;
 use std::io;
-use std::process::{ExitCode, Termination};
 use std::time::Instant;
 
 use docopt::Docopt;
@@ -15,31 +14,6 @@ use serde::Deserialize;
 #[global_allocator]
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
-macro_rules! wout {
-    ($($arg:tt)*) => ({
-        use std::io::Write;
-        (writeln!(&mut ::std::io::stdout(), $($arg)*)).unwrap();
-    });
-}
-
-macro_rules! werr {
-    ($($arg:tt)*) => ({
-        use std::io::Write;
-        use log::error;
-        error!("{}", $($arg)*);
-        (writeln!(&mut ::std::io::stderr(), $($arg)*)).unwrap();
-    });
-}
-
-macro_rules! fail {
-    ($e:expr) => {{
-        use log::error;
-        let err = ::std::convert::From::from($e);
-        error!("{err}");
-        Err(err)
-    }};
-}
-
 macro_rules! command_list {
     () => {
         "
@@ -88,7 +62,7 @@ macro_rules! command_list {
 "
     };
 }
-mod clierror;
+mod clitypes;
 mod cmd;
 mod config;
 mod index;
@@ -114,19 +88,6 @@ Options:
 "
 );
 
-pub enum QsvExitCode {
-    Good = 0,
-    Bad = 1,
-    IncorrectUsage = 2,
-    Abort = 255,
-}
-
-impl Termination for QsvExitCode {
-    fn report(self) -> ExitCode {
-        ExitCode::from(self as u8)
-    }
-}
-
 #[derive(Deserialize)]
 struct Args {
     arg_command: Option<Command>,
@@ -195,8 +156,9 @@ Please choose one of the following commands:",
                 QsvExitCode::Bad
             }
             Err(CliError::Io(ref err)) if err.kind() == io::ErrorKind::BrokenPipe => {
+                werr!("Broken pipe: {err}");
                 util::log_end(qsv_args, now);
-                QsvExitCode::Good
+                QsvExitCode::Abort
             }
             Err(CliError::Io(err)) => {
                 werr!("{err}");
@@ -321,5 +283,3 @@ impl Command {
         }
     }
 }
-
-pub type CliResult<T> = Result<T, CliError>;