NotAShelf/microfetch
1
1
Fork 0
mirror of https://github.com/NotAShelf/microfetch.git synced 2025-11-06 08:32:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: remove some redundant error types (#4)

Browse source
This commit is contained in:
Sora 2024-08-13 22:59:11 +02:00 • committed by GitHub
commit ae76a0cbe1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 35 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/desktop.rs
View file

@ -1,20 +1,17 @@
use color_eyre::Result;
use std::{env, io};
pub fn get_desktop_info() -> Result<String, io::Error> {
let desktop_env = env::var("XDG_CURRENT_DESKTOP");
let display_backend = env::var("XDG_SESSION_TYPE");
pub fn get_desktop_info() -> String {
let desktop_env = std::env::var("XDG_CURRENT_DESKTOP");
let display_backend = std::env::var("XDG_SESSION_TYPE");
// Trim "none+" from the start of desktop_env if present
// XXX: This is a workaround for NixOS modules that set XDG_CURRENT_DESKTOP to "none+foo"
// instead of just "foo"
// Use "Unknown" if desktop_env or display_backend is empty
let desktop_env = match desktop_env {
Err(_) => String::from("Unknown"),
Ok(s) => s.trim_start_matches("none+").to_owned(),
let desktop_env = match desktop_env.as_ref() {
Err(_) => "Unknown",
Ok(s) => s.trim_start_matches("none+"),
};
let display_backend = display_backend.unwrap_or_else(|_| String::from("Unknown"));
let display_backend = display_backend.unwrap_or(String::from("Unknown"));
Ok(format!("{desktop_env} ({display_backend})"))
format!("{desktop_env} ({display_backend})")
}