From c97a2864d9546318900c04a792f089047d97fde1 Mon Sep 17 00:00:00 2001 From: Dominik Werder Date: Tue, 18 Jul 2023 16:28:14 +0200 Subject: [PATCH] Find active image data --- crates/httpret/src/api4/databuffer_tools.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crates/httpret/src/api4/databuffer_tools.rs b/crates/httpret/src/api4/databuffer_tools.rs index 68701da..306e860 100644 --- a/crates/httpret/src/api4/databuffer_tools.rs +++ b/crates/httpret/src/api4/databuffer_tools.rs @@ -93,6 +93,7 @@ impl FindActiveHandler { type _A = netpod::BodyStream; let stream = FindActiveStream::new(40, 2, ncc); let stream = stream.chain(FindActiveStream::new(40, 3, ncc)); + let stream = stream.chain(FindActiveStream::new(40, 4, ncc)); let stream = stream .map(|item| match item { Ok(item) => { @@ -186,7 +187,8 @@ async fn find_active_inner( for _ in 0..64 { rng.next(); } - let tb_exp = now_sec / 60 / 60 / 24; + let tb_exp_dat = now_sec / 60 / 60 / 24; + let tb_exp_img = now_sec / 60 / 60; let re_tb = regex::Regex::new(r"(0000\d{15})").unwrap(); let path = disk::paths::datapath_for_keyspace(ks, &node); let mut dir_stream = tokio::fs::read_dir(path).await?; @@ -227,7 +229,7 @@ async fn find_active_inner( // TODO bin-size depends on channel config match s.parse::() { Ok(x) => { - if x == tb_exp { + if (ks == 2 || ks == 3) && x == tb_exp_dat || ks == 4 && x == tb_exp_img { // debug!("matching tb {}", chname); let sum = sum_dir_contents(e.path()).await?; if sum > 1024 * 1024 * 10 {