Make 'blacklist' a subcommand of 'database'

Author: Koenraad Verheyden

src/bin/cratesfyi.rs

@@ -77,19 +77,6 @@ pub fn main() {
             .subcommand(SubCommand::with_name("unlock")
                 .about("Unlocks cratesfyi daemon to continue building new crates"))
             .subcommand(SubCommand::with_name("print-options")))
-        .subcommand(SubCommand::with_name("blacklist")
-            .about("Blacklist operations")
-            .setting(AppSettings::ArgRequiredElseHelp)
-            .subcommand(SubCommand::with_name("add")
-                .about("Add a crate to the blacklist")
-                .arg(Arg::with_name("CRATE_NAME")
-                    .required(true)
-                    .help("Crate name")))
-            .subcommand(SubCommand::with_name("remove")
-                .about("Remove a crate from the blacklist")
-                .arg(Arg::with_name("CRATE_NAME")
-                    .required(true)
-                    .help("Crate name"))))
         .subcommand(SubCommand::with_name("start-web-server")
             .about("Starts web server")
             .arg(Arg::with_name("SOCKET_ADDR")
@@ -129,7 +116,20 @@ pub fn main() {
                 .arg(Arg::with_name("CRATE_NAME")
                     .takes_value(true)
                     .required(true)
-                    .help("Name of the crate to delete"))))
+                    .help("Name of the crate to delete")))
+            .subcommand(SubCommand::with_name("blacklist")
+                .about("Blacklist operations")
+                .setting(AppSettings::ArgRequiredElseHelp)
+                .subcommand(SubCommand::with_name("add")
+                    .about("Add a crate to the blacklist")
+                    .arg(Arg::with_name("CRATE_NAME")
+                        .required(true)
+                        .help("Crate name")))
+                .subcommand(SubCommand::with_name("remove")
+                    .about("Remove a crate from the blacklist")
+                    .arg(Arg::with_name("CRATE_NAME")
+                        .required(true)
+                        .help("Crate name")))))
         .subcommand(SubCommand::with_name("queue")
             .about("Interactions with the build queue")
             .setting(AppSettings::ArgRequiredElseHelp)
@@ -213,18 +213,6 @@ pub fn main() {
             println!("{:?}", docbuilder.options());
         }
 
-    } else if let Some(matches) = matches.subcommand_matches("blacklist") {
-        let conn = db::connect_db().expect("Failed to connect to the database");
-
-        if let Some(matches) = matches.subcommand_matches("add") {
-            let crate_name = matches.value_of("CRATE_NAME").expect("Verified by clap");
-            db::blacklist::add_crate(&conn, crate_name).expect("Failed to add crate to blacklist");
-
-        } else if let Some(matches) = matches.subcommand_matches("remove") {
-            let crate_name = matches.value_of("CRATE_NAME").expect("Verified by clap");
-            db::blacklist::remove_crate(&conn, crate_name).expect("Failed to remove crate from blacklist");
-        }
-
     } else if let Some(matches) = matches.subcommand_matches("database") {
         if let Some(matches) = matches.subcommand_matches("migrate") {
             let version = matches.value_of("VERSION").map(|v| v.parse::<i64>()
@@ -260,6 +248,17 @@ pub fn main() {
             let name = matches.value_of("CRATE_NAME").expect("missing crate name");
             let conn = db::connect_db().expect("failed to connect to the database");
             db::delete_crate(&conn, &name).expect("failed to delete the crate");
+        } else if let Some(matches) = matches.subcommand_matches("blacklist") {
+            let conn = db::connect_db().expect("failed to connect to the database");
+
+            if let Some(matches) = matches.subcommand_matches("add") {
+                let crate_name = matches.value_of("CRATE_NAME").expect("verified by clap");
+                db::blacklist::add_crate(&conn, crate_name).expect("failed to add crate to blacklist");
+
+            } else if let Some(matches) = matches.subcommand_matches("remove") {
+                let crate_name = matches.value_of("CRATE_NAME").expect("verified by clap");
+                db::blacklist::remove_crate(&conn, crate_name).expect("failed to remove crate from blacklist");
+            }
         }
 
     } else if let Some(matches) = matches.subcommand_matches("start-web-server") {