bug fix

Author: 0l3d

CHANGELOG.md

@@ -1,4 +1,4 @@
-# [0.2.18]
+# [0.2.19]
 
 ### What's Changed?
 

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "ffetch"
-version = "0.5.6"
+version = "0.5.7"
 authors = ["0l3d <0l3dgit@gmail.com>"]
 edition = "2021"
 description = "Fast, minimal & Rust-powered system fetcher"

Cargo.toml

@@ -1,7 +1,7 @@
 # Maintainer: 0l3d
 
 pkgname=ffetch-bin
-pkgver=0.2.18
+pkgver=0.2.19
 pkgrel=1
 pkgdesc='CLI tool to fetch system info.'
 url='https://github.com/0l3d/ffetch'

PKGBUILD

@@ -1,8 +1,8 @@
-# 🚀 **F-Fetch:** _Fast, Minimal & Rust-Powered System Fetcher_ 
+# 🚀 **F-Fetch:** _Fast, Minimal & Rust-Powered System Fetcher_
 
 F-Fetch is a **very fast**, **minimal** terminal system fetcher written **100% in Rust**.  
 It is **highly customizable** - allowing you to add your own syntax and integrate your own features.  
-At its core, it works simply and the codebase is easy to understand. 
+At its core, it works simply and the codebase is easy to understand.
 
 ---
 
@@ -40,7 +40,9 @@ bash <(curl -s https://raw.githubusercontent.com/0l3d/ffetch/master/install.sh)
 ```bash
 ffetch
 ```
+
 ---
+
 # 📚 **Use as Library**
 
 You can also use F-Fetch as a library in your Rust projects:
@@ -82,12 +84,13 @@ fn main() {
 ## Dependencies
 
 If u're using `getTerm`, u need to make sure xprop is installed.
+If `getMonitor` fails, it uses `xrandr`.
 
 For GPU and disk information, I use standard Linux tools like lspci (from pciutils) and df (from coreutils).
 
 # F-Fetch Configuration & Examples
 
-## F-Fetch Components List 
+## F-Fetch Components List
 
 - `getUsername`  
   Returns the current **Username**.
@@ -250,7 +253,7 @@ echo "│    " fg.white t.bold " Hostname: " all.reset fg.green getHostname
 echo "│    " fg.white t.bold " Packages: " all.reset fg.green getPackages
 echo "│    " fg.white t.bold " Locale: " all.reset fg.green getLocale
 echo "│    " fg.white t.bold " Init: " all.reset fg.green getInit
-echo "│    " 
+echo "│    "
 echo "│  " t.underline fg.bright_green "󰋊 Hardware Information :"
 echo "│    "
 echo "│    " fg.yellow t.bold " CPU: " all.reset fg.white getCpu

README.md

@@ -1160,6 +1160,99 @@ pub fn get_monitor(monitor_index: usize) -> String {
         ))
     }
 
+    fn parse_xrandr_monitors() -> Vec<String> {
+        let output = Command::new("xrandr")
+            .arg("--query")
+            .output()
+            .expect("Failed to execute xrandr");
+
+        if !output.status.success() {
+            return vec!["Failed to run xrandr".to_string()];
+        }
+
+        let stdout = String::from_utf8_lossy(&output.stdout);
+        let mut lines = stdout.lines();
+
+        let mut results = Vec::new();
+
+        while let Some(line) = lines.next() {
+            if line.contains(" connected") {
+                let parts: Vec<&str> = line.split_whitespace().collect();
+                let connector_full = parts[0];
+                let resolution_part = parts
+                    .iter()
+                    .find(|s| s.contains('+') && s.contains('x'))
+                    .unwrap_or(&"Unknown");
+                let connector_short = connector_full.split('-').next().unwrap_or("Unknown");
+                let location = if connector_full.starts_with("eDP") {
+                    "Internal"
+                } else {
+                    "External"
+                };
+
+                let resolution = resolution_part.split('+').next().unwrap_or("Unknown");
+
+                let mut width_mm = 0.0;
+                let mut height_mm = 0.0;
+
+                for i in 0..parts.len() {
+                    if parts[i].ends_with("mm") {
+                        if width_mm == 0.0 {
+                            width_mm = parts[i]
+                                .trim_end_matches("mm")
+                                .parse::<f32>()
+                                .unwrap_or(0.0);
+                        } else if height_mm == 0.0 {
+                            height_mm = parts[i]
+                                .trim_end_matches("mm")
+                                .parse::<f32>()
+                                .unwrap_or(0.0);
+                            break;
+                        }
+                    }
+                }
+
+                let mut refresh_hz = "??".to_string();
+
+                while let Some(mode_line) = lines.next() {
+                    if mode_line.trim().is_empty() || mode_line.contains("connected") {
+                        break;
+                    }
+
+                    let mode_parts: Vec<&str> = mode_line.trim().split_whitespace().collect();
+                    if mode_parts.len() >= 2 && mode_parts[0] == resolution {
+                        refresh_hz = mode_parts[1]
+                            .trim_end_matches(|c: char| c == '*' || c == '+')
+                            .to_string();
+                        break;
+                    }
+                }
+
+                let width_in = width_mm / 25.4;
+                let height_in = height_mm / 25.4;
+                let diagonal_in = if width_in > 0.0 && height_in > 0.0 {
+                    ((width_in.powi(2) + height_in.powi(2)).sqrt() * 10.0).round() / 10.0
+                } else {
+                    0.0
+                };
+
+                let line = if diagonal_in > 0.0 {
+                    format!(
+                    "({connector_short}): {resolution} @ {refresh_hz} Hz in {diagonal_in:.1}\" [{location}]"
+                )
+                } else {
+                    format!(
+                    "({connector_short}): {resolution} @ {refresh_hz} Hz [No size] [{location}]"
+                )
+                };
+
+                results.push(line);
+            }
+        }
+
+        results
+    }
+
     let drm_dir = Path::new("/sys/class/drm");
     let mut all_of_things = Vec::new();
 
@@ -1236,7 +1329,7 @@ pub fn get_monitor(monitor_index: usize) -> String {
 
             all_of_things.push(line);
         } else {
-            all_of_things.push(format!("({connector}): Failed to parse EDID"));
+            all_of_things.push(parse_xrandr_monitors()[monitor_index].to_string());
         }
     }