apognu/tuigreet
1
1
Fork 0
mirror of https://github.com/apognu/tuigreet.git synced 2024-11-25 20:32:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Refactored /etc/issue parsing.

Browse Source
This commit is contained in:
Antoine POPINEAU 2024-08-12 22:31:30 +02:00 committed by Antoine POPINEAU
parent fa58d89bcc
commit 7acf49d6e5
1 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/info.rs
View File

@ -57,39 +57,44 @@ pub fn get_issue() -> Option<String> {
(now.format("%a %b %_d %Y").to_string(), now.format("%H:%M:%S").to_string()) (now.format("%a %b %_d %Y").to_string(), now.format("%H:%M:%S").to_string())
}; };
let count = match UtmpParser::from_path("/var/run/utmp") let user_count = match UtmpParser::from_path("/var/run/utmp")
.map(|utmp| utmp.into_iter().filter(|user| matches!(user, Ok(UtmpEntry::UserProcess { .. }))).count()) .map(|utmp| {
utmp.into_iter().fold(0, |acc, entry| match entry {
Ok(UtmpEntry::UserProcess { .. }) => acc + 1,
Ok(UtmpEntry::LoginProcess { .. }) => acc + 1,
_ => acc,
})
})
.unwrap_or(0) .unwrap_or(0)
{ {
n if n < 2 => format!("{n} user"), n if n < 2 => format!("{n} user"),
n => format!("{n} users"), n => format!("{n} users"),
}; };
let vtnr: usize = env::var("XDG_VTNR").unwrap_or_else(|_| "0".to_string()).parse().expect("unable to parse VTNR"); let vtnr: usize = env::var("XDG_VTNR").unwrap_or_else(|_| "0".to_string()).parse().unwrap_or(0);
let uts = utsname::uname(); let uts = utsname::uname();
if let Ok(issue) = fs::read_to_string("/etc/issue") { if let Ok(issue) = fs::read_to_string("/etc/issue") {
let issue = issue.replace("\\S", "Linux").replace("\\l", &format!("tty{vtnr}")); let issue = issue
.replace("\\S", "Linux")
.replace("\\l", &format!("tty{vtnr}"))
.replace("\\d", &date)
.replace("\\t", &time)
.replace("\\U", &user_count);
return match uts { let issue = match uts {
Ok(uts) => Some( Ok(uts) => issue
issue .replace("\\s", uts.sysname().to_str().unwrap_or(""))
.replace("\\s", uts.sysname().to_str().unwrap_or("")) .replace("\\r", uts.release().to_str().unwrap_or(""))
.replace("\\r", uts.release().to_str().unwrap_or("")) .replace("\\v", uts.version().to_str().unwrap_or(""))
.replace("\\v", uts.version().to_str().unwrap_or("")) .replace("\\n", uts.nodename().to_str().unwrap_or(""))
.replace("\\n", uts.nodename().to_str().unwrap_or("")) .replace("\\m", uts.machine().to_str().unwrap_or(""))
.replace("\\m", uts.machine().to_str().unwrap_or("")) .replace("\\o", uts.domainname().to_str().unwrap_or("")),
.replace("\\d", &date)
.replace("\\t", &time)
.replace("\\U", &count)
.replace("\\x1b", "\x1b")
.replace("\\033", "\x1b")
.replace("\\e", "\x1b")
.replace(r"\\", r"\"),
),
_ => Some(issue), _ => issue,
}; };
return Some(issue.replace("\\x1b", "\x1b").replace("\\033", "\x1b").replace("\\e", "\x1b").replace(r"\\", r"\"));
} }
None None