Skip to content

Performance optimizations and leak fixes for Activity Tracker #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
unfoldingdimensions wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Performance optimizations and leak fixes for Activity Tracker #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions src-tauri/src/icons.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@ use std::ffi::OsStr;
use base64::{Engine as _, engine::general_purpose};
use sysinfo::{System, ProcessRefreshKind, UpdateKind, ProcessesToUpdate};
use once_cell::sync::Lazy;
#[cfg(target_os = "windows")]
use windows::Win32::UI::Shell::ExtractIconExW;
#[cfg(target_os = "windows")]
use windows::Win32::UI::WindowsAndMessaging::{HICON, DestroyIcon, ICONINFO, GetIconInfo};
#[cfg(target_os = "windows")]
use windows::Win32::Graphics::Gdi::{
GetDC, ReleaseDC, GetDIBits, BITMAPINFOHEADER, BI_RGB, DIB_RGB_COLORS,
GetObjectW, BITMAP, DeleteObject, CreateCompatibleDC, SelectObject, DeleteDC,
};
#[cfg(target_os = "windows")]
use windows::core::HSTRING;

const MAX_CACHE_SIZE: usize = 500;
Expand Down Expand Up @@ -132,18 +136,27 @@ pub fn get_app_icon_base64(process_name: &str, cache_dir: &Path) -> Option<Strin
}
}

// 2. Find Executable Path (Cached in memory)
let exe_path = ICON_SYSTEM.find_exe_path(process_name)?;

// 3. Extract Icon
let icon_data = extract_icon_to_png(&exe_path)?;
// 2. Find Executable Path & 3. Extract Icon
#[cfg(target_os = "windows")]
let icon_data = if let Some(exe_path) = ICON_SYSTEM.find_exe_path(process_name) {
extract_icon_to_png(&exe_path)
} else {
None
};

// 4. Save to Disk Cache
let _ = fs::write(&icon_path, &icon_data);
#[cfg(not(target_os = "windows"))]
let icon_data: Option<Vec<u8>> = None;

Some(format!("data:image/png;base64,{}", general_purpose::STANDARD.encode(icon_data)))
if let Some(data) = icon_data {
// 4. Save to Disk Cache
let _ = fs::write(&icon_path, &data);
Some(format!("data:image/png;base64,{}", general_purpose::STANDARD.encode(data)))
} else {
None
}
}

#[cfg(target_os = "windows")]
fn extract_icon_to_png(exe_path: &Path) -> Option<Vec<u8>> {
unsafe {
let path_hstring = HSTRING::from(exe_path.to_str()?);
Expand Down Expand Up @@ -180,6 +193,7 @@ fn extract_icon_to_png(exe_path: &Path) -> Option<Vec<u8>> {
}
}

#[cfg(target_os = "windows")]
unsafe fn hicon_to_png(hicon: HICON) -> Option<Vec<u8>> {
let mut icon_info = ICONINFO::default();
if GetIconInfo(hicon, &mut icon_info).is_err() {
Expand Down