4 files changed, 122 insertions, 49 deletions
diff --git a/src/display/components/header_details.rs b/src/display/components/header_details.rs
new file mode 100644
index 0000000..042d667
--- /dev/null
+++ b/src/display/components/header_details.rs
@@ -0,0 +1,117 @@
+use crate::display::{DisplayBandwidth, UIState};
+use ::std::time::{Duration, Instant};
+use ::tui::backend::Backend;
+use ::tui::layout::{Alignment, Rect};
+use ::tui::style::{Color, Modifier, Style};
+use ::tui::terminal::Frame;
+use ::tui::widgets::{Paragraph, Text, Widget};
+
+const SECONDS_IN_DAY: u64 = 86400;
+
+pub struct HeaderDetails<'a> {
+    pub state: &'a UIState,
+    pub elapsed_time: std::time::Duration,
+    pub paused: bool,
+}
+
+pub fn elapsed_time(last_start_time: Instant, cumulative_time: Duration, paused: bool) -> Duration {
+    if paused {
+        cumulative_time
+    } else {
+        cumulative_time + last_start_time.elapsed()
+    }
+}
+
+impl<'a> HeaderDetails<'a> {
+    #[allow(clippy::int_plus_one)]
+    pub fn render(&self, frame: &mut Frame<impl Backend>, rect: Rect) {
+        let bandwidth = self.bandwidth_string();
+        let mut elapsed_time = None;
+        let print_elapsed_time = if self.state.cumulative_mode {
+            elapsed_time = Some(self.elapsed_time_string());
+            bandwidth.len() + elapsed_time.as_ref().unwrap().len() + 1 <= rect.width as usize
+        } else {
+            false
+        };
+
+        let color = if self.paused {
+            Color::Yellow
+        } else {
+            Color::Green
+        };
+
+        if print_elapsed_time {
+            self.render_elapsed_time(frame, rect, elapsed_time.as_ref().unwrap(), color);
+        }
+        self.render_bandwidth(frame, rect, &bandwidth, color);
+    }
+
+    fn render_bandwidth(
+        &self,
+        frame: &mut Frame<impl Backend>,
+        rect: Rect,
+        bandwidth: &str,
+        color: Color,
+    ) {
+        let bandwidth_text = {
+            [Text::styled(
+                bandwidth,
+                Style::default().fg(color).modifier(Modifier::BOLD),
+            )]
+        };
+
+        Paragraph::new(bandwidth_text.iter())
+            .alignment(Alignment::Left)
+            .render(frame, rect);
+    }
+
+    fn bandwidth_string(&self) -> String {
+        let c_mode = self.state.cumulative_mode;
+        format!(
+            " Total Up / Down: {} / {}{}",
+            DisplayBandwidth {
+                bandwidth: self.state.total_bytes_uploaded as f64,
+                as_rate: !c_mode,
+            },
+            DisplayBandwidth {
+                bandwidth: self.state.total_bytes_downloaded as f64,
+                as_rate: !c_mode,
+            },
+            if self.paused { " [PAUSED]" } else { "" }
+        )
+    }
+
+    fn render_elapsed_time(
+        &self,
+        frame: &mut Frame<impl Backend>,
+        rect: Rect,
+        elapsed_time: &str,
+        color: Color,
+    ) {
+        let elapsed_time_text = [Text::styled(
+            elapsed_time,
+            Style::default().fg(color).modifier(Modifier::BOLD),
+        )];
+        Paragraph::new(elapsed_time_text.iter())
+            .alignment(Alignment::Right)
+            .render(frame, rect);
+    }
+
+    fn days_string(&self) -> String {
+        match self.elapsed_time.as_secs() / SECONDS_IN_DAY {
+            0 => "".to_string(),
+            1 => "1 day, ".to_string(),
+            n => format!("{} days, ", n),
+        }
+    }
+
+    fn elapsed_time_string(&self) -> String {
+        format!(
+            "{}{:02}:{:02}:{:02} ",
+            self.days_string(),
+            (self.elapsed_time.as_secs() % SECONDS_IN_DAY) / 3600,
+            (self.elapsed_time.as_secs() % 3600) / 60,
+            self.elapsed_time.as_secs() % 60
+        )
+    }
+}
diff --git a/src/display/components/layout.rs b/src/display/components/layout.rs
index 79186cd..51c0175 100644
--- a/src/display/components/layout.rs
+++ b/src/display/components/layout.rs
@@ -2,9 +2,9 @@ use ::tui::backend::Backend;
 use ::tui::layout::{Constraint, Direction, Rect};
 use ::tui::terminal::Frame;
 
