add constructor to EraseOptions

Author: br0kenpixel

src/dbmgr/mod.rs

@@ -5,7 +5,10 @@ use crate::{
         db::{DatabaseBackend, DatabaseClient, EraseOptions},
     },
 };
-use std::{io::stdin, process::exit};
+use std::{
+    io::{Write, stdin, stdout},
+    process::exit,
+};
 use tracing::{debug, error, info};
 
 #[allow(clippy::cognitive_complexity)]
@@ -46,16 +49,7 @@ pub async fn main(cmd: DatabaseCommand, config: &Config) {
             info!("Connected to the database");
             confirm_erase(&config.database.name(), &config.database.host());
 
-            let opts = if content_only && keep_devices {
-                EraseOptions::ContentOnly { keep_devices: true }
-            } else if content_only {
-                EraseOptions::ContentOnly {
-                    keep_devices: false,
-                }
-            } else {
-                EraseOptions::Everything
-            };
-
+            let opts = EraseOptions::new(content_only, keep_devices);
             match client.erase(opts).await {
                 Ok(()) => info!("Success!"),
                 Err(why) => error!("Failed to erase database: {why}"),
@@ -77,6 +71,8 @@ fn confirm_erase(database_name: &str, host: &str) {
     println!();
     print!("Type '{KEY}' to confirm: ");
 
+    let _ = stdout().flush();
+
     let mut buf = String::new();
     stdin().read_line(&mut buf).unwrap_or_default();
 

src/server/db/mod.rs

@@ -231,3 +231,13 @@ impl DatabaseBackend for DatabaseClient {
         }
     }
 }
+
+impl EraseOptions {
+    pub const fn new(content_only: bool, keep_devices: bool) -> Self {
+        if content_only {
+            Self::ContentOnly { keep_devices }
+        } else {
+            Self::Everything
+        }
+    }
+}