zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-07-01 10:41:03 +02:00
Code Activity

refactor(desktop file): simplify some none-type handling

Browse source
This commit is contained in:
Jake Stanger 2024-01-24 23:04:14 +00:00
parent 754e33952e
commit 996ad7e27f
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/desktop_file.rs
View file

@ -110,9 +110,7 @@ fn find_desktop_file_by_filedata(app_id: &str, files: &[PathBuf]) -> Option<Path
let files = files let files = files
.iter() .iter()
.filter_map(|file| { .filter_map(|file| {
let Some(parsed_desktop_file) = parse_desktop_file(file) else { let parsed_desktop_file = parse_desktop_file(file)?;
return None;
};
desktop_files_cache.insert(file.clone(), parsed_desktop_file.clone()); desktop_files_cache.insert(file.clone(), parsed_desktop_file.clone());
Some((file.clone(), parsed_desktop_file)) Some((file.clone(), parsed_desktop_file))
@ -165,9 +163,7 @@ fn parse_desktop_file(path: &Path) -> Option<DesktopFile> {
file.lines() file.lines()
.filter_map(|line| { .filter_map(|line| {
let Some((key, value)) = line.split_once('=') else { let (key, value) = line.split_once('=')?;
return None;
};
let key = key.trim(); let key = key.trim();
let value = value.trim(); let value = value.trim();
@ -190,9 +186,7 @@ fn parse_desktop_file(path: &Path) -> Option<DesktopFile> {
/// Attempts to get the icon name from the app's `.desktop` file. /// Attempts to get the icon name from the app's `.desktop` file.
pub fn get_desktop_icon_name(app_id: &str) -> Option<String> { pub fn get_desktop_icon_name(app_id: &str) -> Option<String> {
let Some(path) = find_desktop_file(app_id) else { let path = find_desktop_file(app_id)?;
return None;
};
let mut desktop_files_cache = lock!(desktop_files()); let mut desktop_files_cache = lock!(desktop_files());