Add --limit option to "db jobs"

Signed-off-by: Matthias Beyer <matthias.beyer@atos.net>

2 files changed, 21 insertions, 1 deletions

diff --git a/src/cli.rs b/src/cli.rs
index 1473164..f2f5bf0 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -212,6 +212,16 @@ pub fn cli<'a>() -> App<'a> {
                     .value_name("KV")
                     .about("Filter for this \"key=value\" environment variable")
                 )
+
+                .arg(Arg::new("limit")
+                    .required(false)
+                    .multiple(false)
+                    .long("limit")
+                    .short('L')
+                    .takes_value(true)
+                    .value_name("LIMIT")
+                    .about("Only list newest <LIMIT> jobs instead of all")
+                )
             )
 
             .subcommand(App::new("job")
diff --git a/src/commands/db.rs b/src/commands/db.rs
index 7dbf08a..ba66c14 100644
--- a/src/commands/db.rs
+++ b/src/commands/db.rs
@@ -11,6 +11,7 @@
 use std::io::Write;
 use std::path::PathBuf;
 use std::process::Command;
+use std::str::FromStr;
 
 use anyhow::Context;
 use anyhow::Error;
@@ -342,8 +343,17 @@ fn jobs(conn_cfg: DbConnectionConfig, matches: &ArgMatches) -> Result<()> {
         sel
     };
 
-    let data = sel.load::<(models::Job, models::Submit, models::Endpoint, models::Package)>(&conn)?
+    let sel = if let Some(limit) = matches.value_of("limit").map(i64::from_str).transpose()? {
+        sel.limit(limit)
+    } else {
+        sel
+    };
+
+    let data = sel
+        .order_by(schema::jobs::id.desc()) // required for the --limit implementation
+        .load::<(models::Job, models::Submit, models::Endpoint, models::Package)>(&conn)?
         .into_iter()
+        .rev() // required for the --limit implementation
         .map(|(job, submit, ep, package)| {
             let success = crate::log::ParsedLog::build_from(&job.log_text)?
                 .is_successfull()