+use super::HeaderDetails;
 use super::HelpText;
 use super::Table;
-use super::TotalBandwidth;
 
 const FIRST_HEIGHT_BREAKPOINT: u16 = 30;
 const FIRST_WIDTH_BREAKPOINT: u16 = 120;
@@ -26,7 +26,7 @@ fn top_app_and_bottom_split(rect: Rect) -> (Rect, Rect, Rect) {
 }
 
 pub struct Layout<'a> {
-    pub header: TotalBandwidth<'a>,
+    pub header: HeaderDetails<'a>,
     pub children: Vec<Table<'a>>,
     pub footer: HelpText,
 }
@@ -99,6 +99,7 @@ impl<'a> Layout<'a> {
             self.build_three_children_layout(rect)
         }
     }
+
     pub fn render(&self, frame: &mut Frame<impl Backend>, rect: Rect, ui_offset: usize) {
         let (top, app, bottom) = top_app_and_bottom_split(rect);
         let layout_slots = self.build_layout(app);
diff --git a/src/display/components/mod.rs b/src/display/components/mod.rs
index c99596c..b5457f7 100644
--- a/src/display/components/mod.rs
+++ b/src/display/components/mod.rs
@@ -1,11 +1,11 @@
 mod display_bandwidth;
+mod header_details;
 mod help_text;
 mod layout;
 mod table;
-mod total_bandwidth;
 
 pub use display_bandwidth::*;
+pub use header_details::*;
 pub use help_text::*;
 pub use layout::*;
 pub use table::*;
-pub use total_bandwidth::*;
diff --git a/src/display/components/total_bandwidth.rs b/src/display/components/total_bandwidth.rs
deleted file mode 100644
index 80d892f..0000000
--- a/src/display/components/total_bandwidth.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use ::tui::backend::Backend;
-use ::tui::layout::{Alignment, Rect};
-use ::tui::style::{Color, Modifier, Style};
-use ::tui::terminal::Frame;
-use ::tui::widgets::{Paragraph, Text, Widget};
-
-use crate::display::{DisplayBandwidth, UIState};
-
-pub struct TotalBandwidth<'a> {
-    pub state: &'a UIState,
-    pub paused: bool,
-}
-
-impl<'a> TotalBandwidth<'a> {
-    pub fn render(&self, frame: &mut Frame<impl Backend>, rect: Rect) {
-        let c_mode = self.state.cumulative_mode;
-        let title_text = {
-            let paused_str = if self.paused { "[PAUSED]" } else { "" };
-            let color = if self.paused {
-                Color::Yellow
-            } else {
-                Color::Green
-            };
-
-            [Text::styled(
-                format!(
-                    " Total Up / Down: {} / {} {}",
-                    DisplayBandwidth {
-                        bandwidth: self.state.total_bytes_uploaded as f64,
-                        as_rate: !c_mode,
-                    },
-                    DisplayBandwidth {
-                        bandwidth: self.state.total_bytes_downloaded as f64,
-                        as_rate: !c_mode,
-                    },
-                    paused_str
-                ),
-                Style::default().fg(color).modifier(Modifier::BOLD),
-            )]
-        };
-        Paragraph::new(title_text.iter())
-            .alignment(Alignment::Left)
-            .render(frame, rect);
-    }
-}