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

Skip redundant watch setup

Browse source
This commit is contained in:
Antoine Gersant 2024-10-12 16:56:20 -07:00
parent 5a5f696366
commit 768ea095e1
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/app/scanner.rs
View file

@ -77,7 +77,7 @@ pub struct Status {
pub struct Scanner { pub struct Scanner {
index_manager: index::Manager, index_manager: index::Manager,
config_manager: config::Manager, config_manager: config::Manager,
file_watcher: Arc<RwLock<Debouncer<RecommendedWatcher, FileIdMap>>>, file_watcher: Arc<RwLock<Option<Debouncer<RecommendedWatcher, FileIdMap>>>>,
on_file_change: Arc<Notify>, on_file_change: Arc<Notify>,
pending_scan: Arc<Notify>, pending_scan: Arc<Notify>,
status: Arc<RwLock<Status>>, status: Arc<RwLock<Status>>,
@ -89,16 +89,11 @@ impl Scanner {
index_manager: index::Manager, index_manager: index::Manager,
config_manager: config::Manager, config_manager: config::Manager,
) -> Result<Self, Error> { ) -> Result<Self, Error> {
let on_file_change = Arc::new(Notify::new());
let file_watcher = Arc::new(RwLock::new(
Self::setup_file_watcher(&config_manager, on_file_change.clone()).await?,
));
let scanner = Self { let scanner = Self {
index_manager, index_manager,
config_manager: config_manager.clone(), config_manager: config_manager.clone(),
file_watcher, file_watcher: Arc::default(),
on_file_change, on_file_change: Arc::default(),
pending_scan: Arc::new(Notify::new()), pending_scan: Arc::new(Notify::new()),
status: Arc::new(RwLock::new(Status::default())), status: Arc::new(RwLock::new(Status::default())),
parameters: Arc::default(), parameters: Arc::default(),
@ -216,8 +211,9 @@ 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 = *self.file_watcher.write().await = Some(
Self::setup_file_watcher(&self.config_manager, self.on_file_change.clone()).await?; 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();