leyoda/cosmic-freedesktop-icons
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: get data dirs from xdg crate

Browse source
This commit is contained in:
Ashley Wulber 2022-11-22 15:54:14 -05:00 • committed by Paul Delafosse
parent 632d67524c
commit aa175c8812
2 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -14,6 +14,7 @@ dirs = "4.0.0"
rust-ini = "0.18.0" rust-ini = "0.18.0"
thiserror = "1.0.31" thiserror = "1.0.31"
once_cell = "1.10.0" once_cell = "1.10.0"
xdg = "2.4.1"
[dev-dependencies] [dev-dependencies]
speculoos = "0.9.0" speculoos = "0.9.0"

15
src/theme/paths.rs
View file

@ -1,8 +1,9 @@
use crate::theme; use crate::theme;
use crate::theme::error::ThemeError; use crate::theme::error::ThemeError;
use dirs::{data_dir, home_dir}; use dirs::home_dir;
use ini::Ini; use ini::Ini;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use xdg::BaseDirectories;
use std::path::PathBuf; use std::path::PathBuf;
pub(crate) static BASE_PATHS: Lazy<Vec<PathBuf>> = Lazy::new(icon_theme_base_paths); pub(crate) static BASE_PATHS: Lazy<Vec<PathBuf>> = Lazy::new(icon_theme_base_paths);
@ -11,16 +12,10 @@ pub(crate) static BASE_PATHS: Lazy<Vec<PathBuf>> = Lazy::new(icon_theme_base_pat
/// Paths that are not found are filtered out. /// Paths that are not found are filtered out.
fn icon_theme_base_paths() -> Vec<PathBuf> { fn icon_theme_base_paths() -> Vec<PathBuf> {
let home_icon_dir = home_dir().expect("No $HOME directory").join(".icons"); let home_icon_dir = home_dir().expect("No $HOME directory").join(".icons");
let usr_data_dir = data_dir().expect("No $XDG_DATA_DIR").join("icons"); let mut data_dirs = BaseDirectories::new().map(|bd| bd.get_data_dirs()).unwrap_or_default();
let xdg_data_dirs_local = PathBuf::from("/usr/local/share/").join("icons"); data_dirs.push(home_icon_dir);
let xdg_data_dirs = PathBuf::from("/usr/share/").join("icons");
[ data_dirs
home_icon_dir,
usr_data_dir,
xdg_data_dirs_local,
xdg_data_dirs,
]
.into_iter() .into_iter()
.filter(|p| p.exists()) .filter(|p| p.exists())
.collect() .collect()