CalvinBackup/donutbrowser
1
0
Fork 0
mirror of https://github.com/zhom/donutbrowser.git synced 2026-08-05 18:58:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: profile sync metadata merge and delta subscription matching

Browse Source
This commit is contained in:
zhom
2026-03-21 04:04:48 +04:00
parent 786acc4356
commit 0222c7e904
3 changed files with 59 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src-tauri/src/sync/scheduler.rs
+4 -14
View File
@@ -153,30 +153,20 @@ impl SyncScheduler {
}
pub async fn is_profile_running(&self, profile_id: &str) -> bool {
// First check our internal tracking
// Check our internal tracking (authoritative — immediately updated by mark_profile_stopped)
let running = self.running_profiles.lock().await;
if running.contains(profile_id) {
return true;
}
drop(running);
// Also check the actual profile state from ProfileManager
let profile_manager = ProfileManager::instance();
if let Ok(profiles) = profile_manager.list_profiles() {
if let Some(profile) = profiles.iter().find(|p| p.id.to_string() == profile_id) {
if profile.process_id.is_some() {
return true;
}
}
}
// Check if locked by another team member (profile in use remotely)
if crate::team_lock::TEAM_LOCK
// Check if locked by another device (profile in use remotely)
if crate::team_lock::PROFILE_LOCK
.is_locked_by_another(profile_id)
.await
{
log::debug!(
"Profile {} is locked by another team member, treating as running",
"Profile {} is locked on another device, treating as running",
profile_id
);
return true;