Add "rev" detail to default view of keys

src/app/style.rs

@@ -1,8 +1,11 @@
 use clap::ValueEnum;
+use core::panic;
 use ratatui::style::{Color, Style as TuiStyle};
 use ratatui::text::{Line, Span, Text};
 use std::fmt::{Display, Formatter, Result as FmtResult};
 
+use crate::gpg::key;
+
 /// Application style.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, ValueEnum)]
 pub enum Style {
@@ -62,6 +65,7 @@ pub fn get_colored_table_row<'a>(
 			line.find('[').unwrap_or_default(),
 			line.find(']').unwrap_or_default(),
 		);
+
 		row.push(
 			// Colorize inside the brackets to start.
 			if second_bracket > first_bracket + 1 {
@@ -149,6 +153,116 @@ pub fn get_colored_table_row<'a>(
 						highlight_style,
 					));
 				// Colorize inside the arrows.
+
+				// FIXME: These need updating for breakage
+				} else if let (
+					Some(first_parenthesis),
+					Some(second_parenthesis),
+				) = (data.rfind('('), data.rfind(')'))
+				{
+					let inner = line[first_parenthesis..].to_string();
+
+					log::trace!(target: "style", "inner: {inner:?}");
+
+					// panic!("{:?}", data);
+
+					let expected = [
+						// expired
+						String::from("exp"),
+						// revoked
+						String::from("rev"),
+						// disabled
+						String::from("d"),
+						// invalid
+						String::from("i"),
+					];
+
+					let matched: Vec<_> = data.match_indices("(").collect();
+					// panic!("{:?}", matched);
+
+					// let s = String::from("foo rev bar");
+					// let matched: Vec<_> = s.match_indices("(").collect();
+
+					// panic!(
+					// 	"Data: {:?}, Inner: {:?}, Contains? {:?}",
+					// 	&s,
+					// 	&inner,
+					// 	s.contains(&inner)
+					// );
+
+					if let Some((opening_parenthesis, char)) =
+						data.match_indices("(").next()
+					{
+						let inner = data[(opening_parenthesis + 1)
+							..(opening_parenthesis + 4)]
+							.to_string();
+
+						// THIS WORKS
+						// panic!(
+						// 	"Data: {:?}, Inner: {:?}, Contains? {:?}",
+						// 	&data,
+						// 	&inner,
+						// 	expected.contains(&inner)
+						// );
+
+						if [
+							// expired
+							String::from("exp"),
+							// revoked
+							String::from("rev"),
+							// disabled
+							String::from("d"),
+							// invalid
+							String::from("i"),
+						]
+						.contains(&inner)
+						{
+							colored_line.push(Span::styled(
+								data[..first_parenthesis].to_string(),
+								highlight_style,
+							));
+							colored_line.push(Span::styled(
+								"(",
+								TuiStyle::default().fg(Color::DarkGray),
+							));
+							colored_line.push(Span::styled(
+								data[first_parenthesis + 1..second_parenthesis]
+									.to_string(),
+								TuiStyle::default().fg(Color::Red),
+							));
+							colored_line.push(Span::styled(
+								")",
+								TuiStyle::default().fg(Color::DarkGray),
+							));
+							colored_line.push(Span::styled(
+								data[second_parenthesis + 1..].to_string(),
+								highlight_style,
+							));
+						}
+					}
+
+				// colored_line.push(Span::styled(
+				// 	data[..first_parenthesis].to_string(),
+				// 	highlight_style,
+				// ));
+				// colored_line.push(Span::styled(
+				// 	"{",
+				// 	TuiStyle::default().fg(Color::DarkGray),
+				// ));
+				// colored_line.push(Span::styled(
+				// 	data[first_parenthesis + 1..second_parenthesis]
+				// 		.to_string(),
+				// 	TuiStyle::default().fg(Color::Cyan),
+				// ));
+				// colored_line.push(Span::styled(
+				// 	"}",
+				// 	TuiStyle::default().fg(Color::DarkGray),
+				// ));
+				// colored_line.push(Span::styled(
+				// 	data[second_parenthesis + 1..].to_string(),
+				// 	highlight_style,
+				// ));
+				// FIXME
 				} else if let (Some(first_arrow), Some(second_arrow)) =
 					(data.rfind('<'), data.rfind('>'))
 				{

src/gpg/key.rs

@@ -127,10 +127,36 @@ impl GpgKey {
 	) -> Vec<String> {
 		let mut key_info = Vec::new();
 		let subkeys = self.inner.subkeys().collect::<Vec<Subkey>>();
+		let blank = String::from("");
 		for (i, subkey) in subkeys.iter().enumerate() {
 			key_info.push(format!(
-				"[{}]{}{}/{}",
+				"[{}] {} {}{}/{}",
 				handler::get_subkey_flags(*subkey),
+				format!(
+					"{}",
+					if i != subkeys.len() - 1 {
+						let last = subkeys.last();
+						if let Some(key) = last {
+							if key.is_expired() {
+								String::from("(exp)")
+							} else if key.is_revoked() {
+								String::from("(rev)")
+							} else if key.is_disabled() {
+								String::from("(d)")
+							} else if key.is_invalid() {
+								String::from("(i)")
+							} else if key.is_qualified() {
+								String::from("(q)")
+							} else {
+								blank.to_string()
+							}
+						} else {
+							blank.to_string()
+						}
+					} else {
+						blank.to_string()
+					}
+				),
 				if default_key.map(|v| v.trim_start_matches("0x"))
 					== subkey.id().ok()
 				{
@@ -227,14 +253,16 @@ impl GpgKey {
 				"│   "
 			};
 			user_signatures.push(format!(
-				" {}  {}[{:x}] {} {}",
+				" {}  {}[{:x}] {}, {} {}",
 				padding,
 				if i == signatures.len() - 1 {
 					"└─"
 				} else {
 					"├─"
 				},
 				sig.cert_class(),
+				// FIXME??
+				format!("REV: {}", sig.is_revocation()),
 				if sig.signer_key_id() == self.inner.id() {
 					String::from("selfsig")
 				} else if truncate {