andrei/niri
1
0
Fork 0
mirror of https://github.com/niri-wm/niri.git synced 2026-06-22 02:01:55 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

Extract format_make_model_serial()

Browse Source
This commit is contained in:
Ivan Molodetskikh
2024-11-08 09:10:54 +03:00
parent 8867a4f84c
commit 3d31f9860a
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
niri-config/src/lib.rs
+8 -4
View File
@@ -1918,13 +1918,17 @@ impl OutputName {
if self.make.is_none() && self.model.is_none() && self.serial.is_none() { if self.make.is_none() && self.model.is_none() && self.serial.is_none() {
self.connector.to_string() self.connector.to_string()
} else { } else {
let make = self.make.as_deref().unwrap_or("Unknown"); self.format_make_model_serial()
let model = self.model.as_deref().unwrap_or("Unknown");
let serial = self.serial.as_deref().unwrap_or("Unknown");
format!("{make} {model} {serial}")
} }
} }
pub fn format_make_model_serial(&self) -> String {
let make = self.make.as_deref().unwrap_or("Unknown");
let model = self.model.as_deref().unwrap_or("Unknown");
let serial = self.serial.as_deref().unwrap_or("Unknown");
format!("{make} {model} {serial}")
}
pub fn matches(&self, target: &str) -> bool { pub fn matches(&self, target: &str) -> bool {
// Match by connector. // Match by connector.
if target.eq_ignore_ascii_case(&self.connector) { if target.eq_ignore_ascii_case(&self.connector) {