Exposed priority commands to the binary

Author: Kixiron

src/bin/cratesfyi.rs

@@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
 
 use clap::{App, AppSettings, Arg, SubCommand};
 use cratesfyi::db::{add_path_into_database, connect_db};
-use cratesfyi::utils::add_crate_to_queue;
+use cratesfyi::utils::{add_crate_to_queue, remove_crate_priority, set_crate_priority};
 use cratesfyi::Server;
 use cratesfyi::{db, DocBuilder, DocBuilderOptions, RustwideBuilder};
 
@@ -140,7 +140,26 @@ pub fn main() {
                     .short("p")
                     .long("priority")
                     .help("Priority of build (default: 5) (new crate builds get priority 0)")
-                    .takes_value(true))))
+                    .takes_value(true)))
+            .subcommand(SubCommand::with_name("priority")
+                .about("Interactions with build queue priorities")
+                .setting(AppSettings::ArgRequiredElseHelp)
+                .subcommand(SubCommand::with_name("set")
+                    .about("Set all crates matching the given pattern to a priority level")
+                    .arg(Arg::with_name("PATTERN")
+                        .index(1)
+                        .required(true)
+                        .help("See https://www.postgresql.org/docs/current/functions-matching.html"))
+                    .arg(Arg::with_name("PRIORITY")
+                        .index(2)
+                        .required(true)
+                        .help("The priority to give crates matching PATTERN"))
+                .subcommand(SubCommand::with_name("remove")
+                    .about("Remove the prioritization of crates by the given pattern")
+                    .arg(Arg::with_name("PATTERN")
+                        .index(1)
+                        .required(true)
+                        .help("See https://www.postgresql.org/docs/current/functions-matching.html"))))))
         .get_matches();
 
     if let Some(matches) = matches.subcommand_matches("build") {
@@ -299,6 +318,29 @@ pub fn main() {
                 priority,
             )
             .expect("Could not add crate to queue");
+        } else if let Some(matches) = matches.subcommand_matches("set") {
+            let pattern = matches
+                .value_of("PATTERN")
+                .expect("You must give a pattern to match with");
+            let priority = clap::value_t!(matches.value_of("PRIORITY"), i32)
+                .expect("You must give a priority for a crate");
+            let conn = connect_db().expect("Could not connect to the database");
+
+            set_crate_priority(&conn, pattern, priority).expect("Could not set pattern's priority");
+        } else if let Some(matches) = matches.subcommand_matches("remove") {
+            let pattern = matches
+                .value_of("PATTERN")
+                .expect("You must give a pattern to remove");
+            let conn = connect_db().expect("Could not connect to the database");
+
+            if remove_crate_priority(&conn, pattern)
+                .expect("Could not remove pattern's priority")
+                .is_some()
+            {
+                println!("Removed pattern");
+            } else {
+                println!("Pattern did not exist and so was not removed");
+            }
         }
     }
 }

src/utils/mod.rs

@@ -5,7 +5,9 @@ pub(crate) use self::copy::copy_doc_dir;
 pub use self::daemon::start_daemon;
 pub use self::github_updater::github_updater;
 pub use self::html::extract_head_and_body;
-pub use self::queue::{add_crate_to_queue, get_crate_priority};
+pub use self::queue::{
+    add_crate_to_queue, get_crate_priority, remove_crate_priority, set_crate_priority,
+};
 pub use self::release_activity_updater::update_release_activity;
 pub(crate) use self::rustc_version::parse_rustc_version;
 

src/utils/queue.rs

@@ -21,6 +21,31 @@ pub fn get_crate_priority(conn: &Connection, name: &str) -> Result<i32> {
     }
 }
 
+/// Set all crates that match [`pattern`] to have a certain priority
+///
+/// Note: `pattern` is used in a `LIKE` statement, so it must follow the postgres like syntax
+///
+/// [`pattern`]: https://www.postgresql.org/docs/8.3/functions-matching.html
+pub fn set_crate_priority(conn: &Connection, pattern: &str, priority: i32) -> Result<()> {
+    conn.query(
+        "INSERT INTO crate_priorities (pattern, priority) VALUES ($1, $2)",
+        &[&pattern, &priority],
+    )?;
+
+    Ok(())
+}
+
+/// Remove a pattern from the priority table, returning the priority that it was associated with or `None`
+/// if nothing was removed
+pub fn remove_crate_priority(conn: &Connection, pattern: &str) -> Result<Option<i32>> {
+    let query = conn.query(
+        "DELETE FROM crate_priorities WHERE pattern = $1 RETURNING priority",
+        &[&pattern],
+    )?;
+
+    Ok(query.iter().next().map(|row| row.get(0)))
+}
+
 /// Adds a crate to the build queue to be built by rustdoc. `priority` should be gotten from `get_crate_priority`
 pub fn add_crate_to_queue(
     conn: &Connection,
@@ -41,31 +66,6 @@ mod tests {
     use super::*;
     use crate::test::wrapper;
 
-    /// Set all crates that match [`pattern`] to have a certain priority
-    ///
-    /// Note: `pattern` is used in a `LIKE` statement, so it must follow the postgres like syntax
-    ///
-    /// [`pattern`]: https://www.postgresql.org/docs/8.3/functions-matching.html
-    pub fn set_crate_priority(conn: &Connection, pattern: &str, priority: i32) -> Result<()> {
-        conn.query(
-            "INSERT INTO crate_priorities (pattern, priority) VALUES ($1, $2)",
-            &[&pattern, &priority],
-        )?;
-
-        Ok(())
-    }
-
-    /// Remove a pattern from the priority table, returning the priority that it was associated with or `None`
-    /// if nothing was removed
-    pub fn remove_crate_priority(conn: &Connection, pattern: &str) -> Result<Option<i32>> {
-        let query = conn.query(
-            "DELETE FROM crate_priorities WHERE pattern = $1 RETURNING priority",
-            &[&pattern],
-        )?;
-
-        Ok(query.iter().next().map(|row| row.get(0)))
-    }
-
     #[test]
     fn set_priority() {
         wrapper(|env| {