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

refactor: fix clippy lints

Browse source
This commit is contained in:
Paul Delafosse 2022-05-13 08:04:02 +02:00
parent b7c9865412
commit 8f852b4d8f
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/cache.rs
View file

@ -1,24 +1,32 @@
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::path::PathBuf; use std::path::{Path, PathBuf};
use std::sync::Mutex; use std::sync::Mutex;
pub(crate) static CACHE: Lazy<Cache> = Lazy::new(Cache::default); pub(crate) static CACHE: Lazy<Cache> = Lazy::new(Cache::default);
type IconMap = BTreeMap<(String, u16, u16), PathBuf>;
type ThemeMap = BTreeMap<String, IconMap>;
#[derive(Default)] #[derive(Default)]
pub(crate) struct Cache(Mutex<BTreeMap<String, BTreeMap<(String, u16, u16), PathBuf>>>); pub(crate) struct Cache(Mutex<ThemeMap>);
impl Cache { impl Cache {
pub fn insert(&self, theme: &str, size: u16, scale: u16, icon_name: &str, icon_path: &PathBuf) { pub fn insert(&self, theme: &str, size: u16, scale: u16, icon_name: &str, icon_path: &Path) {
let mut theme_map = self.0.lock().unwrap(); let mut theme_map = self.0.lock().unwrap();
match theme_map.get_mut(theme) { match theme_map.get_mut(theme) {
Some(icon_map) => { Some(icon_map) => {
icon_map.insert((icon_name.to_string(), size, scale), icon_path.clone()); icon_map.insert(
(icon_name.to_string(), size, scale),
icon_path.to_path_buf(),
);
} }
None => { None => {
let mut icon_map = BTreeMap::new(); let mut icon_map = BTreeMap::new();
icon_map.insert((icon_name.to_string(), size, scale), icon_path.clone()); icon_map.insert(
(icon_name.to_string(), size, scale),
icon_path.to_path_buf(),
);
theme_map.insert(theme.to_string(), icon_map); theme_map.insert(theme.to_string(), icon_map);
} }
} }

6
src/theme/parse.rs
View file

@ -19,7 +19,7 @@ impl Theme {
self.get_icon_theme_section() self.get_icon_theme_section()
.and_then(|props| props.get("ScaledDirectories")) .and_then(|props| props.get("ScaledDirectories"))
.map(|dirs| dirs.split(',').collect()) .map(|dirs| dirs.split(',').collect())
.unwrap_or(vec![]) .unwrap_or_default()
} }
fn get_icon_theme_section(&self) -> Option<&Properties> { fn get_icon_theme_section(&self) -> Option<&Properties> {
@ -30,7 +30,7 @@ impl Theme {
self.get_icon_theme_section() self.get_icon_theme_section()
.and_then(|props| props.get("Inherits")) .and_then(|props| props.get("Inherits"))
.map(|parents| parents.split(',').collect()) .map(|parents| parents.split(',').collect())
.unwrap_or(vec![]) .unwrap_or_default()
} }
fn directories(&self) -> Vec<&str> { fn directories(&self) -> Vec<&str> {
@ -38,7 +38,7 @@ impl Theme {
.section(Some("Icon Theme")) .section(Some("Icon Theme"))
.and_then(|props| props.get("Directories")) .and_then(|props| props.get("Directories"))
.map(|dirs| dirs.split(',').collect()) .map(|dirs| dirs.split(',').collect())
.unwrap_or(vec![]) .unwrap_or_default()
} }
fn get_directory<'a>(&'a self, name: &'a str) -> Option<Directory> { fn get_directory<'a>(&'a self, name: &'a str) -> Option<Directory> {