ZacharyZhang-NY/ELY-Browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear private profile download index on exit

Browse Source
This commit is contained in:
ZacharyZhang-NY
2026-05-08 22:35:42 -04:00
parent 1c960af094
commit 60426b6c18
6 changed files with 120 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ely_browser_core/src/state/downloads.rs
+6 -2
View File
@@ -1,6 +1,6 @@
use std::{path::PathBuf, time::SystemTime};
use ely_domain::{DownloadChecksum, DownloadEntry, DownloadId, UrlText};
use ely_domain::{DownloadChecksum, DownloadEntry, DownloadId, ProfileId, UrlText};
use crate::CoreError;
@@ -107,8 +107,12 @@ impl BrowserCore {
pub fn clear_downloads_for_active_profile(&mut self) -> usize {
let active_profile_id = self.active_profile_id.clone();
self.clear_downloads_for_profile(&active_profile_id)
}
pub(super) fn clear_downloads_for_profile(&mut self, profile_id: &ProfileId) -> usize {
let before_count = self.download_entries.len();
self.download_entries.retain(|entry| entry.profile_id() != &active_profile_id);
self.download_entries.retain(|entry| entry.profile_id() != profile_id);
before_count - self.download_entries.len()
}
crates/ely_browser_core/src/state/profiles.rs
+10
View File
@@ -107,4 +107,14 @@ impl BrowserCore {
profile.set_sync_policy(sync_policy);
Ok(())
}
pub(super) fn cleanup_private_profile_session_data(&mut self, profile_id: &ProfileId) {
if self
.profiles
.iter()
.any(|profile| profile.id() == profile_id && profile.kind() == &ProfileKind::Private)
{
self.clear_downloads_for_profile(profile_id);
}
}
}
crates/ely_browser_core/src/state/tab_selection.rs
+59
View File
@@ -0,0 +1,59 @@
use std::time::SystemTime;
use ely_domain::TabId;
use super::BrowserCore;
use crate::CoreError;
impl BrowserCore {
pub fn select_tab(&mut self, tab_id: &TabId) -> Result<(), CoreError> {
let previous_profile_id = self.active_profile_id.clone();
let tab = self
.tabs
.iter()
.find(|tab| tab.id() == tab_id)
.ok_or_else(|| CoreError::TabNotFound { id: tab_id.clone() })?;
let active_space_id = tab.space_id().clone();
let active_profile_id = tab.profile_id().clone();
let active_tab_id = tab.id().clone();
self.active_tab_id = active_tab_id.clone();
self.active_space_id = active_space_id.clone();
self.active_profile_id = active_profile_id.clone();
self.active_tabs_by_space_profile
.insert((active_space_id.clone(), active_profile_id.clone()), active_tab_id.clone());
self.active_tabs_by_space.insert(active_space_id, active_tab_id);
self.record_tab_activity(tab_id, SystemTime::now());
if previous_profile_id != active_profile_id {
self.cleanup_private_profile_session_data(&previous_profile_id);
}
Ok(())
}
pub fn select_next_tab(&mut self) -> Result<TabId, CoreError> {
self.select_tab_by_offset(1)
}
pub fn select_previous_tab(&mut self) -> Result<TabId, CoreError> {
self.select_tab_by_offset(-1)
}
fn select_tab_by_offset(&mut self, offset: isize) -> Result<TabId, CoreError> {
let visible_tab_ids = self
.tabs
.iter()
.filter(|tab| tab.space_id() == &self.active_space_id)
.map(|tab| tab.id().clone())
.collect::<Vec<_>>();
let active_index = visible_tab_ids
.iter()
.position(|tab_id| tab_id == &self.active_tab_id)
.ok_or(CoreError::MissingActiveTab)?;
let tab_count = visible_tab_ids.len() as isize;
let next_index = (active_index as isize + offset).rem_euclid(tab_count) as usize;
let next_tab_id = visible_tab_ids[next_index].clone();
self.select_tab(&next_tab_id)?;
Ok(next_tab_id)
}
}
crates/ely_browser_core/src/state/tabs.rs
-46
View File
@@ -197,34 +197,6 @@ impl BrowserCore {
Ok(archived_count)
}
pub fn select_tab(&mut self, tab_id: &TabId) -> Result<(), CoreError> {
let tab = self
.tabs
.iter()
.find(|tab| tab.id() == tab_id)
.ok_or_else(|| CoreError::TabNotFound { id: tab_id.clone() })?;
let active_space_id = tab.space_id().clone();
let active_profile_id = tab.profile_id().clone();
let active_tab_id = tab.id().clone();
self.active_tab_id = active_tab_id.clone();
self.active_space_id = active_space_id.clone();
self.active_profile_id = active_profile_id.clone();
self.active_tabs_by_space_profile
.insert((active_space_id.clone(), active_profile_id), active_tab_id.clone());
self.active_tabs_by_space.insert(active_space_id, active_tab_id);
self.record_tab_activity(tab_id, SystemTime::now());
Ok(())
}
pub fn select_next_tab(&mut self) -> Result<TabId, CoreError> {
self.select_tab_by_offset(1)
}
pub fn select_previous_tab(&mut self) -> Result<TabId, CoreError> {
self.select_tab_by_offset(-1)
}
pub fn toggle_active_tab_favorite(&mut self) -> Result<bool, CoreError> {
let active_index = self.active_tab_index()?;
let favorite_count = self.tabs.iter().filter(|tab| tab.flags().favorite).count();
@@ -358,24 +330,6 @@ impl BrowserCore {
self.restore_tab(archived_tab.into_tab())
}
fn select_tab_by_offset(&mut self, offset: isize) -> Result<TabId, CoreError> {
let visible_tab_ids = self
.tabs
.iter()
.filter(|tab| tab.space_id() == &self.active_space_id)
.map(|tab| tab.id().clone())
.collect::<Vec<_>>();
let active_index = visible_tab_ids
.iter()
.position(|tab_id| tab_id == &self.active_tab_id)
.ok_or(CoreError::MissingActiveTab)?;
let tab_count = visible_tab_ids.len() as isize;
let next_index = (active_index as isize + offset).rem_euclid(tab_count) as usize;
let next_tab_id = visible_tab_ids[next_index].clone();
self.select_tab(&next_tab_id)?;
Ok(next_tab_id)
}
pub(super) fn active_tab_index(&self) -> Result<usize, CoreError> {
self.tabs
.iter()