1
0
Fork 0
mirror of https://github.com/zhaofengli/attic.git synced 2024-12-14 11:57:30 +00:00

client/watch_store: Refactor main loop

This commit is contained in:
Zhaofeng Li 2023-04-04 16:25:05 -06:00
parent d918f68c29
commit 6a064f904e

View file

@ -1,11 +1,11 @@
use std::path::{Path, PathBuf};
use std::sync::Arc;
use std::{thread, time};
use anyhow::{anyhow, Result};
use clap::Parser;
use indicatif::MultiProgress;
use notify::{EventKind, RecursiveMode, Watcher};
use tokio::sync::mpsc;
use crate::api::ApiClient;
use crate::cache::CacheRef;
@ -83,7 +83,21 @@ pub async fn run(opts: Opts) -> Result<()> {
)
.into_push_session(push_session_config);
let (tx, mut rx) = mpsc::unbounded_channel();
let mut watcher = notify::recommended_watcher(move |res: notify::Result<notify::Event>| {
tx.send(res).unwrap();
})?;
watcher.watch(&store_dir, RecursiveMode::NonRecursive)?;
eprintln!(
"👀 Pushing new store paths to \"{cache}\" on \"{server}\"",
cache = cache.as_str(),
server = server_name.as_str(),
);
while let Some(res) = rx.recv().await {
match res {
Ok(event) => {
// We watch the removals of lock files which signify
@ -105,19 +119,9 @@ pub async fn run(opts: Opts) -> Result<()> {
}
Err(e) => eprintln!("Error during watch: {:?}", e),
}
})?;
watcher.watch(&store_dir, RecursiveMode::NonRecursive)?;
eprintln!(
"👀 Pushing new store paths to \"{cache}\" on \"{server}\"",
cache = cache.as_str(),
server = server_name.as_str(),
);
loop {
thread::sleep(time::Duration::from_secs(60));
}
Ok(())
}
fn strip_lock_file(p: &Path) -> Option<PathBuf> {