`a467a52`

ui: add free disk space display to status bar

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 3 months ago

SHA: a467a5292cc2801d71240ceb6fc0089f4d715458
Parents: 2cc95b4
Tree: 524f546

5 changed files

Status	File	+	-
M	`Cargo.lock`	1	0
M	`Cargo.toml`	3	0
M	`garfield/Cargo.toml`	1	0
M	`garfield/src/app.rs`	3	2
M	`garfield/src/ui/status_bar.rs`	39	3

Cargo.lockmodified

   "gartk-core",
   "gartk-render",
   "gartk-x11",
 + "libc",
   "serde",
   "serde_json",
   "thiserror",

Cargo.tomlmodified

  # X11
  x11rb = { version = "0.13", features = ["allow-unsafe-code"] }
 +# System
 +libc = "0.2"
++
  # Logging
  tracing = "0.1"
  tracing-subscriber = { version = "0.3", features = ["env-filter"] }

garfield/Cargo.tomlmodified

  # File system
  dirs.workspace = true
  chrono.workspace = true
 +libc.workspace = true
  # IPC
  garfield-ipc.workspace = true

garfield/src/app.rsmodified

      fn update_status_bar(&mut self) {
          let stats = self.focused_pane()
              .and_then(|pane| pane.active_tab())
 -            .map(|tab| (tab.visible_count(), tab.selection_count(), tab.selected_size(), tab.view_mode().name()));
 +            .map(|tab| (tab.visible_count(), tab.selection_count(), tab.selected_size(), tab.view_mode().name(), tab.current_path().to_path_buf()));
 -        if let Some((visible_count, selected_count, selected_size, view_mode)) = stats {
 +        if let Some((visible_count, selected_count, selected_size, view_mode, path)) = stats {
              self.status_bar.update(visible_count, selected_count, selected_size);
              self.status_bar.set_view_mode(view_mode);
 +            self.status_bar.update_free_space(&path);
+         }
+     }

garfield/src/ui/status_bar.rsmodified

  use gartk_core::Rect;
  use gartk_render::{Renderer, TextStyle};
 +use std::ffi::CString;
 +use std::path::Path;
  /// Height of the status bar.
  pub const STATUS_BAR_HEIGHT: u32 = 24;
      selected_size: u64,
      /// Current view mode name.
      view_mode: String,
 +    /// Free disk space in bytes.
 +    free_space: Option<u64>,
+ }
  impl StatusBar {
              selected_count: 0,
              selected_size: 0,
              view_mode: "List".to_string(),
 +            free_space: None,
+         }
+     }
          self.view_mode = mode.to_string();
+     }
 +    /// Update free disk space for the given path.
 +    pub fn update_free_space(&mut self, path: &Path) {
 +        self.free_space = get_free_space(path);
 +    }
++
      /// Get status bar height.
      pub fn height(&self) -> u32 {
          STATUS_BAR_HEIGHT
              &text_style,
          )?;
 -        // Right side: view mode
 +        // Right side: free space and view mode
 +        let mut right_x = self.bounds.x + self.bounds.width as i32 - padding;
++
 +        // View mode
          let mode_width = renderer.measure_text(&self.view_mode, &text_style)?.width;
 -        let mode_x = self.bounds.x + self.bounds.width as i32 - mode_width as i32 - padding;
 -        renderer.text(&self.view_mode, mode_x as f64, text_y as f64, &text_style)?;
 +        right_x -= mode_width as i32;
 +        renderer.text(&self.view_mode, right_x as f64, text_y as f64, &text_style)?;
++
 +        // Free space (if available)
 +        if let Some(free) = self.free_space {
 +            let free_text = format!("{} free  |  ", format_bytes(free));
 +            let free_width = renderer.measure_text(&free_text, &text_style)?.width;
 +            right_x -= free_width as i32;
 +            renderer.text(&free_text, right_x as f64, text_y as f64, &text_style)?;
 +        }
          Ok(())
+     }
          format!("{} B", bytes)
+     }
+ }
++
 +/// Get free disk space for the filesystem containing the given path.
 +fn get_free_space(path: &Path) -> Option<u64> {
 +    let c_path = CString::new(path.to_string_lossy().as_bytes()).ok()?;
++
 +    unsafe {
 +        let mut stat: libc::statvfs = std::mem::zeroed();
 +        if libc::statvfs(c_path.as_ptr(), &mut stat) == 0 {
 +            // Available blocks * block size = free space for non-privileged users
 +            Some(stat.f_bavail as u64 * stat.f_bsize as u64)
 +        } else {
 +            None
 +        }
 +    }
 +}