refactor: remove PromptNew trait and complete Prompt proc macro

Author: cilki

goldboot-image/src/lib.rs

@@ -459,7 +459,6 @@ impl ImageHandle {
     pub fn change_password(&self, _old_password: String, new_password: String) -> Result<()> {
         // Create the cipher and a RNG for the nonces
         let _cipher = new_key(new_password);
-        let _rng = rand::thread_rng();
 
         todo!()
     }

goldboot-image/src/qcow/mod.rs

@@ -1,5 +1,5 @@
-use anyhow::{bail, Result};
-use binrw::{io::SeekFrom, BinRead, BinReaderExt};
+use anyhow::{Result, bail};
+use binrw::{BinRead, BinReaderExt, io::SeekFrom};
 use snapshot::Snapshot;
 use std::{
     fs::File,

goldboot-linux/src/gui/select_image.rs

@@ -4,7 +4,7 @@ use goldboot::library::ImageLibrary;
 use goldboot_image::ImageHandle;
 use gtk::glib;
 use gtk4 as gtk;
-use gtk4::{prelude::*, EventControllerKey};
+use gtk4::{EventControllerKey, prelude::*};
 use tracing::info;
 use ubyte::ToByteUnit;
 

goldboot-macros/src/lib.rs

@@ -1,6 +1,6 @@
 use proc_macro::TokenStream;
 use quote::quote;
-use syn::{self, DataStruct};
+use syn::{self};
 
 /// Automatically implement "Prompt" for all fields in a struct.
 #[proc_macro_derive(Prompt)]
@@ -11,30 +11,70 @@ pub fn prompt(input: TokenStream) -> TokenStream {
 
 fn impl_prompt(ast: &syn::DeriveInput) -> TokenStream {
     let name = &ast.ident;
-    let fields: Vec<String> = match &ast.data {
+
+    let fields_to_prompt: Vec<_> = match &ast.data {
         syn::Data::Struct(data) => match &data.fields {
             syn::Fields::Named(fields) => fields
                 .named
                 .iter()
-                .map(|f| f.ident.clone().unwrap().to_string())
+                .filter_map(|f| {
+                    // Skip fields with #[serde(flatten)]
+                    let is_flattened = f.attrs.iter().any(|attr| {
+                        attr.path().is_ident("serde")
+                            && attr
+                                .parse_args::<syn::Ident>()
+                                .map(|i| i == "flatten")
+                                .unwrap_or(false)
+                    });
+
+                    if is_flattened {
+                        None
+                    } else {
+                        Some((f.ident.clone().unwrap(), f.ty.clone()))
+                    }
+                })
                 .collect(),
-            _ => panic!(),
+            _ => panic!("Prompt derive only works on structs with named fields"),
         },
-        _ => panic!(),
+        _ => panic!("Prompt derive only works on structs"),
     };
 
+    let prompt_calls = fields_to_prompt.iter().map(|(field, ty)| {
+        // Check if the type is an Option
+        if is_option_type(ty) {
+            quote! {
+                if let Some(ref mut value) = self.#field {
+                    value.prompt(foundry)?;
+                }
+            }
+        } else {
+            quote! {
+                self.#field.prompt(foundry)?;
+            }
+        }
+    });
+
     let syntax = quote! {
-        impl Prompt for #name {
+        impl crate::cli::prompt::Prompt for #name {
             fn prompt(
                 &mut self,
-                _: &Foundry,
-                theme: impl dialoguer::theme::Theme,
+                foundry: &crate::foundry::Foundry,
             ) -> anyhow::Result<()> {
-                todo!()
+                #(#prompt_calls)*
+                Ok(())
             }
         }
     };
     syntax.into()
 }
 
+fn is_option_type(ty: &syn::Type) -> bool {
+    if let syn::Type::Path(type_path) = ty {
+        if let Some(segment) = type_path.path.segments.last() {
+            return segment.ident == "Option";
+        }
+    }
+    false
+}
+
 // TODO probably need a macro for ImageMold and Fabricator

goldboot-registry/src/api/image.rs

@@ -1,8 +1,8 @@
 use crate::extract::ImageHandle;
 use axum::{
+    Json,
     extract::{Path, State},
     http::StatusCode,
-    Json,
 };
 use goldboot::registry::api::image::ImageInfoResponse;
 

goldboot-registry/src/main.rs

@@ -1,5 +1,5 @@
 use crate::cmd::Commands;
-use axum::{routing::get, Router};
+use axum::{Router, routing::get};
 use clap::Parser;
 use std::{env, process::ExitCode};
 

goldboot/src/cli/cmd/deploy.rs

@@ -1,5 +1,5 @@
 use console::Style;
-use dialoguer::{theme::ColorfulTheme, Confirm};
+use dialoguer::{Confirm, theme::ColorfulTheme};
 use goldboot_image::ImageHandle;
 use std::{path::Path, process::ExitCode};
 use tracing::error;

goldboot/src/cli/cmd/image.rs

@@ -11,7 +11,9 @@ pub fn run(cmd: super::Commands) -> ExitCode {
             super::ImageCommands::List {} => {
                 let images = ImageLibrary::find_all().unwrap();
 
-                println!("Image Name      Image Size   Build Date                      Image ID     Description");
+                println!(
+                    "Image Name      Image Size   Build Date                      Image ID     Description"
+                );
                 for image in images {
                     println!(
                         "{:15} {:12} {:31} {:12} {}",

goldboot/src/cli/cmd/init.rs

@@ -26,6 +26,14 @@ fn print_banner() {
     }
 }
 
+/// Get the current theme for prompts.
+pub fn theme() -> ColorfulTheme {
+    ColorfulTheme {
+        values_style: Style::new().yellow().dim(),
+        ..ColorfulTheme::default()
+    }
+}
+
 pub fn run(cmd: super::Commands) -> ExitCode {
     match cmd {
         super::Commands::Init {
@@ -75,10 +83,7 @@ pub fn run(cmd: super::Commands) -> ExitCode {
                 // If no OS was given, begin interactive config
                 print_banner();
 
-                let theme = ColorfulTheme {
-                    values_style: Style::new().yellow().dim(),
-                    ..ColorfulTheme::default()
-                };
+                let theme = theme();
 
                 println!("Get ready to create a new image configuration!");
                 println!("(it can be further edited later)");
@@ -160,8 +165,7 @@ pub fn run(cmd: super::Commands) -> ExitCode {
                         .unwrap()
                     {
                         // TODO show some kind of banner
-                        os.prompt(&foundry, Box::new(ColorfulTheme::default()))
-                            .unwrap();
+                        os.prompt(&foundry).unwrap();
                     }
 
                     if let Ok(source) = os.default_source(foundry.arch) {

goldboot/src/cli/cmd/liveusb.rs

@@ -1,6 +1,5 @@
 use console::Style;
-use dialoguer::{theme::ColorfulTheme, Confirm};
-use goldboot_image::ImageHandle;
+use dialoguer::{Confirm, theme::ColorfulTheme};
 use std::{path::Path, process::ExitCode};
 use tracing::error;