vikarti.anatra/polaris-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Setup file watches while indexing is happening

Browse source
This commit is contained in:
Antoine Gersant 2024-10-12 17:15:22 -07:00
parent 768ea095e1
commit cf6a092ab7
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/app/scanner.rs
View file

@ -211,9 +211,6 @@ impl Scanner {
let new_parameters = self.read_parameters().await; let new_parameters = self.read_parameters().await;
*self.parameters.write().await = Some(new_parameters.clone()); *self.parameters.write().await = Some(new_parameters.clone());
*self.file_watcher.write().await = Some(
Self::setup_file_watcher(&self.config_manager, self.on_file_change.clone()).await?,
);
let (scan_directories_output, collection_directories_input) = channel(); let (scan_directories_output, collection_directories_input) = channel();
let (scan_songs_output, collection_songs_input) = channel(); let (scan_songs_output, collection_songs_input) = channel();
@ -221,10 +218,25 @@ impl Scanner {
let mut scan_task_set = JoinSet::new(); let mut scan_task_set = JoinSet::new();
let mut index_task_set = JoinSet::new(); let mut index_task_set = JoinSet::new();
let mut watch_task_set = JoinSet::<Result<(), Error>>::new();
let mut secondary_task_set = JoinSet::new(); let mut secondary_task_set = JoinSet::new();
scan_task_set.spawn_blocking(|| scan.run()); scan_task_set.spawn_blocking(|| scan.run());
watch_task_set.spawn({
let scanner = self.clone();
let config_manager = self.config_manager.clone();
async move {
let mut watcher = scanner.file_watcher.write().await;
*watcher = None; // Drops previous watcher
*watcher = Some(
Self::setup_file_watcher(&config_manager, scanner.on_file_change.clone())
.await?,
);
Ok(())
}
});
let partial_index_notify = Arc::new(tokio::sync::Notify::new()); let partial_index_notify = Arc::new(tokio::sync::Notify::new());
let partial_index_mutex = Arc::new(tokio::sync::Mutex::new(index::Builder::default())); let partial_index_mutex = Arc::new(tokio::sync::Mutex::new(index::Builder::default()));
secondary_task_set.spawn({ secondary_task_set.spawn({
@ -305,6 +317,7 @@ impl Scanner {
}); });
scan_task_set.join_next().await.unwrap()??; scan_task_set.join_next().await.unwrap()??;
watch_task_set.join_next().await.unwrap()??;
let index = index_task_set.join_next().await.unwrap()?; let index = index_task_set.join_next().await.unwrap()?;
secondary_task_set.abort_all(); secondary_task_set.abort_all();