feat: display running version in app tui

* Added `VersionInfo` component to display details about currently
  running version of `ssh-portfolio` inside the TUI
* Reduced 5s wait for terminal info query to 1s (potential race
  condition?)
* Export version string in CLI module for reuse in `VersionInfo`
  component
* Include `-dirty` suffix if git tree is dirty (has uncommitted changes)

Author: CompeyDev

src/app.rs

@@ -46,6 +46,7 @@ pub struct App {
     cat: Arc<Mutex<Cat>>,
     #[cfg(feature = "blog")]
     blog_posts: Arc<Mutex<BlogPosts>>,
+    version_info: Arc<Mutex<VersionInfo>>,
 }
 
 #[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
@@ -83,6 +84,8 @@ impl App {
             rt.block_on(content.try_lock()?.blog_content())?,
         )));
 
+        let version_info = Arc::new(Mutex::new(VersionInfo::new()));
+
         Ok(Self {
             terminal_info,
             tick_rate,
@@ -105,6 +108,7 @@ impl App {
             cat,
             #[cfg(feature = "blog")]
             blog_posts,
+            version_info,
         })
     }
 
@@ -140,13 +144,14 @@ impl App {
             self.cat.try_lock()?.register_config_handler(self.config.clone())?;
             #[cfg(feature = "blog")]
             self.blog_posts.try_lock()?.register_config_handler(self.config.clone())?;
+            self.version_info.try_lock()?.register_config_handler(self.config.clone())?;
 
-            for _ in 1..50 {
+            for _ in 1..5 {
                 if matches!(
                     self.terminal_info.blocking_read().kind(),
                     TerminalKind::Unsupported(UnsupportedReason::Unprobed)
                 ) {
-                    tracing::debug!("Waiting for 5s for terminal info to be probed");
+                    tracing::debug!("Waiting for for terminal info to be probed");
                     std::thread::sleep(Duration::from_millis(100));
                 }
             }
@@ -158,6 +163,7 @@ impl App {
             self.cat.try_lock()?.init(self.terminal_info.clone(), size)?;
             #[cfg(feature = "blog")]
             self.blog_posts.try_lock()?.init(self.terminal_info.clone(), size)?;
+            self.version_info.try_lock()?.init(self.terminal_info.clone(), size)?;
 
             Ok::<_, eyre::Error>(())
         })?;
@@ -377,6 +383,21 @@ impl App {
             )
             .map_err(std::io::Error::other)?;
 
+            // Render version and uptime version info
+            self.version_info
+                .try_lock()
+                .map_err(std::io::Error::other)?
+                .draw(
+                    frame,
+                    Rect {
+                        x: chunks[0].x,
+                        y: chunks[0].y + 1,
+                        width: chunks[0].width - 2,
+                        height: 1,
+                    },
+                )
+                .map_err(std::io::Error::other)?;
+
             // Render the content
             let content_rect = Rect {
                 x: chunks[1].x,

src/cli.rs

@@ -3,6 +3,17 @@ use indoc::formatdoc;
 
 use crate::config::{get_config_dir, get_data_dir};
 
+lazy_static::lazy_static! {
+    pub static ref VERSION: String = {
+        let mut version = format!("v{}-{}", env!("CARGO_PKG_VERSION"), &env!("VERGEN_GIT_SHA")[..7]);
+        if env!("VERGEN_GIT_DIRTY") == "true" {
+            version.push_str("-dirty");
+        }
+
+        version
+    };
+}
+
 #[derive(Parser, Debug)]
 #[command(author, version = version(), about)]
 pub struct Cli {
@@ -28,9 +39,8 @@ pub struct Cli {
 pub fn version() -> String {
     let author = clap::crate_authors!();
     let version_message = format!(
-        "v{}-{} ({}, {})",
-        env!("CARGO_PKG_VERSION"),
-        &env!("VERGEN_GIT_SHA")[..7],
+        "{} ({}, {})",
+        *VERSION,
         env!("VERGEN_GIT_BRANCH"),
         env!("VERGEN_BUILD_DATE")
     );

src/components.rs

@@ -22,6 +22,7 @@ mod cat;
 mod content;
 #[cfg(feature = "blog")]
 mod selection_list;
+mod version_info;
 mod tabs;
 
 #[cfg(feature = "blog")]
@@ -31,6 +32,7 @@ pub use cat::*;
 pub use content::*;
 #[cfg(feature = "blog")]
 pub use selection_list::*;
+pub use version_info::*;
 pub use tabs::*;
 
 /// `Component` is a trait that represents a visual and interactive element of the user interface.

src/components/version_info.rs

@@ -0,0 +1,68 @@
+use std::default::Default;
+
+use color_eyre::eyre::Result;
+use ratatui::prelude::*;
+use ratatui::widgets::Paragraph;
+use tokio::sync::mpsc::UnboundedSender;
+
+use crate::action::Action;
+use crate::components::Component;
+use crate::config::Config;
+use crate::cli::VERSION;
+
+#[derive(Debug, Default)]
+pub struct VersionInfo {
+    config: Config,
+    action_tx: Option<UnboundedSender<Action>>,
+}
+
+impl VersionInfo {
+    pub fn new() -> Self {
+        Self { ..Default::default() }
+    }
+
+    #[rustfmt::skip]
+    pub fn status_content(&self) -> Line<'static> {
+        let shell_style = Style::new().fg(Color::Indexed(183));
+        Line::from(vec![
+            Span::styled("󰇁 ", shell_style.dim()),
+            Span::styled(env!("CARGO_PKG_NAME"), shell_style.bold()),
+            Span::styled(format!(" ({}@{})", env!("VERGEN_GIT_BRANCH"), *VERSION), Style::new().fg(Color::Green).italic()),
+            Span::styled("█", shell_style.add_modifier(Modifier::BOLD | Modifier::RAPID_BLINK)),
+        ])
+    }
+}
+
+impl Component for VersionInfo {
+    fn register_config_handler(&mut self, config: Config) -> Result<()> {
+        self.config = config;
+        Ok(())
+    }
+
+    fn register_action_handler(&mut self, tx: UnboundedSender<Action>) -> Result<()> {
+        self.action_tx = Some(tx);
+        Ok(())
+    }
+
+    fn update(&mut self, action: Action) -> Result<Option<Action>> {
+        match action {
+            Action::Tick => {}
+            Action::Render => {}
+            _ => {}
+        };
+
+        Ok(None)
+    }
+
+    fn draw(
+        &mut self,
+        frame: &mut ratatui::Frame,
+        area: ratatui::prelude::Rect,
+    ) -> Result<()> {
+        Paragraph::new(self.status_content())
+            .alignment(Alignment::Right)
+            .render(area, frame.buffer_mut());
+
+        Ok(())
+    }
+}