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

Added size to cached icon map

Browse Source
This commit is contained in:
nik012003
2023-05-16 14:14:56 +02:00
parent f9218d798c
commit 64fc749174
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/xdg.rs
View File

@@ -25,7 +25,7 @@ use walkdir::WalkDir;
struct ImageCache { struct ImageCache {
path: PathBuf, path: PathBuf,
#[serde_as(as = "Vec<(_, _)>")] #[serde_as(as = "Vec<(_, _)>")]
pub map: HashMap<String, PathBuf>, pub map: HashMap<(String, u16), PathBuf>,
} }
impl ImageCache { impl ImageCache {
@@ -46,7 +46,7 @@ impl ImageCache {
} }
} }
fn insert(&mut self, k: String, v: PathBuf) { fn insert(&mut self, k: (String, u16), v: PathBuf) {
self.map.insert(k, v); self.map.insert(k, v);
} }
@@ -237,7 +237,12 @@ impl DesktopFile {
} }
} }
if let Some(cache_icon_path) = IMAGE_CACHE.lock().unwrap().map.get(icon_name) { if let Some(cache_icon_path) = IMAGE_CACHE
.lock()
.unwrap()
.map
.get(&(icon_name.clone(), preferred_px_size))
{
if cache_icon_path.exists() { if cache_icon_path.exists() {
if let Some(icon) = Icon::from_path(cache_icon_path.to_owned(), preferred_px_size) { if let Some(icon) = Icon::from_path(cache_icon_path.to_owned(), preferred_px_size) {
return Some(icon); return Some(icon);
@@ -296,25 +301,28 @@ impl Icon {
} }
pub fn cached_process(self, size: u16) -> Result<Icon, std::io::Error> { pub fn cached_process(self, size: u16) -> Result<Icon, std::io::Error> {
if !IMAGE_CACHE.lock().unwrap().map.contains_key( if !IMAGE_CACHE.lock().unwrap().map.contains_key(&(
&self self.path
.path
.with_extension("") .with_extension("")
.file_name() .file_name()
.unwrap() .unwrap()
.to_str() .to_str()
.unwrap() .unwrap()
.to_owned(), .to_owned(),
) { size,
)) {
print!("Saving in the cache"); print!("Saving in the cache");
IMAGE_CACHE.lock().unwrap().insert( IMAGE_CACHE.lock().unwrap().insert(
self.path (
.with_extension("") self.path
.file_name() .with_extension("")
.unwrap() .file_name()
.to_str() .unwrap()
.unwrap() .to_str()
.to_owned(), .unwrap()
.to_owned(),
size,
),
self.path.clone(), self.path.clone(),
); );
IMAGE_CACHE.lock().unwrap().save(); IMAGE_CACHE.lock().unwrap().save();