Merge branch 'sorted-output'

1 files changed, 18 insertions, 6 deletions

diff --git a/src/main.rs b/src/main.rs
index ee1c232..84d1063 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -25,6 +25,7 @@ use filters::{log::LogFilter, Inclusion};
 mod guilds;
 mod logger;
 mod output;
+use output::sorting::Sorting;
 mod paths;
 mod playerclass;
 use playerclass::PlayerClass;
@@ -79,6 +80,13 @@ pub struct Opt {
     #[structopt(long = "no-color")]
     no_color: bool,
 
+    /// Sort the output.
+    ///
+    /// Valid sorting fields are date, boss, cm and outcome. Prefix the field with ~ to sort in
+    /// descending order.
+    #[structopt(short = "s", long = "sort")]
+    sorting: Option<Sorting>,
+
     /// Print more debugging information to stderr.
     #[structopt(long = "debug")]
     debug: bool,
@@ -102,7 +110,7 @@ pub struct Opt {
 }
 
 /// A log that matches the search criteria.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct LogResult {
     /// The path to the log file.
     log_file: PathBuf,
@@ -150,7 +158,7 @@ impl Ord for Player {
 }
 
 /// Outcome of the fight.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub enum FightOutcome {
     Success,
     Wipe,
@@ -377,8 +385,9 @@ fn build_filter(expr_string: &str) -> Result<Box<dyn LogFilter>> {
 
 /// Run the grep search with the given options.
 fn grep(opt: &Opt, filter: &dyn LogFilter) -> Result<()> {
-    let pipeline = &output::build_pipeline(opt);
-    rayon::scope(|s| {
+    let pipeline = output::build_pipeline(opt);
+    let pipeline_ref = &pipeline;
+    let result: Result<()> = rayon::scope(|s| {
         let walker = WalkDir::new(&opt.path);
         for entry in walker {
             let entry = entry?;
@@ -391,7 +400,7 @@ fn grep(opt: &Opt, filter: &dyn LogFilter) -> Result<()> {
                     let search = search_log(&entry, filter);
                     match search {
                         Ok(None) => (),
-                        Ok(Some(result)) => pipeline.push_item(&result),
+                        Ok(Some(result)) => pipeline_ref.push_item(result),
                         Err(err) => {
                             debug!("Runtime error while scanning {:?}: {}", entry.path(), err);
                         }
@@ -400,7 +409,10 @@ fn grep(opt: &Opt, filter: &dyn LogFilter) -> Result<()> {
             });
         }
         Ok(())
-    })
+    });
+    result?;
+    pipeline.finish();
+    Ok(())
 }
 
 /// Search the given single log.