StardustXR/protostar
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Made get_data_dir more robust

Browse Source
This commit is contained in:
nik012003
2023-05-16 01:40:30 +02:00
parent 4cdddab406
commit f9218d798c
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/xdg.rs
View File

@@ -65,20 +65,11 @@ lazy_static! {
fn get_data_dirs() -> Vec<PathBuf> { fn get_data_dirs() -> Vec<PathBuf> {
let xdg_data_dirs_str = std::env::var("XDG_DATA_DIRS").unwrap_or_default(); let xdg_data_dirs_str = std::env::var("XDG_DATA_DIRS").unwrap_or_default();
xdg_data_dirs_str
let xdg_data_dirs = xdg_data_dirs_str
.split(":") .split(":")
.filter_map(|dir| PathBuf::from_str(dir).ok()); .filter_map(|dir| PathBuf::from_str(dir).ok())
.chain(dirs::home_dir().into_iter().map(|d| d.join(".local/share")))
let data_home = dirs::home_dir() .chain(PathBuf::from_str("/usr/share").into_iter())
.unwrap_or(PathBuf::from_str("/usr/share/").expect(
"No XDG_DATA_DIR set, no HOME directory found and no /usr/share direcotry found",
))
.join(".local")
.join("share");
xdg_data_dirs
.chain([data_home].into_iter())
.filter(|dir| dir.exists() && dir.is_dir()) .filter(|dir| dir.exists() && dir.is_dir())
.collect() .collect()
} }
@@ -255,7 +246,11 @@ impl DesktopFile {
print!("Cache miss") print!("Cache miss")
} }
if let Some(icon_path) = lookup(icon_name).with_size(preferred_px_size).with_cache().find() { if let Some(icon_path) = lookup(icon_name)
.with_size(preferred_px_size)
.with_cache()
.find()
{
if let Some(icon) = Icon::from_path(icon_path, preferred_px_size) { if let Some(icon) = Icon::from_path(icon_path, preferred_px_size) {
return Some(icon); return Some(icon);
} }